Maksim Shabunin
d3821e8cd7
Forgotten punctuation
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Vadim Pisarevsky
a798386660
Merge pull request #3326 from ilya-lavrenov:neon_canny
2014-10-11 17:58:24 +00:00
Vadim Pisarevsky
c37acef077
Merge pull request #3328 from ilya-lavrenov:warp_tests
2014-10-11 17:19:52 +00:00
Ilya Lavrenov
faf91a466c
imrpoved output of warp test in case of failure
2014-10-11 02:35:02 -07:00
Ilya Lavrenov
af04a85303
fixes for cv::accumulate**
2014-10-10 10:00:13 -07:00
Ilya Lavrenov
5f23d99918
the rest modes of cv::Mat::convertTo
2014-10-10 14:10:50 +00:00
Vadim Pisarevsky
397870d7a5
Merge pull request #3279 from akarsakov:ocl_houghlines
2014-10-09 14:56:45 +00:00
Ilya Lavrenov
183e378bd0
cv::resize (INTER_LINEAR && INTER_CUBIC)
2014-10-08 13:11:38 -07:00
Ilya Lavrenov
00b8f0dec1
cv::pyrUp
2014-10-08 12:04:49 -07:00
Ilya Lavrenov
48a9905f5d
cv::pyrDown
2014-10-08 11:47:46 -07:00
Nisarg Thakkar
29fb2b6e47
Fixed doc for Bug #3887
...
Fixed doc for Bug #3887
2014-10-08 19:52:35 +05:30
Alexander Karsakov
dfff9a8125
Added OCL performance test for YUV2RGB_IYUV, YUV2GRAY_420, RGB2YUV_IYUV, YUV2RGB_YUY2, YUV2GRAY_YUY2 color conversion modes
2014-10-08 17:25:51 +04:00
Ilya Lavrenov
7166b7b640
cv::cvtColor (RGB2Luv CV_8U)
2014-10-07 13:49:05 -07:00
Ilya Lavrenov
1c1c41d3be
cv::cvtColor (Luv2RGB CV_8U)
2014-10-07 13:35:11 -07:00
Ilya Lavrenov
06461b401a
cv::cvtColor (Lab2BGR CV_8U)
2014-10-07 10:27:28 -07:00
Ilya Lavrenov
71c3e67cb2
cv::cvtColor (HLS2RGB CV_8U)
2014-10-07 15:37:21 +00:00
Ilya Lavrenov
c173d9fa18
cv::cvtColor (RGB2HLS CV_8U)
2014-10-07 15:33:09 +00:00
Ilya Lavrenov
8d367d4b4d
cv::cvtColor (HSV2RGB CV_8U)
2014-10-07 15:25:02 +00:00
Ilya Lavrenov
eb3046f7d3
cv::cvtColor (Gray2RGB5x5)
2014-10-07 14:10:39 +00:00
Alexander Karsakov
66a8acfd3d
Optimization for HoughLinesP
2014-10-07 17:53:33 +04:00
Alexander Alekhin
14d5358982
Merge pull request #3210 from akarsakov:ocl_gftt_opt
2014-10-07 09:06:54 +00:00
Ilya Lavrenov
f91e461ea0
cv::cvtColor (RGB5x52Gray)
2014-10-06 13:06:08 -07:00
Ilya Lavrenov
a84c4ac197
cv::cvtColor (RGBRGB5x5)
2014-10-06 12:40:41 -07:00
Ilya Lavrenov
b9f57bda05
cv::cvtColor (RGB5x52RGB)
2014-10-06 11:55:12 -07:00
Ilya Lavrenov
28ee84b731
cv::cvtColor (BGR[A]2RGB[A])
2014-10-06 11:18:33 -07:00
Ilya Lavrenov
a54f6bb08b
cv::cvtColor
2014-10-06 11:52:41 +00:00
Alexander Smorkalov
11c81067dc
doc/check_docs2.py warnings fixes
2014-10-02 13:40:30 +04:00
Ilya Lavrenov
6f05a250be
optimization of cv::CLAHE (~3x)
2014-09-30 12:40:11 -07:00
Ilya Lavrenov
af6a64d76b
cv::accumulate functions
2014-09-30 11:07:45 -07:00
Ilya Lavrenov
81548a30aa
cv::medianBLur
2014-09-30 07:59:33 +00:00
Alexander Karsakov
4880dd0cd6
Added performance test for OCL version of HoughLines and HoughLinesP
2014-09-30 11:03:54 +04:00
Ilya Lavrenov
8e1ccfae3d
cv::boxFilter
2014-09-29 13:54:31 -07:00
Ilya Lavrenov
1c491c42cd
fix for cornerHarris
2014-09-29 14:59:46 +00:00
Alexander Karsakov
eaf5a163b1
Added HoughLinesP OCL implementation
2014-09-29 16:48:16 +04:00
Alexander Karsakov
3695a31606
Combined counter and corner buffers into one
2014-09-29 11:10:57 +04:00
Ilya Lavrenov
d090fcf2fe
cv::moments (CV_8UC1)
2014-09-26 14:39:04 +00:00
Ilya Lavrenov
09fbc78a97
cv::threshold
2014-09-26 13:16:48 +00:00
Ilya Lavrenov
b4fc87c380
cv::remap
2014-09-26 10:35:28 +00:00
Ilya Lavrenov
6377f5a458
fixed warps accuracy tests
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
4dd6148646
cv::resize 16uc1
2014-09-26 09:41:46 +00:00
Ilya Lavrenov
c0b702a994
cv::resize area 2x
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
12001a42f9
corners
2014-09-26 09:41:45 +00:00
Ilya Lavrenov
d30ce2b9ac
canny
2014-09-26 09:41:45 +00:00
Vadim Pisarevsky
d1afa0e370
Merge pull request #3234 from vpisarev:fixed_photo_test_failure
2014-09-18 13:06:54 +00:00
Vadim Pisarevsky
470f427a95
Merge pull request #3232 from Chuanbo-Weng:master
2014-09-18 11:48:29 +00:00
Vadim Pisarevsky
aa6ba149bc
make sure ptr<> is called with proper parameter, otherwise the assertion fails
2014-09-18 15:47:59 +04:00
Vadim Pisarevsky
3bc174f1bb
Merge pull request #3230 from znah:ipp_median_fix
2014-09-17 12:06:32 +00:00
Chuanbo Weng
c5552788c5
Use vload to read unaligned data instead of dereference operator.
...
According to opencl 1.2 spec 6.1.5:
For arguments to a __kernel function declared to be a pointer to a
data type, the OpenCL compiler can assume that the pointee is always
appropriately aligned as required by the data type. The behavior of
an unaligned load or store is undefined, except for the
vloadn, vload_halfn, vstoren, and vstore_halfn functions defined in
section 6.12.7.
Original code read data of type T from address not aligned by multiple
of sizeof(T), so the result is incorrect. With this patch, the cases
./opencv_perf_imgproc
--gtest_filter=OCL_ImgSize_TmplSize_Method_MatType_MatchTemplate.MatchTemplate/*
could work well with beignet 0.9.3.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-09-17 19:28:07 +08:00
Alexander Mordvintsev
0319120adc
fix: ippiFilterMedianBorder sometimes crash when doing in-place filtering
2014-09-17 13:26:39 +04:00
Philipp Hasper
bac492fff6
Doc: Fixing indentation
2014-09-17 09:30:19 +02:00
Philipp Hasper
68fe45b594
Doc: Fixing indentation
2014-09-17 09:29:17 +02:00
Alexander Alekhin
4689426a91
Merge pull request #3208 from vbystricky:oclopt_Filter2D
2014-09-16 13:03:45 +00:00
Maksim Shabunin
882426a9b2
Stripped iCCP chunk from png files
2014-09-15 12:48:28 +04:00
Vadim Pisarevsky
c445ce6125
Merge pull request #3218 from berak:docfix_colormap_30
2014-09-15 07:34:16 +00:00
berak
ad20feaca0
small corrections to applyColorMap docs
2014-09-14 21:15:48 +02:00
Maksim Shabunin
88aea1d52f
Stripped iCCP chunk from png files
2014-09-12 16:30:23 +04:00
Alexander Karsakov
8c08714b8c
Remove two "set" kernel call
2014-09-11 18:11:23 +04:00
vbystricky
b0bf8478e5
Optimization OpenCL version of Filter2D
2014-09-11 12:59:51 +04:00
Alexander Karsakov
39b27a19be
Refactoring and optimization
2014-09-05 12:20:29 +04:00
Alexander Karsakov
d59a6fa518
Optimization for getLines
2014-09-05 11:37:16 +04:00
Alexander Karsakov
fee8f29f48
Refactoring, minor optimization
2014-09-04 16:31:30 +04:00
Alexander Karsakov
07d57db91c
Fixed calculation of l_stack_size
2014-09-03 17:40:17 +04:00
Alexander Karsakov
a48c1c8248
Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory.
2014-09-02 12:38:02 +04:00
Alexander Karsakov
214dab39f6
Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV
2014-09-02 11:53:31 +04:00
Elena Gvozdeva
31ac73c315
fix for cv::memopTypeToStr
2014-08-29 14:18:52 +04:00
Alexander Alekhin
b332152bef
Merge pull request #2956 from ilya-lavrenov:tapi_accumulate
2014-08-28 09:08:51 +00:00
Alexander Karsakov
6b6c7ccfea
Added accuracy tests with real and generated data
2014-08-27 17:58:48 +04:00
Alexander Karsakov
f7aadd07f6
Added getLines, fill_accum_local kernels
2014-08-27 17:57:22 +04:00
Vadim Pisarevsky
d66815978a
Merge pull request #3117 from KruchDmitriy:canny_opt
2014-08-27 10:07:55 +00:00
VBystricky
9ee0789174
Fix issues
2014-08-26 14:39:11 +04:00
vbystricky
e75cd74f5a
Optimize OpenCL version of Laplacian filter for kernel size great than 3
2014-08-25 17:56:09 +04:00
Alexander Karsakov
038bfb98ec
Added fill_accum kernel
2014-08-25 13:55:09 +04:00
Ilya Lavrenov
7017b1250a
used new stratehy in cv::accumulate**
2014-08-25 11:25:54 +04:00
Ilya Lavrenov
a350b76738
optimization of cv::accumulate**
2014-08-25 11:25:01 +04:00
Alexander Karsakov
5c1f71de51
Added make_point_list kernel
2014-08-22 16:50:01 +04:00
Vadim Pisarevsky
e7539bd2c8
Merge pull request #3144 from ElenaGvozdeva:ocl_morphSmall
2014-08-22 12:14:06 +00:00
U-KruchininD-ПК\KruchininD
6ed168d3af
New optimization for canny
...
new hysteresis
delete whitespaces
fix problem with mad24
Dynamic work group size
dynamic work group size
Fix problem with warnings
Fix some problems with border
Another one fix
Delete trailing whitespaces
some changes
fix problem with warning
2014-08-22 11:22:15 +04:00
Elena Gvozdeva
7ad6b47bc9
fixed ocl_boxFilter
2014-08-22 10:31:13 +04:00
Alexander Karsakov
3d222d313b
Fixed range for 'v' channel for 8U images
2014-08-21 17:22:06 +04:00
Elena Gvozdeva
5302e56071
fix for ocl_morphSmall
2014-08-21 16:31:24 +04:00
Vadim Pisarevsky
d68e62c968
Merge pull request #3137 from akarsakov:fix_cvtcolor_luv_rgb
2014-08-21 05:39:18 +00:00
Alexander Karsakov
b027eac173
Fixed range for 'v' channel for 8U images.
2014-08-20 11:09:21 +04:00
Bence Magyar
04b2d9a453
Fix color table
...
Apart from not displaying the table, it breaks the doc build of https://github.com/Itseez/opencv_contrib/pull/70 .
2014-08-19 18:00:13 +02:00
Vadim Pisarevsky
8658aef3bf
Merge pull request #3104 from dkanafeev:new_ipp_func_master
2014-08-19 09:06:45 +00:00
Alexander Karsakov
cf1ae3513f
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 18:34:44 +04:00
Alexander Karsakov
023a42ba55
Fixed getConversionInfo() for YUV2RGBA_* conversions
2014-08-18 13:01:19 +04:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
dkanafeev
1b0f0d7ead
Intel Summer School 2014
...
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
2014-08-15 12:54:31 +04:00
Vadim Pisarevsky
95a4943762
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
4530c7ad08
trying to fix builds
2014-08-14 13:18:04 +04:00
Vadim Pisarevsky
257463719b
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
2014-08-14 12:50:07 +04:00
Alexander Karsakov
8760a344ec
Fixed incorrect pointer conversion for in-place threshold
2014-08-14 11:02:55 +04:00
Alexander Smorkalov
e11333dd83
GCC 4.8 warning array subscript is above array bounds fixed.
2014-08-13 17:12:08 +04:00
Adil Ibragimov
9ac06a9333
fix for gcc
2014-08-13 16:34:18 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
01bd4961e3
Merge pull request #3081 from akarsakov:small_fixes
2014-08-13 10:50:33 +00:00
Vadim Pisarevsky
c97c0be4f2
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
2014-08-12 13:56:59 +00:00
Alexander Karsakov
b4d3b34acf
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
2014-08-12 16:38:11 +04:00
Vadim Pisarevsky
5119564579
Merge pull request #3033 from nathanjackson:clahe_datatypes
2014-08-12 10:45:29 +00:00
Alexander Karsakov
5898dcae4a
Added ROUNDING_EPS for identical rounding after dividing on different platforms
2014-08-12 14:28:48 +04:00
Elena Gvozdeva
8124d10526
fixed Erode and Dilate in case of kernel = Mat()
2014-08-12 12:19:13 +04:00
Nathan Jackson
563200fbf6
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
2014-08-11 18:25:08 -04:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
Alexander Alekhin
8fd61c9aa6
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
2014-08-11 15:02:53 +00:00
Alexander Alekhin
b7d1a70919
Merge pull request #3063 from akarsakov:ocl_warps_check
2014-08-11 13:20:11 +00:00
Aleksandr Petrikov
0a531815c5
fix bug 3733 for imgproc/filter.cpp
2014-08-11 16:00:21 +04:00
Alexander Karsakov
498da24b8b
Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests
...
with test_loop_times=30
2014-08-11 15:52:53 +04:00
Alexander Karsakov
6b0e63b652
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
2014-08-11 15:37:05 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
0f66e2757b
Merge pull request #3069 from vpisarev:refactor_video
2014-08-11 08:47:59 +00:00
Vadim Pisarevsky
8368d54d36
Merge pull request #3061 from ElenaGvozdeva:ocl_resize
2014-08-11 06:41:48 +00:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
4de4ff5682
Merge pull request #3067 from vpisarev:minor_fixes2
2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9
added some basic functionality needed by the new face module (moved from the old "contrib")
2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Vadim Pisarevsky
99eed2d885
Merge pull request #3057 from Adil-Ibragimov:adding-constness
2014-08-08 17:27:47 +00:00
Vadim Pisarevsky
62f90219fc
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
2014-08-08 17:16:38 +00:00
Vadim Pisarevsky
ce0297ed61
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
2014-08-08 14:06:49 +00:00
Elena Gvozdeva
7cba3ac4f8
small fix for GaussianBlur ocl test
2014-08-08 17:47:57 +04:00
Alexander Karsakov
7849c35de1
Changed check condition in tests for warpAffine and warpPerspective
2014-08-08 17:14:38 +04:00
Elena Gvozdeva
b7899c3d5c
small fix for ocl_resize
2014-08-08 16:12:10 +04:00
Elena Gvozdeva
b5f251c815
fixed test ocl_MatchTemplate for sparse matrix
2014-08-08 13:37:18 +04:00
Alexander Alekhin
d0f789dc90
Merge pull request #3044 from akarsakov:fix_ocl_tests
2014-08-07 20:14:17 +00:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Elena Gvozdeva
7dd7dd97cd
fixed nDiffs for CalcBackProject
2014-08-07 15:36:00 +04:00
Elena Gvozdeva
c9b5d8cf4c
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
2014-08-07 15:36:00 +04:00
Alexander Karsakov
44fbfb2cf6
Fixed extrapolation in pyrDown
2014-08-07 10:39:25 +04:00
Alexander Karsakov
2a0b39d30a
Fixed calculate_histogram kernel
2014-08-07 10:39:24 +04:00
Alexander Karsakov
eb9fdb0164
Fixed rounding in remap INTER_LINEAR mode
2014-08-07 10:39:24 +04:00
Alexander Karsakov
fec21239c8
Revert optimization for warpAffine INTER_NEAREST mode
2014-08-07 10:39:18 +04:00
Vadim Pisarevsky
ca183707f2
Merge pull request #3039 from alalek:ocv_world
2014-08-06 14:52:52 +00:00
Vadim Pisarevsky
bab5700a09
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
2014-08-06 11:26:07 +00:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Elena Gvozdeva
7999fbf765
fixed ocl_integral
2014-08-05 12:01:28 +04:00
Elena Gvozdeva
f32b52ea8d
fixed test for CvtColor RGB -> Luv
2014-08-05 11:54:26 +04:00
Elena Gvozdeva
8c2c3b54d9
fixed ocl tests for BlendLinear, BoxFilter, Integral
2014-08-05 11:41:08 +04:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Vladislav Vinogradov
a3da3a01e1
fix test_opencv_imgproc compilation
2014-08-04 12:13:33 +04:00
Vadim Pisarevsky
222f8a3d5e
hopefully fixed test failure on Linux
2014-08-04 01:16:45 +04:00
Vadim Pisarevsky
d3cdfefa03
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
2014-08-02 21:52:24 +00:00
Alexander Alekhin
c595457ea0
Merge pull request #3011 from vbystricky:oclopt_morthosmall
2014-08-01 17:21:59 +00:00
VBystricky
0f9b79ef64
Change min-max to clamp
2014-08-01 19:45:11 +04:00
vbystricky
b724208510
Fix Luv2RGB function
2014-08-01 16:39:12 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
18de8dee62
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
Alexander Alekhin
f8aecb2a32
Merge pull request #3002 from vbystricky:oclopt_pyrdown
2014-07-31 15:43:18 +00:00
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00
vbystricky
878dec65c8
Optimize OpenCL version of morfology and box filters for small filter kernels
2014-07-30 10:32:52 +04:00
Vadim Pisarevsky
101769d26c
eliminated some unnecessary instructions
2014-07-29 18:10:18 +04:00
Elena Gvozdeva
dbb5993d13
added dft for all platforms
2014-07-29 12:21:52 +04:00
Elena Gvozdeva
dc3c691c8c
new block size for dft
2014-07-29 12:06:20 +04:00
Elena Gvozdeva
e7216a5987
Used float instead of int for CV_8U in sumTemplate
2014-07-29 11:34:39 +04:00
Vadim Pisarevsky
11e9e375a3
fixed compile warning with GCC
2014-07-28 19:23:46 +04:00
Vadim Pisarevsky
4255746c00
fixed compile warnings and removed extra whitespaces
2014-07-28 15:20:25 +04:00
Vadim Pisarevsky
4dfb613c3e
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
2014-07-28 14:54:41 +04:00
Sander Mathijs van Veen
d25770ee76
Fix Python 2 bindings for findContours
...
The sanity check prevents Python 2 from calling findContours, because the
Python 2 bindings pass an empty matrix for `_contours`. If `_contours` is not
empty, the channel and depth check should determine whether the matrix is of
the correct type and size.
Note: the Python 2 bindings passes a matrix of type `STD_VECTOR_MAT` to
parameters of the type `OutputArrayOfArrays`.
2014-07-26 16:40:09 +02:00
Vadim Pisarevsky
fc41e8850b
Merge pull request #2836 from s98felix:2.4
2014-07-25 12:59:41 +00:00
Vadim Pisarevsky
603030b005
Merge pull request #2993 from vbystricky:oclopt_warp_affine
2014-07-25 11:26:24 +00:00
vbystricky
e49d148d47
Optimize ocl function pyrDown
2014-07-25 13:39:19 +04:00
Alexander Alekhin
63a8cb594a
Merge pull request #2961 from ilya-lavrenov:tapi_corners
2014-07-22 09:38:11 +00:00
vbystricky
716218cac4
Optimize ocl version of warp_affine
2014-07-22 13:22:40 +04:00
Vadim Pisarevsky
39020fc9cf
Merge pull request #2898 from PhilLab:2.4
2014-07-18 09:26:50 +00:00
Vadim Pisarevsky
17d69be902
Merge pull request #2933 from ilya-lavrenov:sse_moments
2014-07-18 09:25:22 +00:00
Vadim Pisarevsky
dbefbbc522
Merge pull request #2910 from ilya-lavrenov:sse2_canny
2014-07-15 09:46:28 +00:00
Vadim Pisarevsky
40370345c5
Merge pull request #2765 from pradeep-pyro:kullback_leibler
2014-07-15 08:57:31 +00:00
pradeep
7171431e7c
Changed cv::log to std::log
2014-07-15 12:32:53 +08:00
Alexander Alekhin
381986d044
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
2014-07-14 18:48:28 +00:00
Alexander Alekhin
910d8f8e0b
Merge pull request #2888 from ilya-lavrenov:tapi_remap
2014-07-11 09:59:27 +00:00
Ilya Lavrenov
fee3d6931b
corners
2014-07-10 17:17:24 +04:00
Vadim Pisarevsky
347eaa8685
Merge pull request #2943 from vbystricky:highgui_imgcodecs
2014-07-10 05:28:44 +00:00
Richard Yoo
c38023f4e7
Modifications to support dynamic vector dispatch.
2014-07-09 16:55:39 -07:00
Ilya Lavrenov
ecec53f509
fixed docs
2014-07-09 17:48:28 +04:00
pradeep
0d49f97128
Fixed truncation warning
2014-07-09 15:29:47 +08:00
pradeep
f8b23cff18
Fixed test errors, added support for C data types.
2014-07-09 13:39:40 +08:00
Ilya Lavrenov
e8f5c2fcf6
OpenCL before IPP
2014-07-08 18:51:27 +04:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Beat Küng
90dce84314
imgproc: fix compiler error for gcc 4.8
...
this bug was introduced in a73809e6
.
2014-07-05 09:27:11 +02:00
Ilya Lavrenov
8fdbdb131d
SSE4.1 optimiation of cv::Moments CV_16U
2014-07-03 15:04:06 +04:00
Alexander Alekhin
e6c305cb75
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
2014-07-03 09:26:05 +00:00
Alexander Alekhin
effff27c4e
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
2014-07-02 19:06:46 +00:00
Ilya Lavrenov
46e2216165
fixed cv::warpPerspective
2014-07-02 19:32:10 +04:00
Vadim Pisarevsky
d6233b13ba
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
2014-07-02 09:55:51 +00:00
Alexander Alekhin
d65abcaedb
Merge pull request #2830 from mlyashko:moments
2014-07-02 09:14:48 +00:00
Ilya Lavrenov
d40cb39616
SSE2 optimization of magnitude calculation
2014-07-02 00:05:55 +04:00
Vadim Pisarevsky
fe4bdcd71b
Merge pull request #2895 from fradelg:master
2014-07-01 17:16:22 +00:00
Alexander Alekhin
acbabedac9
Merge pull request #2869 from ilya-lavrenov:tapi_warps
2014-06-30 11:59:13 +00:00
Alexander Alekhin
e0584bb818
Merge pull request #2876 from vbystricky:oclopt_integralsum
2014-06-30 10:06:54 +00:00
Alexander Alekhin
1493160f26
Merge pull request #2899 from ilya-lavrenov:tapi_ex
2014-06-30 10:05:24 +00:00
Alexander Alekhin
667a9328fb
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
2014-06-30 10:02:41 +00:00
Ilya Lavrenov
654bdde8ed
SSE2 optimization of cv::preCornerDetect
2014-06-30 01:51:53 +04:00
Alexander Karsakov
d5c99a07b6
Use fma only for Intel devices
2014-06-27 12:59:44 +04:00
Ilya Lavrenov
36db85a94d
optimized some operations
2014-06-27 12:52:29 +04:00
unknown
ade46bd428
Fixed typos in comments
2014-06-26 16:29:45 +02:00
Roman Donchenko
1576e24c93
Merge pull request #2672 from a-wi:findContours
2014-06-26 17:35:08 +04:00
Roman Donchenko
e89e3066e8
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
2014-06-26 17:29:27 +04:00
Roman Donchenko
1138fbb940
Merge pull request #2766 from akarsakov:pyr_border_constant
2014-06-26 17:28:44 +04:00
Roman Donchenko
b0a70787e1
Merge pull request #2824 from abidrahmank:pylsd
2014-06-26 17:22:54 +04:00
vbystricky
1a73aa1f6a
Change local size
2014-06-26 15:43:40 +04:00
Ilya Lavrenov
16ab6ec534
ported changes from PR #2867
2014-06-26 13:52:44 +04:00
Ilya Lavrenov
a3592cd068
added ocl_** function
2014-06-26 13:18:03 +04:00
Ilya Lavrenov
ad9272e836
reverted to original plain C++ code
2014-06-26 13:13:01 +04:00
mlyashko
6f2fea7ea5
added perftest for moments
2014-06-26 13:05:43 +04:00
vbystricky
730ead44fe
Optimize OpenCL version of sepFilter2D
2014-06-26 12:46:03 +04:00
Fco. Javier Delgado del Hoyo
47e345bcb6
Change comment according to fix
2014-06-25 11:49:26 +02:00
Fco. Javier Delgado del Hoyo
a73809e6fc
Fix GCC 4.9 compiler warning
2014-06-25 11:46:05 +02:00
Alexander Alekhin
ea2228774d
Merge pull request #2881 from mlyashko:moments_opt
2014-06-24 16:19:52 +00:00
Alexander Alekhin
ea1b14ee95
Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
2014-06-24 16:12:42 +00:00
vbystricky
09bcc061dd
Change kernel for optimization. Remove restriction to align data
...
Fix kernel compilation errors on AMD system
Fix licanse information in cl file
Support CV_64F destination type
Change build options of the kernel
Optimize sum of square
Remove separate kernel for integral square
Increase epsilon for perfomance tests
Increase epsilon for perfomance tests
Test double support on AMD devices
Fix some issues
Try to fix problems with AMD device
Try to solve problem with AMD device
Fix error of destination size in kernel
Fix warnings
2014-06-24 18:32:52 +04:00
Ilya Lavrenov
87f4b47a4f
optimized INTER_LINEAR mode
2014-06-23 16:25:05 +04:00
Elena Gvozdeva
c23da52564
Fixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed conditions for call dft.
2014-06-23 11:37:47 +04:00
mlyashko
44ffa42064
replaced factors computation by precomputed values, added kernel for
...
binary mode
2014-06-23 11:04:39 +04:00
Ilya Lavrenov
007593cab7
cvtColor - optimized index calculations; usage of build-in functions
2014-06-23 02:10:42 +04:00
Ilya Lavrenov
863784efc6
added extra condition
2014-06-22 19:18:14 +04:00
Alexander Alekhin
6952b90ed0
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
2014-06-20 13:49:14 +00:00
Alexander Karsakov
eeddda4701
Optimization of cv::pyrDown for 8UC1.
2014-06-20 16:46:51 +04:00
Alexander Alekhin
01a98fae93
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
2014-06-20 08:49:36 +00:00
Alexander Alekhin
6e0d77469a
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
2014-06-20 08:47:51 +00:00
Alexander Alekhin
7688a18264
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
2014-06-20 08:46:32 +00:00
vbystricky
655465d9f8
Increase epsilon for pass sanity check
2014-06-19 18:52:25 +04:00
vbystricky
eb54c83985
Fix error
2014-06-19 18:09:23 +04:00
vbystricky
6d6ad1b1d9
Change threshold
2014-06-19 17:45:04 +04:00
vbystricky
b32fbe72f6
Add peromance tests for OCL integral sum of square
2014-06-19 17:07:09 +04:00
Ilya Lavrenov
c41a134394
increased number of rows per work-item
2014-06-17 19:24:25 +04:00
Alexander Alekhin
ce5bae1c67
Merge pull request #2871 from vbystricky:oclopt_integral
2014-06-17 18:23:31 +04:00
Alexander Karsakov
06fb5da7c8
Removed storing of zeros in local memory
2014-06-17 17:24:11 +04:00
Elena Gvozdeva
dcaa8735ba
used vector data types for CCORR cn==1
2014-06-17 17:09:39 +04:00
Elena Gvozdeva
13db948023
added dft for CCORR
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
82da445a15
changed CCOEFF cn==1
2014-06-17 17:09:38 +04:00
Elena Gvozdeva
a7036d9668
changed support for 3-channels, changed CCOEFF
2014-06-17 17:06:51 +04:00
Alexander Alekhin
1db9cc3f0d
Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
2014-06-17 16:59:00 +04:00
Alexander Alekhin
04628d770c
Merge pull request #2849 from ElenaGvozdeva:ocl_matchTemplate_3cn
2014-06-17 14:37:52 +04:00
Ilya Lavrenov
93712e913a
optimization of cv::warpAffine INTER_CUBIC
2014-06-17 00:47:19 +04:00
vbystricky
606df0469a
Fix pointer conversion
2014-06-16 18:14:05 +04:00
vbystricky
9bf296eeb0
Small refactoring
2014-06-16 17:17:16 +04:00
Ilya Lavrenov
c424d36041
optimized cv::boxFilter
2014-06-16 17:00:10 +04:00
Ilya Lavrenov
7391df386f
fixed usage of reshape
2014-06-16 15:19:13 +04:00
vbystricky
6550c4f682
Join kernel code for int and float destination types
2014-06-16 15:08:15 +04:00
Alexander Alekhin
f269a89792
Merge pull request #2865 from ilya-lavrenov:morph
2014-06-16 13:35:57 +04:00
Alexander Alekhin
758a1eb63d
Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
2014-06-16 13:22:03 +04:00
vbystricky
504bc7634a
Remove pre_invalid parameter
2014-06-16 13:07:39 +04:00
Ilya Lavrenov
d5244eb645
invoking OCL before IPP
2014-06-16 12:33:13 +04:00
Vadim Pisarevsky
41ceadf9ed
Merge pull request #2799 from 23pointsNorth:patch-1
2014-06-12 21:40:53 +04:00
Ilya Lavrenov
7ccbe10970
fixed cv::warpPerspective
2014-06-12 15:17:24 +04:00
Alexander Alekhin
14671e0cd6
Merge pull request #2823 from ilya-lavrenov:tapi_warpaffine
2014-06-11 14:41:29 +04:00
Elena Gvozdeva
feeb386bf3
Added support for 3-channels
2014-06-11 11:49:22 +04:00
Ilya Lavrenov
33239fca70
cv::equalizeHist
2014-06-10 19:32:46 +04:00
Ilya Lavrenov
c9528b3952
optimized histogram merging
2014-06-10 19:32:01 +04:00
Ilya Lavrenov
eeaa4b3665
eliminated convertTo
2014-06-10 19:32:01 +04:00
Ilya Lavrenov
c072c28e28
optimized cv::calcHist
2014-06-10 19:32:00 +04:00
Alexander Alekhin
071daa1d8f
Merge pull request #2839 from ilya-lavrenov:tapi_fix
2014-06-10 19:30:26 +04:00
Alexander Alekhin
bf39f694ea
Merge pull request #2835 from ilya-lavrenov:defects
2014-06-10 19:29:47 +04:00
Ilya Lavrenov
556206de2d
fixed defects found by coverity scan
2014-06-10 13:14:51 +04:00
Ilya Lavrenov
0b2cafb08b
bixed cv::boxFilter
2014-06-09 17:09:44 +04:00
Ilya Lavrenov
cf72d2695c
fixed possible runtime error
2014-06-09 16:48:59 +04:00
Ilya Lavrenov
ff6f5d4d24
fixed warnings
2014-06-09 15:54:10 +04:00
Richard Yoo
11a09ef5cc
Changes to support Intel AVX/AVX2 in cvResize().
2014-06-06 15:39:09 -07:00
Alexander Alekhin
e430ab1a58
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
2014-06-06 18:53:14 +04:00
Alexander Alekhin
a42259421c
Merge pull request #2794 from mletavin:pullreq/140516-median
2014-06-04 16:36:37 +04:00
Alexander Alekhin
ab9dff12d5
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
2014-06-04 12:20:54 +04:00
Ilya Lavrenov
108527c951
added missed INTER_CUBIC
2014-06-03 21:46:30 +04:00
Ilya Lavrenov
2cc4cf3644
optimized cv::warpAffine
2014-06-03 13:45:22 +04:00
abidrahmank
530fc99947
Issue #3709 - PyBindings for LSD
...
Corrected crashing in Python bindings while using LSD_REFINE_NONE flags
Corrected not drawing lines in drawSegments and compareSegments in Python bindings
2014-06-03 14:25:33 +05:30
Roman Donchenko
c836613bad
Merge pull request #2819 from SpecLad:merge-2.4
2014-06-02 17:12:07 +04:00
mletavin
e224e72bbc
Added condition to use optimized kernels for images of size that multiple of 4 only
2014-06-02 15:58:59 +04:00
Alexander Alekhin
a049c16ca7
Merge pull request #2751 from akarsakov:ocl_thresh_opt
2014-06-02 13:54:31 +04:00
Roman Donchenko
33087f9eaa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-06-02 13:43:28 +04:00
Alexander Alekhin
abe37659cc
Merge pull request #2811 from arkunze:pullreq/140516-erode
2014-06-01 02:30:39 +04:00
Alexander Alekhin
d210132b99
Merge pull request #2638 from mlyashko:floodfill_perftest
2014-05-30 00:42:42 +04:00
mlyashko
f0e3940558
perftest for floodfill
2014-05-29 13:36:13 +04:00
Alexander Alekhin
5a268dd27c
Merge pull request #2797 from ElenaGvozdeva:ocl_MT
2014-05-28 13:39:48 +04:00
mletavin
68883775fb
Adding explicit variable conversion in ocl_medianFilter() to suppress build errors on Linux & Mac
2014-05-28 13:30:50 +04:00
Daniel Angelov
3ab3367310
Updating missed defines in documentation
...
Updating missed defines in documentation. The new defines (in imgproc.hpp) state they have a prefix of COLOR instead of CV.
2014-05-27 18:09:12 +01:00
Alexander Alekhin
c9db91ace5
Merge pull request #2788 from alalek:icv_public
2014-05-27 18:52:02 +04:00
mletavin
df9c75b270
Moved new kernels under conditional compilation to disable their build for 3-channel images; added condition to use new kernels only for images that are big enough
2014-05-27 16:16:00 +04:00
Elena Gvozdeva
40eea303ec
OCL: matchTemplate: changed perf test
2014-05-27 14:31:11 +04:00
Alexander Karsakov
8e54845049
Removed useless multiplication by 4
2014-05-27 10:52:20 +04:00
mletavin
4a37ac303a
Added new Intel-optimized 3x3 and 5x5 kernels to medianFilter.cl file and corresponding code to host in smooth.cpp
...
Only Intel platform and 1 channel images are supported.
2014-05-26 15:54:18 +04:00
Alexander Karsakov
5022a0fae3
Added new border types for pyrDown
2014-05-26 13:57:03 +04:00
Alexander Alekhin
ab2749d648
Merge pull request #2709 from alalek:icv_update_binary_pack
2014-05-23 15:09:43 +04:00
Alexander Karsakov
4910242732
Unroll pyrUp kernel
2014-05-23 14:58:34 +04:00
Alexander Alekhin
52ba76143c
icv: fix test eps on Mac for failed perf test
2014-05-23 14:54:09 +04:00
Alexander Alekhin
c43e32854a
Merge pull request #2713 from alalek:icv_enable_fns
2014-05-23 13:35:45 +04:00
Alexander Alekhin
7249622ce7
Merge pull request #2772 from akarsakov:ocl_pyramids
2014-05-22 13:23:50 +04:00
Alexander Karsakov
fa1ed5580d
Fixed cv::pyrUp performance test
2014-05-21 14:09:21 +04:00
Aaron Kunze
ab1a37d564
Bug fixes for filter2D and associated tests.
2014-05-20 22:30:09 -07:00
Daniel Angelov
3ca7717e17
Fixed scanning bug identified in comments in pull request #1119 .
...
NFA calculations now generate better line segments.
2014-05-20 21:25:31 +01:00
Alexander Karsakov
511ed4388e
Disabled BORDER_CONSTANT for pyramid functions.
2014-05-20 17:28:47 +04:00
Roman Donchenko
7ea1bf3cf0
Fixed several problems found by PVS-Studio.
...
This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/ > that are not already fixed and are
not in 3rdparty or the legacy module.
The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).
2014-05-20 13:54:00 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vadim Pisarevsky
988b108858
Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI
2014-05-19 17:34:45 +04:00
Vadim Pisarevsky
e30939f09b
Merge pull request #2738 from kevmitch:2.4
2014-05-19 17:33:22 +04:00
Roman Donchenko
eded87de5b
Merge pull request #2754 from thoinvil:patch-1
2014-05-19 15:41:28 +04:00
Roman Donchenko
f77aa45cfb
Merge pull request #2735 from StevenPuttemans:bug_2000
2014-05-19 14:25:47 +04:00
StevenPuttemans
7fc764f5e5
added documentation for findContours
2014-05-19 11:44:25 +02:00
pradeep
c5b4b99350
Implemented Kullback-Leibler divergence
2014-05-17 23:44:31 +08:00
Alexander Karsakov
8ecb8c6a3d
Optimized memory access by using stride pattern
2014-05-16 10:22:03 +04:00
Aaron Kunze
033aebe668
A more efficient workaround for erode
2014-05-15 16:31:24 -07:00
Elena Gvozdeva
ce0b808e3c
IPP: fixed ipp_matchTemplate
2014-05-15 13:05:27 +04:00
thoinvil
ea038436e6
Added condition to 1st test in cv::GaussianBlur
...
Consistent with the test made in cv::boxFilter, it adjusts the kernel size to the source size only if the border is not BORDER_CONSTANT and if BORDER_ISOLATED is set. Otherwise, the source has to be considered possibly in a larger image (i.e. the source being a ROI) in witch the kernel should apply.
2014-05-15 08:40:13 +02:00
Alexander Alekhin
46d672dcc3
Merge pull request #2663 from ilya-lavrenov:ipp_slow
2014-05-14 12:30:05 +04:00
Yash Vadalia
6ecd553810
Added doc for LinearPolar Transform
2014-05-13 19:36:43 +05:30
Alexander Karsakov
4612b4b827
Added clamp() for THRESH_TRUNC mode
2014-05-13 15:21:47 +04:00
Ilya Lavrenov
d16e0b377f
disabled IPP functions that slower than OpenCV
2014-05-13 15:06:38 +04:00
Kevin Mitchell
63e508abd2
doc: update/clarify behaviour of mask in floodFill
...
Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.
resolves Feature #2942
2014-05-13 02:26:59 -07:00
Roman Donchenko
ea5b411c0f
Merge pull request #2725 from SpecLad:merge-2.4
2014-05-13 11:53:30 +04:00
Roman Donchenko
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
Alexander Alekhin
1f638a3e5b
icv: enable functions
2014-05-12 15:38:38 +04:00
Alexander Alekhin
e1b5a547cc
Merge pull request #2722 from ilya-lavrenov:tapi_luv_eps
2014-05-12 13:03:36 +04:00
Alexander Alekhin
7ac5c367e9
Merge pull request #2715 from akarsakov:fix_corner_min_eigen
2014-05-12 13:03:19 +04:00
Ilya Lavrenov
e2558e5ee5
increased eps to pass tests
2014-05-12 11:54:15 +04:00
Alexander Alekhin
eba1be711c
Merge pull request #2710 from ilya-lavrenov:ipp_threshold
2014-05-08 17:33:27 +04:00
Alexander Karsakov
4e7f62fd24
Fixed ipp check for cornerMinEigenVal
2014-05-08 17:32:21 +04:00
Alexander Alekhin
a82dd8ce48
Merge pull request #2700 from ilya-lavrenov:tapi_cvtColor
2014-05-08 17:01:38 +04:00
Ilya Lavrenov
11b01cd8b9
added ipp threshold inplace
2014-05-08 13:51:25 +04:00
Ilya Lavrenov
19a2495067
fixed IPP related warnings
2014-05-08 13:31:27 +04:00
thoinvil
e50ef2dab5
Bugfix #3668 removed the comment
2014-05-07 18:27:08 +02:00
Alexander Alekhin
35eb972e9a
fix compilation on MSVS 2010
2014-05-07 15:20:29 +00:00
Alexander Alekhin
72e095b8a5
Merge pull request #2665 from ilya-lavrenov:ipp_filter2d
2014-05-07 19:17:57 +04:00
Alexander Alekhin
07d5f56707
Merge pull request #2679 from alalek:ippicv_update
2014-05-07 18:24:41 +04:00
Ilya Lavrenov
3ccaa5294e
added OpenCL RGB <-> Luv conversions
2014-05-07 18:09:57 +04:00
Alexander Alekhin
9c780260c2
Merge pull request #2605 from akarsakov:ipp_min_eigen_val
2014-05-07 18:01:44 +04:00
Alexander Alekhin
9e47672b2b
Merge pull request #2658 from akarsakov:ipp_hough
2014-05-07 17:07:22 +04:00
Alexander Alekhin
d54aa307fd
Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur
2014-05-07 16:49:59 +04:00
Ilya Lavrenov
abf905154f
cv::fitler2D
2014-05-07 15:47:10 +04:00
Ilya Lavrenov
1ad69aba35
changes sigma in perf tests
2014-05-07 14:59:03 +04:00
Alexander Alekhin
0e1bf58195
Merge pull request #2634 from ElenaGvozdeva:ippiDCT
2014-05-07 14:49:13 +04:00
Thierry Hoinville
5efd2056f0
Bugfix #3668 in FilterEngine::apply(), use the ROI properly
2014-05-06 15:33:07 +02:00
Alexander Karsakov
f6a8ac2f6c
Changed check condition in tests in case ipp disabled.
2014-05-06 15:24:54 +04:00
Alexander Alekhin
03b1d133df
Merge pull request #2660 from arkunze:pullreq/140423-filter2D
2014-05-06 12:59:03 +04:00
Alexander Alekhin
a5378186e5
Merge pull request #2688 from akarsakov:ipp_disable_resize_8u
2014-05-05 15:21:13 +04:00
Alexander Alekhin
d9d9de75db
Merge pull request #2686 from vbystricky:ippicv_integral
2014-05-05 15:20:47 +04:00
Alexander Alekhin
347d5b96f3
Merge pull request #2635 from akarsakov:gaussian_float_intel
2014-05-05 15:20:20 +04:00
Alexander Karsakov
eda084e123
Used AutoBuffer instead ippsMalloc
2014-05-05 14:40:59 +04:00
Michael Vukadinovic
c1aee0c312
Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel.
2014-05-01 11:52:49 -07:00
Alexander Karsakov
4ebe76098e
Disabled IPP resize for CV_8U
2014-04-30 17:28:35 +04:00
vbystricky
c9103730b6
Disable ipp integral in IPPICV version
2014-04-30 12:55:34 +04:00
Alexander Alekhin
e8d3ebecc7
fix IPPDerivSobel condition
2014-04-29 15:36:45 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Alexander Alekhin
0f22df2b0d
Merge pull request #2667 from akarsakov:ipp_otsu
2014-04-29 15:15:33 +04:00
Elena Gvozdeva
16629bff4c
Added parallel version for DCT_ROWS
2014-04-28 16:05:19 +04:00
Alexander Alekhin
649935596e
Merge pull request #2653 from alalek:ipp_lut
2014-04-28 15:15:11 +04:00
Ilya Lavrenov
55bbca2d09
added more types to cv::GaussianBlur
2014-04-28 13:50:28 +04:00
Alexander Karsakov
b046210296
Changed epsilon for hog test, because hog detector is sensible to resize accuracy.
2014-04-28 11:37:46 +04:00
Artur Wieczorek
59250e8288
cv::findContours: Check if type of output data structure is right to store contours (vector<vector<Point>>).
2014-04-27 19:22:29 +02:00
Alexander Karsakov
7bd9b2ac26
Added setIppErrorStatus()
2014-04-25 20:24:37 +04:00
Alexander Karsakov
232c37e827
Added ippiComputeThreshold_Otsu to cv::threshold
2014-04-25 17:31:45 +04:00
Alexander Alekhin
7ee1d5f69b
ipp: added LUT optimization
2014-04-25 12:09:06 +04:00
Alexander Karsakov
dc91be86b2
Disabled ippiHoughLine_Region for cv::HoughLines
2014-04-24 18:00:03 +04:00
Alexander Karsakov
5580d08c6e
Added setIppErrorStatus()
2014-04-24 16:48:46 +04:00
Alexander Karsakov
1909978f7d
Added ippiHoughProbLine to cv::HoughLinesP
2014-04-24 12:28:23 +04:00
vbystricky
82a198a8f2
Fix epsilon calculation for sanity check in x32 build
2014-04-24 10:48:32 +04:00
Aaron Kunze
1f8b41f390
Optimizes filter2D for Intel GPUs
2014-04-23 10:20:09 -07:00
Andrey Pavlenko
8114e071c2
Merge pull request #2655 from akarsakov:ipp_fix_pyramid
2014-04-23 16:27:33 +04:00
Andrey Pavlenko
d93161812b
Merge pull request #2620 from ilya-lavrenov:ipp_integration
2014-04-23 15:12:45 +04:00
Alexander Karsakov
f3d1001c5d
Changed tests for support intersection between expected and actual lists of lines.
2014-04-23 13:18:47 +04:00
Alexander Karsakov
751264f88a
Added ippiHoughLine_Region to cv::HoughLines
2014-04-23 11:59:36 +04:00
Alexander Alekhin
9badfa1f83
Merge pull request #2646 from ilya-lavrenov:ipp_remap
2014-04-23 11:51:01 +04:00
Alexander Alekhin
c2319285a9
Merge pull request #2649 from ilya-lavrenov:gabor_eps
2014-04-23 11:49:43 +04:00
Alexander Karsakov
92f855f0c3
Added checking destination size for pyrUp, pyrDown.
2014-04-23 11:47:15 +04:00
Alexander Karsakov
01123aaa36
Changed integer operations to float for Intel devices
2014-04-23 11:00:32 +04:00
Alexander Alekhin
e42057c487
Merge pull request #2648 from ilya-lavrenov:ipp_dist
2014-04-22 19:00:02 +04:00
Andrey Pavlenko
cd01d705c9
Merge pull request #2627 from akarsakov:ipp_pyramids
2014-04-22 17:19:27 +04:00
Ilya Lavrenov
5c0a4878d7
changes eps
2014-04-22 15:49:17 +04:00
Alexander Alekhin
580559e1e6
Merge pull request #2618 from vbystricky:ipp_Scharr
2014-04-22 15:02:13 +04:00
Ilya Lavrenov
640c9667c7
fix for IPP ICV
2014-04-22 14:55:28 +04:00
Ilya Lavrenov
51e2a8ec96
fixes
2014-04-22 14:51:39 +04:00
Ilya Lavrenov
46e40343f2
cv::remap
2014-04-22 14:33:55 +04:00
Andrey Pavlenko
6b986489ec
Merge pull request #2643 from vbystricky:ipp_GaussianBorder
2014-04-22 11:55:06 +04:00
Andrey Pavlenko
34afc72c23
Merge pull request #2642 from vbystricky:ipp_resize
2014-04-22 11:53:26 +04:00
Andrey Pavlenko
6823b36974
Merge pull request #2624 from ElenaGvozdeva:ipp_DistanceTransform
2014-04-22 11:48:25 +04:00
Andrey Pavlenko
7c3d5b056a
Merge pull request #2612 from grkutty:pullreq/140319-bilateral-b
2014-04-22 09:32:39 +04:00
vbystricky
bb12293251
Convert opencv border type to ipp border. Check supported border before call ipp function
2014-04-21 18:32:53 +04:00
vbystricky
42079b899c
Fix error in call of ippResize
2014-04-21 17:26:03 +04:00
Elena Gvozdeva
3d7872b904
fixed
2014-04-21 16:59:55 +04:00
Elena Gvozdeva
b4830d896c
added ippiTrueDistanceTransform_8u32f_C1R
2014-04-21 15:17:56 +04:00
Elena Gvozdeva
0265247504
Added ippiDistanceTransform for cv::distanceTransform, maskSize=3,5
2014-04-21 15:17:55 +04:00
vbystricky
d9ef5bb5a7
Fix compile warnings
2014-04-21 15:02:38 +04:00
vbystricky
f52126725f
Disable scharr in icv only configuration
2014-04-21 14:43:56 +04:00
vbystricky
d97f7da7a9
Fix setIppErrorStatus placement
2014-04-21 14:19:25 +04:00
Ilya Lavrenov
fe644ede19
cv::multiply
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db
fixed warnings
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
04abffeb16
cv::cornerHarris
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
8da0e2b707
cv::accumulate
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
3e173b701e
cv::Laplacian
2014-04-21 13:14:54 +04:00
vbystricky
650762419c
Add setIppErrorStatus()
2014-04-18 15:13:34 +04:00
vbystricky
d17f40dc1f
Fix error in code
2014-04-18 15:04:46 +04:00
vbystricky
32394df42d
Add constant border fix call ipp function
2014-04-18 15:04:46 +04:00
vbystricky
79384beb60
Fix warning
2014-04-18 15:04:45 +04:00
vbystricky
160c964e4b
Fix error
2014-04-18 15:04:45 +04:00
vbystricky
baa6ab1967
Change Scharr filter to new ipp functions
2014-04-18 15:04:45 +04:00
Andrey Pavlenko
cb8743f9aa
Merge pull request #2628 from ilya-lavrenov:ipp_error_handling
2014-04-18 13:37:35 +04:00
Alexander Karsakov
4f4a95299a
Added setIppErrorStatus
2014-04-18 09:04:25 +04:00
Alexander Karsakov
6202f54a18
Fixed sanity check for integer type
2014-04-17 19:02:56 +04:00
Ilya Lavrenov
05a47d9014
cmd option
2014-04-17 18:06:14 +04:00
Ilya Lavrenov
87eb1b8fcc
fixes in imgproc
2014-04-17 14:51:59 +04:00
Ilya Lavrenov
6f9ca3d77c
fixed some errors
2014-04-17 11:08:02 +04:00
Ilya Lavrenov
ce0941160e
added status check
2014-04-17 11:08:02 +04:00
Maks Naumov
9e10c09f2d
remove unused variable in LineSegmentDetectorImpl::compareSegments()
2014-04-17 00:14:13 +03:00
Alexander Karsakov
a7d12aabab
Added epsilon for tests with float data type
2014-04-16 18:07:24 +04:00
Alexander Karsakov
793e980876
Added IPP Pyramid API functions to cv::buildPyramid
2014-04-16 17:10:20 +04:00
Andrey Pavlenko
e11d998cfb
Merge pull request #2623 from alalek:icv_fix_color
2014-04-16 15:56:09 +04:00
Alexander Karsakov
ef2f5999ed
Added perf test for cv::buildPyramid
2014-04-16 13:01:49 +04:00
Alexander Karsakov
8230f1fd68
Added ippiPyrUp_Gauss5x5 to cv::pyrUp
2014-04-16 11:59:32 +04:00
Alexander Karsakov
f218dffce6
Added ippiPyrDown_Gauss5x5 to cv::pyrDown
2014-04-16 11:39:10 +04:00
Alexander Karsakov
10cb660240
Fixed condition
2014-04-16 10:28:24 +04:00
unknown
c2f540d090
White space fixes
2014-04-15 09:32:34 -07:00
Andrey Pavlenko
80ef1f6753
Merge pull request #2621 from arkunze:pullreq/140319-resize-b
2014-04-15 19:56:56 +04:00
Andrey Pavlenko
a26bed16e6
Merge pull request #2617 from ElenaGvozdeva:ipp_matchTemplate
2014-04-15 19:56:38 +04:00
Alexander Alekhin
3bb6db522d
ICV: mark missed functions
2014-04-15 15:55:44 +04:00
Vadim Pisarevsky
20aaa8fe77
Merge pull request #2560 from akarsakov:gaussianblur_integer
2014-04-15 13:21:25 +04:00
Elena Gvozdeva
3553e9379b
fixed
2014-04-15 11:41:33 +04:00
unknown
36d33dd6c2
Review comments
2014-04-14 16:10:11 -07:00
Aaron Kunze
ebbac3c66d
Optimizes OpenCL resize and optical flow to use image extension.
2014-04-14 16:09:17 -07:00
Andrey Pavlenko
8176e893c0
Merge pull request #2609 from alalek:tests_fixes
2014-04-14 18:54:01 +04:00
Andrey Pavlenko
5ff59af09d
Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor
2014-04-14 18:52:07 +04:00
Alexander Karsakov
53bc93730c
Added suppressing deprecation for ippiMulC_32f_C1IR
2014-04-14 16:38:59 +04:00
Ilya Lavrenov
884b706b3a
fixed warning
2014-04-14 14:40:40 +04:00
Ilya Lavrenov
ad7f2311c0
cv::Laplacian
2014-04-14 14:34:28 +04:00
Ilya Lavrenov
2a051a124f
cvtColor
2014-04-14 14:29:36 +04:00
Andrey Pavlenko
5522c14efc
Merge pull request #2607 from ilya-lavrenov:warn_sup
2014-04-14 14:15:12 +04:00
unknown
d2b4ee1e9b
More intendation fixes
2014-04-11 21:44:12 -07:00
unknown
06df383675
Indent fixes
2014-04-11 19:14:01 -07:00
Alexander Alekhin
3a1a3da782
fix tests
2014-04-11 16:11:05 +04:00
Andrey Pavlenko
f104d5be8c
Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist
2014-04-11 15:18:04 +04:00
Andrey Pavlenko
fd90efc9dd
Merge pull request #2593 from arkunze:pullreq/140319-color
2014-04-11 15:16:33 +04:00
Ilya Lavrenov
19d470749b
added macro for denoting region for suppression of "Wdeprecated-declarations"
2014-04-11 13:45:20 +04:00
Andrey Pavlenko
6bfbcf02cb
Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate
2014-04-11 12:47:25 +04:00
Andrey Pavlenko
f7f4593936
Merge pull request #2581 from vbystricky:ipp_moments
2014-04-11 12:45:13 +04:00
unknown
e032b5f5d5
Resolving conflicts after rebasing from public
2014-04-10 12:28:37 -07:00
Aaron Kunze
b59c517f98
Optimizations to OpenCL bilateral filter.
2014-04-10 12:15:13 -07:00
Ilya Lavrenov
b970ec7dae
parallel version
2014-04-10 19:39:00 +04:00
Elena Gvozdeva
43c29a6751
fixed
2014-04-10 17:26:38 +04:00
Alexander Karsakov
7369cfd9ec
Added perf test for cornerMinEigenVal
2014-04-10 16:09:48 +04:00
Vadim Pisarevsky
f417c79d16
Merge pull request #1932 from seth-planet:master
2014-04-10 13:36:14 +04:00
Vadim Pisarevsky
b5755b1228
Merge pull request #2588 from vpisarev:fix_samples_n_unused
2014-04-10 13:30:20 +04:00
Alexander Karsakov
d9556a998f
Added ippiMinEigenVal_ to cv::cornerMinEigenVal
2014-04-10 11:00:08 +04:00
Ilya Lavrenov
18ef25ec30
cv::calcHist
2014-04-09 21:46:09 +04:00
Aaron Kunze
785acc1834
Fixes global size issue, adds #pragma unroll to loops
2014-04-09 08:42:55 -07:00
Alexander Alekhin
ab691a4a24
ipp: some functions are not available in the ICV package #2
2014-04-09 18:20:49 +04:00
Alexander Alekhin
0d477ffea1
ipp: some functions are not available in the ICV package
2014-04-09 18:20:49 +04:00
vbystricky
b6d58d1d3b
Fix ipp ifdef
2014-04-09 14:53:59 +04:00
vbystricky
d9013a85f1
Fix IPP version ifdef
2014-04-09 14:49:37 +04:00
vbystricky
8899ec1586
Add IPP version of Moments calculattion of image
2014-04-09 14:49:36 +04:00
Andrey Pavlenko
e9bc737485
Merge pull request #2584 from akarsakov:ipp_threshold
2014-04-09 14:17:48 +04:00
Andrey Pavlenko
e6d6a3a85b
Merge pull request #2586 from ilya-lavrenov:ipp_disable
2014-04-09 14:16:25 +04:00
Alexander Karsakov
a66db67b83
Attempt to improve performance
2014-04-09 11:54:09 +04:00
Alexander Karsakov
35494f81ef
Added ippiThreshold to cv::threshold
2014-04-09 11:41:35 +04:00
Elena Gvozdeva
6119ae0ea9
fixed
2014-04-09 11:09:51 +04:00
Aaron Kunze
bea2515f0e
Optimizations for OpenCL color conversion.
2014-04-08 15:58:04 -07:00
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
2014-04-09 00:19:56 +04:00
Ilya Lavrenov
c735594178
cv::scaleAdd
2014-04-09 00:12:48 +04:00
Ilya Lavrenov
fd3a6f0db7
cv::blur
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
f2a35d6388
cv::boxFilter
2014-04-09 00:11:28 +04:00
Ilya Lavrenov
c6f208e1c8
cv::medianBlur
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
c224cfa628
cv::accumulateSquare && cv::acumulateProduct
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
2c0c887f70
cv::accumulateWeighted
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
5ddff235bb
cv::polarToCart
2014-04-09 00:11:27 +04:00
Ilya Lavrenov
f1b38c4198
cv::warpPerspective and cv::warpAffine
2014-04-09 00:11:26 +04:00
Ilya Lavrenov
e090aa07db
disabled some IPP funcs
2014-04-08 22:30:18 +04:00
Vadim Pisarevsky
1b339eb0d4
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
2014-04-08 17:54:08 +04:00
Elena Gvozdeva
42d45e0b02
Added ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate
2014-04-08 16:51:15 +04:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
vbystricky
9828cd6086
Remove defined(HAVE_IPP)
2014-04-08 13:05:23 +04:00
vbystricky
f23134ce01
Add IPP_VERSION_X100 define
2014-04-08 12:43:57 +04:00
Martin Chodakowski
267241b889
Fix typos in old python wrapper documentation(Bug #3628 )
...
Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
2014-04-08 00:55:08 -04:00
vbystricky
7badc85b60
Fix for pullrequest comment
2014-04-07 17:06:02 +04:00
vbystricky
2d54581971
Fix ifdef for IPP version greater 8.1
2014-04-07 16:45:35 +04:00
vbystricky
38913bf5f6
Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'
2014-04-07 14:31:34 +04:00
vbystricky
566f783968
Fix errors
2014-04-07 14:31:33 +04:00
vbystricky
23e1b50837
Check 8.1 ipp version for color convertion functions, which not exists in versions before this.
2014-04-07 14:31:33 +04:00
vbystricky
06acb8b0ee
Check 8.1 ipp version for gaussian functions, which not exists in versions before this.
2014-04-07 14:31:32 +04:00
vbystricky
be29d628d3
Check 8.1 ipp version for morphology functions, which not exists in versions before this.
2014-04-07 14:31:32 +04:00
vbystricky
4512d06484
Fix const src matrix in IPPresizeInvoker
2014-04-07 14:31:31 +04:00
vbystricky
824ed8a3ae
Fix errors
2014-04-07 14:31:31 +04:00
vbystricky
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
2014-04-07 14:30:03 +04:00
vbystricky
a9a0ea3706
Fix error not initialized IppStatus before ipp functions call
2014-04-07 14:26:50 +04:00
vbystricky
c321330777
Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test
2014-04-07 14:26:50 +04:00
vbystricky
c29583eacc
Change Canny input image description, we can use multichannel image now
2014-04-07 14:26:48 +04:00
vbystricky
ee2df645f4
Canny uncommented, prefix of ipp function changed. Ipp version of Canny called only for images with one channels
2014-04-07 14:26:48 +04:00
vbystricky
a6b53489e6
Change sanity check for perfomance test of bilateral filter
2014-04-07 14:26:47 +04:00
vbystricky
aece433b15
Check ippStsNoErr as result of ipp function instead >=0
2014-04-07 14:26:47 +04:00
vbystricky
c65e5a1e7b
Fix error BGRA2RGBA color convertion by ipp. Uncomment ipp color converstion, which pass tests
2014-04-07 14:26:46 +04:00
vbystricky
b3db990daa
Remove unused code
2014-04-07 14:26:46 +04:00
vbystricky
07e84c635a
Remove unused code
2014-04-07 14:26:45 +04:00
vbystricky
06434bedfd
Change deprecated function ippicviMulC_32f_C1IR to ippicviMulC_32f_C1R. Check results of ipp function, if error was return run opencv branch of code
2014-04-07 14:26:45 +04:00
vbystricky
58de8bc917
Change deprecated functions to valid
2014-04-07 14:24:06 +04:00
vbystricky
01a66a2938
Prepare codes for ippicv library
2014-04-07 14:24:05 +04:00
Andrey Pavlenko
c2f859569c
Merge pull request #2563 from alalek:ipp_builds
2014-04-07 13:03:11 +04:00
Andrey Pavlenko
def4f5e2a3
Merge pull request #2499 from mlyashko:back_proj_fix1
2014-04-07 10:57:21 +04:00
Alexander Karsakov
c747426fc1
Enabled integer arithmetic for filterSepSinglePass
2014-04-03 16:53:57 +04:00
Alexander Alekhin
bfc546d23c
enable IPP ICV support
2014-04-03 15:05:38 +04:00
Alexander Karsakov
fc10ffefb8
Enabled integer arithmetic for row_filter_C1_D0
2014-04-03 13:31:06 +04:00
Alexander Karsakov
2cf3a6e26c
Fixed error in case corners not found
2014-04-03 10:30:55 +04:00
Alexander Karsakov
a3825acee4
Small refactoring
2014-04-02 16:38:32 +04:00
Andrey Pavlenko
6ef94b52ad
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
2014-04-01 12:54:07 +04:00
Ilya Lavrenov
31f864a22b
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
2014-03-31 20:25:53 +04:00
Alexander Karsakov
10a52220f0
Added integer arithmetic to sepFilter2D
2014-03-31 16:45:15 +04:00
mlyashko
5acd178790
copyright fix
2014-03-31 14:57:03 +04:00
Ilya Lavrenov
e1efed1914
added support of ksize >= 5 to cv::Laplacian
2014-03-31 13:17:58 +04:00
mlyashko
4c5de04efb
bug fix
2014-03-31 10:58:15 +04:00
Alexander Karsakov
d17142b83d
Prototype OCL version of gaussian blur with integer arithmetic
2014-03-28 21:46:03 +04:00
mlyashko
4b71921526
both tests by picture and rand mat
2014-03-27 17:08:05 +04:00
Andrey Pavlenko
a2f8a93bf5
Merge pull request #2529 from ilya-lavrenov:tapi_filter2D
2014-03-26 19:04:57 +04:00
Andrey Pavlenko
6c12f20395
Merge pull request #2528 from mlyashko:back_proj_fix
2014-03-26 19:04:39 +04:00
Ilya Lavrenov
f7d6d3cff5
improved cv::filter2D
2014-03-26 14:19:59 +04:00
mlyashko
70fdfa0bdb
changed type of sanity check
2014-03-25 16:43:20 +04:00
Andrey Pavlenko
d63a8ba018
Merge pull request #2523 from ilya-lavrenov:tapi_filters
2014-03-25 16:23:02 +04:00
mlyashko
953aafbd3d
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
2014-03-25 14:52:39 +04:00
mlyashko
f38fe76025
added perf test for CalcBackProj
2014-03-25 14:50:37 +04:00
Andrey Pavlenko
c6199fc3c1
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
2014-03-25 12:59:10 +04:00
Konstantin Matskevich
67926fa028
ocl morphology fix
2014-03-25 10:39:50 +04:00
Aaron Kunze
ede6d4482b
Optimizations to OpenCL bilateral filter.
2014-03-24 13:35:56 -07:00
Andrey Pavlenko
9e1124d24a
Merge pull request #2525 from ilya-lavrenov:tapi_sep
2014-03-24 22:43:34 +04:00
Ilya Lavrenov
061a25447e
eliminated restriction delta == 0 from cv::sepFilter2D
2014-03-24 17:39:07 +04:00
Ilya Lavrenov
e2c6ab0166
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
2014-03-24 14:42:51 +04:00
Ilya Lavrenov
b6833fdde7
added 3-channels support to cv::medianBlur
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
a51ab99a79
added 3-channels support to cv::filter2D, cv::Laplacian
2014-03-24 14:32:31 +04:00
Ilya Lavrenov
e19c42dded
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
2014-03-24 14:31:42 +04:00
Ilya Lavrenov
8f5fd44fb2
added 3 channels support to cv::bilateralFilter
...
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
2014-03-24 14:31:41 +04:00
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
2014-03-24 13:02:54 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Andrey Pavlenko
8ac93f9b6b
Merge pull request #2508 from akarsakov:fix_erode_intel
2014-03-21 18:25:12 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Alexander Karsakov
0bd4fd3a87
Workaround for Intel platform: replace min() with ternary operator
2014-03-21 09:33:00 +04:00
Andrey Pavlenko
bdfd29a0b8
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
2014-03-20 19:20:15 +04:00
Ilya Lavrenov
63d8a61b9b
enabled 3-channels support for cv::createSuperResolution_BTVL1
2014-03-20 13:31:20 +04:00
Ilya Lavrenov
291458a859
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
2014-03-19 18:56:16 +04:00
Ilya Lavrenov
b449b0bf71
simplified cv::sepFilter2D OpenCL part
2014-03-19 15:59:00 +04:00
Ilya Lavrenov
b73490f86c
eliminated restriction src[i].channels() == 1 in cv::merge
2014-03-19 13:56:31 +04:00
Ilya Lavrenov
d1cfcfcafd
added 3-channels support to morphology operations
2014-03-18 20:15:11 +04:00
Ilya Lavrenov
82e6edfba2
optimized sep filter
2014-03-18 00:16:38 +04:00
Andrey Pavlenko
2a1d5c6d43
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
2014-03-17 13:10:34 +04:00
Ilya Lavrenov
6f12f1b3b5
added 3 vs 4 channels performance tests
2014-03-14 17:30:14 +04:00
Andrey Pavlenko
4233539617
Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
2014-03-13 18:37:05 +04:00
Andrey Pavlenko
0764a23eb2
Merge pull request #2459 from ilya-lavrenov:tapi_experiments
2014-03-13 16:49:57 +04:00
Roman Donchenko
553673eeed
Merge pull request #2468 from mlyashko:back_proj_fix
2014-03-13 13:42:20 +04:00
Alexander Alekhin
dca401d4cc
ocl: pyrUp/pyrDown 3-channel
2014-03-12 14:39:55 +04:00
Ilya Lavrenov
f138b613b7
cv::compare
2014-03-12 13:16:33 +04:00
mlyashko
5252aa8fdd
added data type check for back projection fix
2014-03-12 11:30:28 +04:00
Ilya Lavrenov
2755ae5df9
experiments
2014-03-11 23:03:55 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Andrey Pavlenko
5261fbe217
Merge pull request #2387 from alalek:ocl_remap_3cn
2014-03-11 15:59:12 +04:00
Alexander Alekhin
e7475bff68
TAPI: remap 3-channel
2014-03-10 20:35:10 +04:00
Alexander Alekhin
e4608229f0
ocl: copyMakeBorder 3-channel
2014-03-10 17:22:49 +04:00
Ilya Lavrenov
208831eb5d
optimized cv::calcHist
2014-03-08 12:24:31 +04:00
Andrey Pavlenko
2879ff2098
Merge pull request #2437 from ilya-lavrenov:tapi_morph
2014-03-07 14:00:09 +04:00
Andrey Pavlenko
451be9ed53
Merge pull request #2444 from ilya-lavrenov:tapi_gftt
2014-03-07 13:53:43 +04:00
Andrey Pavlenko
3cb49eac49
Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data
2014-03-07 13:52:47 +04:00
sprice
75ed2f52f1
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
2014-03-06 15:39:06 -08:00
Ilya Lavrenov
dc76e6b4a1
added new dtypes to cv::Sobel
2014-03-06 17:57:13 +04:00
Ilya Lavrenov
4a7289b22f
improved cv::preCornerDetect
2014-03-06 17:40:02 +04:00
Ilya Lavrenov
1291bd1c4a
ported fast calculation of covar data
2014-03-06 15:40:27 +04:00
Ilya Lavrenov
86a3ed4162
improved performance of GFTT
2014-03-06 09:19:40 +04:00
Andrey Pavlenko
c9d8025fab
Merge pull request #2391 from ilya-lavrenov:tapi_match_template
2014-03-04 18:50:14 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Roman Donchenko
0692a674d1
Merge pull request #2381 from ElenaGvozdeva:ipp_resize
2014-03-04 11:49:02 +04:00
Ilya Lavrenov
4376de7698
fixed morphology operations
2014-03-03 15:29:48 +04:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Elena Gvozdeva
68edda3350
fixed
2014-02-28 11:56:23 +04:00
Roman Donchenko
bd5d8404c9
Merge pull request #2393 from ilya-lavrenov:coverity
2014-02-26 12:16:36 +04:00
Ilya Lavrenov
ce0557ebb8
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
Elena Gvozdeva
45cc8a5300
fixed
2014-02-25 16:43:52 +04:00
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Elena Gvozdeva
48e7bc6b30
fixed
2014-02-25 12:59:33 +04:00
Ilya Lavrenov
653b99c9bd
new scheme of sqrSum
2014-02-25 00:38:44 +04:00
Nghia Ho
ced8e7a813
Typo
2014-02-24 20:06:20 +11:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0ef16125ae
improved cv::matchTemplate OpenCL part
2014-02-22 14:30:19 +04:00
Ilya Lavrenov
804b70b72f
ported 2.4 perf tests for matchTemplate
2014-02-20 18:11:56 +04:00
Elena Gvozdeva
7b552c0493
fixed
2014-02-20 17:34:51 +04:00
Elena Gvozdeva
cd68cd43a2
Fixed
2014-02-20 16:13:05 +04:00
Elena Gvozdeva
e013d31715
Added IPP function for resize()
2014-02-20 14:01:22 +04:00
Roman Donchenko
ce42593fe6
Merge pull request #2368 from asmorkalov:ocv_gcc48_warning_fix
2014-02-19 12:03:06 +04:00
Alexander Smorkalov
4c1ed13846
Warning fixes for GCC 4.8.
2014-02-18 23:53:35 +04:00
Roman Donchenko
c35dab9046
Merge pull request #2359 from SpecLad:moments-no-vectorize
2014-02-18 17:00:32 +04:00
Roman Donchenko
e35d98e566
Worked around an apparent GCC bug in moments.
2014-02-18 13:51:27 +04:00
Ilya Lavrenov
01527c44fd
removed unused field
2014-02-17 21:50:00 +04:00
Andrey Pavlenko
47d9b933f6
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
2014-02-17 17:38:26 +04:00
Ilya Lavrenov
c8e22c04c8
extended performance test
2014-02-16 13:42:25 +04:00
Ilya Lavrenov
7629bb78a4
extended performance tests to test 3 channels
2014-02-16 01:31:33 +04:00
Ilya Lavrenov
8150c1b7e4
added [s|l]rgb <-> lab conversion
2014-02-14 18:45:56 +04:00
Vadim Pisarevsky
630bdbf42f
fixed OpenCL kernel flag in resize (thanks to Ilya L)
2014-02-13 17:37:42 +04:00
Vadim Pisarevsky
290fbc0121
3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective
2014-02-12 19:29:18 +04:00
Alexander Alekhin
ce992c8269
ocl: update gftt
2014-02-07 14:51:59 +04:00
Andrey Pavlenko
4b31b9cb8c
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
2014-02-07 11:33:49 +04:00
Ilya Lavrenov
412468e0ae
added cv::sqrBoxFilter to T-API
2014-02-06 19:19:18 +04:00
Ilya Lavrenov
c7fe162829
renamed **2 -> **
2014-02-04 19:55:11 +04:00
Elena Gvozdeva
85d519b6c3
fixed
2014-02-04 10:54:02 +04:00
Andrey Pavlenko
9dede73d9f
Merge pull request #2153 from scottbreyfogle:constrained-hough-lines
2014-02-03 17:35:15 +04:00
Roman Donchenko
109e71e4ef
Merge pull request #2263 from ilya-lavrenov:include_fix
2014-02-03 17:25:12 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Ilya Lavrenov
9a1e461450
fix for PR 2166
2014-02-03 14:47:32 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Ilya Lavrenov
e844c08203
some fixes and improvements in cv::matchTemplate
2014-02-02 19:20:37 +04:00
Scott Breyfogle
aaa9be7c65
Merge remote-tracking branch 'original/master' into constrained-hough-lines
2014-01-31 14:27:51 -08:00
Scott Breyfogle
b074c67a56
Add static cast to hough lines
2014-01-31 14:26:45 -08:00
Andrey Pavlenko
c909a21035
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
2014-01-31 19:25:29 +04:00
Andrey Pavlenko
b0befeb1b3
Merge pull request #2232 from ilya-lavrenov:ABF_drop
2014-01-31 19:17:16 +04:00
Ilya Lavrenov
c01e8e9361
removed ABF
2014-01-31 19:15:40 +04:00
Andrey Pavlenko
2c35438771
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
2014-01-31 19:14:19 +04:00
Andrey Pavlenko
82bab2b03b
Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter
2014-01-31 19:04:49 +04:00
Alexander Alekhin
9300af90cd
imgproc/intersection: fix loop index
2014-01-31 14:42:38 +04:00
Ilya Lavrenov
68f5dd4170
simplified cv::boxFilter OpenCL impl
2014-01-31 01:53:38 +04:00
Ivy Lee
b7f2b671a2
Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer
2014-01-30 21:53:05 +00:00
Andrey Pavlenko
77bbd65fa6
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
2014-01-30 17:33:06 +04:00
Ilya Lavrenov
1ab1594d00
workaround
2014-01-30 17:26:56 +04:00
Ilya Lavrenov
372cdac07c
moved kernelToStr to ocl.hpp
2014-01-30 15:23:11 +04:00
Ilya Lavrenov
231bc17de7
added conditional compilation
2014-01-30 13:07:13 +04:00
Ilya Lavrenov
1862dbc5ab
fixed fp problem
2014-01-30 05:48:15 +04:00
Ilya Lavrenov
0d19cbcc7a
added performance test
2014-01-30 02:01:38 +04:00
Ilya Lavrenov
6d64907f18
async
2014-01-30 00:19:18 +04:00
Ilya Lavrenov
6fa41c5a64
some experiments
2014-01-30 00:12:59 +04:00
Ilya Lavrenov
faa6074f3d
added performance test
2014-01-29 20:34:37 +04:00
Ilya Lavrenov
384a28622d
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
2014-01-29 20:19:15 +04:00
Ilya Lavrenov
7c96d98a24
implemented OpenCL version of cv::accumulate****
2014-01-29 11:42:46 +04:00
Ilya Lavrenov
41bc5808c0
optimized createHanningWindow
2014-01-28 23:37:20 +04:00
Andrey Pavlenko
fff5a6c058
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
2014-01-28 16:31:30 +04:00
Seunghoon Park
eb9d7c4dd5
fixing bug #3345 . use norm to make sure two matrices are the same.
2014-01-27 20:57:40 -05:00
Seunghoon Park
73389b2b9c
Merge branch '2.4' into blur_border_isolated
2014-01-27 20:44:03 -05:00
Ilya Lavrenov
78c2b3ca2a
refactored imgproc
2014-01-27 18:47:16 +04:00
Ilya Lavrenov
48a084c236
OpenCL version of cv::buildPyramid
2014-01-27 18:42:44 +04:00
Elena Gvozdeva
07a88d48e9
fixed
2014-01-24 11:41:23 +04:00
Elena Gvozdeva
4d86804f11
Fixed merge conflicts
2014-01-23 15:31:32 +04:00
Elena Gvozdeva
7bd8f9294d
fixed
2014-01-23 14:50:30 +04:00
Elena Gvozdeva
8c5e19c270
fixed pref test
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
b4652e2cb3
Added perf test for ocl_matchTemplate
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
2c0765b4d1
fixed trailing whitespace
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
7e2bdb590f
fixed
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
4da1ba56b3
fixed
2014-01-23 14:50:29 +04:00
Elena Gvozdeva
47b572f99f
fixed
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
da4d33ec26
Fixed test_match_template
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
9de70c9a00
Fixed trailing whitespace
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
ba5d480f80
Fixed warnings
2014-01-23 14:50:28 +04:00
Elena Gvozdeva
86636dc265
Added ocl_matchTemplate( without dft)
2014-01-23 14:50:28 +04:00
Andrey Pavlenko
ba77719914
Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix
2014-01-22 19:13:05 +04:00
Ilya Lavrenov
d2ffd8ed21
implemented OpenCL version of cv::preCornerDetect
2014-01-22 13:46:26 +04:00
Ilya Lavrenov
059e6e4305
fixed cv::sepFilter2D
2014-01-22 13:40:48 +04:00
Andrey Pavlenko
069bb9a929
Merge pull request #2185 from ilya-lavrenov:tapi_corners
2014-01-22 10:25:41 +04:00
Andrey Pavlenko
99942e8043
Merge pull request #2166 from ilya-lavrenov:tapi_gftt
2014-01-21 22:29:41 +04:00
Ilya Lavrenov
3177a683e9
ported corners to T-API
2014-01-21 20:13:55 +04:00
Ilya Lavrenov
bfa382cf9d
fixed copying UMat -> std::vector
2014-01-21 14:37:22 +04:00
Andrey Pavlenko
801d2d0a32
Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn
2014-01-20 23:33:55 +04:00
Ilya Lavrenov
e5130cf83f
enabled tests
2014-01-20 18:09:43 +04:00
Roman Donchenko
9dc93ce328
Merge pull request #2176 from SpecLad:merge-2.4
2014-01-20 18:04:56 +04:00
Roman Donchenko
e45fd939c2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Roman Donchenko
087371c021
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
2014-01-20 14:15:05 +04:00
Ilya Lavrenov
5abfd40989
added perf test for cv::goodFeaturesToTrack
2014-01-20 13:57:53 +04:00
Ilya Lavrenov
52ed6d0d27
ported cv::goodFeaturesToTrack to T-API
2014-01-20 13:57:53 +04:00
Anatoly Baksheev
4e20e06ee7
warnings
2014-01-19 04:07:24 +04:00
Ilya Lavrenov
6b8bee6e0b
fixed kernel compilation warnings
2014-01-18 22:37:47 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
Daniil Osokin
8ce691e679
Fixed cvtColor alpha channel docs
2014-01-16 18:36:06 +04:00
Roman Donchenko
07e08f7a3d
Merge pull request #2141 from ilya-lavrenov:perf_warp
2014-01-16 18:03:21 +04:00
Scott Breyfogle
0ea454301f
Added optional constraints to non-probablistic hough lines functions
2014-01-15 13:22:56 -08:00
Ilya Lavrenov
82d3efc6c0
added perf test for cv::Canny
2014-01-15 20:06:24 +04:00
Seunghoon Park
2272a58769
fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type
2014-01-14 20:47:23 -05:00
Ilya Lavrenov
7ed692bf92
fixed cv::cvtColor
2014-01-14 16:16:35 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
30b5234e9a
added perf test for cv::sqrBoxFilter
2014-01-13 18:51:49 +04:00
Ilya Lavrenov
8702fceb4b
fixed cv::integral perf test
2014-01-13 18:36:52 +04:00
Ilya Lavrenov
a7a7b80ff8
added perf test for cv::Moments
2014-01-13 17:50:14 +04:00
Ilya Lavrenov
6fb878a65f
added perf tests for cv::medianBlur
2014-01-13 15:59:24 +04:00
Ilya Lavrenov
5e7fd8bd7e
added perf tests for cv::morphologyEx
2014-01-13 15:43:09 +04:00
Ilya Lavrenov
5a2a0b326a
added perf tests for cv::dilate
2014-01-13 15:30:35 +04:00
Ilya Lavrenov
f61597dce8
added perf tests for filters
2014-01-13 15:26:50 +04:00
Ilya Lavrenov
04ae46e21c
added perf tests to some imgproc functions
2014-01-13 15:01:52 +04:00
Ilya Lavrenov
e76d51511e
added perf test for cv::cvtColor, pyr operations
2014-01-13 14:40:42 +04:00
Ilya Lavrenov
4bd4c8d12a
added perf tests for cv::blendLinear
2014-01-13 14:06:15 +04:00
Ilya Lavrenov
6fbaff6d83
added perf tests for T-API warp operations
2014-01-13 13:10:26 +04:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Seunghoon Park
b036fc756a
fixing bug #3345
2013-12-30 21:10:06 -05:00
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
2013-12-31 00:26:22 +04:00
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
2013-12-31 00:17:33 +04:00
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
2013-12-30 17:13:40 +04:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Roman Donchenko
0e552ea6e2
Merge commit '1acc1085d' into merge-2.4
2013-12-30 16:37:39 +04:00
Konstantin Matskevich
55634c1f52
fix
2013-12-30 13:06:32 +04:00
Andrey Pavlenko
dbaf125fcd
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
2013-12-28 22:05:49 +04:00
Andrey Pavlenko
0913dd7ffa
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
2013-12-27 22:38:08 +04:00
vbystricky
26d53c7435
Change threshold from 2.0 to 1.0 in the test
2013-12-27 16:26:34 +04:00
vbystricky
b719ed79c2
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
2013-12-27 16:21:32 +04:00
Andrey Pavlenko
5c25d821b1
Merge pull request #2063 from vpisarev:ocl_moments
2013-12-27 15:44:12 +04:00
Ilya Lavrenov
52b8bb6761
fixed getUMatIndex
2013-12-27 13:18:31 +04:00
Konstantin Matskevich
a70a8e8680
CLAHE
2013-12-27 10:12:22 +04:00
Vadim Pisarevsky
48c7378c8f
improved performance of moments (on 720p or larger images)
2013-12-26 23:29:04 +04:00
Andrey Pavlenko
4b885e2067
Merge pull request #2068 from akarsakov:disable_ipp
2013-12-26 22:41:52 +04:00
Vadim Pisarevsky
e97dd57dc7
hopefully fixed test failures and complains from the doc builder
2013-12-26 22:00:29 +04:00
Andrey Pavlenko
4644a864a5
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
2013-12-26 20:37:34 +04:00
Alexander Karsakov
6ef0253fb7
Disabled some IPP implementation since it breaks tests
2013-12-26 19:53:53 +04:00
Ilya Lavrenov
b23edc34e9
added cv::calcBackProject for 2-dimensional histograms
2013-12-26 19:17:32 +04:00
Konstantin Matskevich
ca9810e8aa
hope last fix
2013-12-26 17:16:55 +04:00
Ilya Lavrenov
d64bea00b2
ported cv::calcBackProject to T-API
2013-12-26 14:58:50 +04:00
dpen2000
d6a88397b4
Fix python sample path
2013-12-26 10:36:24 +00:00
Vadim Pisarevsky
a760c454dd
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )
2013-12-26 13:25:00 +04:00
Konstantin Matskevich
52df2b346b
not synchronous kernel's run
2013-12-26 10:45:09 +04:00
Konstantin Matskevich
7a186c72e1
some fixes
2013-12-26 09:55:18 +04:00
Konstantin Matskevich
f55c85fed3
morphology
2013-12-26 09:55:17 +04:00
Vadim Pisarevsky
83f749afd2
moments work now and work more or less fast
2013-12-26 02:57:08 +04:00
Andrey Pavlenko
1aaeea9941
Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist
2013-12-26 00:05:13 +04:00
Vadim Pisarevsky
6035925f41
experimental moments implementation (does not work yet)
2013-12-25 21:09:23 +04:00
vbystricky
9e05d18d42
Fix compilation warnings
2013-12-25 18:05:07 +04:00
vbystricky
35dc26e0b9
Add ocl implementation of the sepFilter2D into img_proc module.
2013-12-25 16:48:32 +04:00
Konstantin Matskevich
9d04a7aba9
bugfix in equalizeHist
2013-12-25 15:16:26 +04:00
Alex Willisson
4293a54447
Fixed typo in comment
2013-12-24 19:53:50 -05:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Andrey Pavlenko
b29835a8f8
Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp
2013-12-20 21:39:10 +04:00
Andrey Pavlenko
14782194f4
Merge pull request #1995 from akarsakov:ocl_pyramids
2013-12-20 17:57:09 +04:00
Leszek Swirski
9c22d4887c
imgproc: IPP compilation fix and minor cleanup
2013-12-20 12:40:40 +00:00
Alexander Karsakov
febe528363
Added ocl::pyrUp to T-API
2013-12-19 17:21:50 +04:00
Andrey Pavlenko
26f5d2d639
Merge pull request #1765 from ilya-lavrenov:cv_remap
2013-12-19 17:08:52 +04:00
Vadim Pisarevsky
f41f633d2d
fixed various warnings from the “doc” and other builders
2013-12-19 16:31:30 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Alexander Karsakov
ac230cd2ae
Added ocl::pyrDown to T-API
2013-12-19 13:56:42 +04:00
Andrey Pavlenko
6a0fb2c7da
Merge pull request #1992 from ElenaGvozdeva:ocl_medianFilter
2013-12-17 16:42:16 +04:00
Vadim Pisarevsky
9d3e7e027a
almost finished opencl-ization of cascade classifier
2013-12-17 14:29:30 +04:00
Roman Donchenko
6d77cbee7e
Merge pull request #1934 from vbystricky:ocl_boxFilter
2013-12-17 14:11:51 +04:00
Elena Gvozdeva
d9d4678599
Fixed condition for channels
2013-12-17 11:15:48 +04:00
Elena Gvozdeva
125d67130b
Fixed medianFilter
2013-12-17 11:04:54 +04:00
Elena Gvozdeva
8fe4e98b8a
Fixed trailing whitespace
2013-12-16 18:06:11 +04:00
Elena Gvozdeva
b2d8b491c0
Added ocl_medianFilter using Transparent API
2013-12-16 13:20:05 +04:00
Ilya Lavrenov
5c0dabf1ea
added cv::equalizeHist to T-API
2013-12-13 19:46:20 +04:00
sprice
1c15776cf5
Merge branch 'master' of https://github.com/Itseez/opencv
...
Conflicts:
modules/imgproc/src/sumpixels.cpp
2013-12-11 14:35:51 -08:00
Andrey Pavlenko
f3e2bfea79
Merge pull request #1970 from ilya-lavrenov:tapi_checks
2013-12-11 21:37:10 +04:00
Andrey Pavlenko
eeb16a5d01
Merge pull request #1971 from ilya-lavrenov:tapi_laplacian
2013-12-11 21:25:54 +04:00
Vladimir Bystricky
268d814d18
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 16:57:47 +04:00
Andrey Pavlenko
129b715e3d
Merge pull request #1958 from vbystricky:ocl_filter2D
2013-12-11 16:41:12 +04:00
Vladimir Bystricky
f76bf8b425
Fix error in test
2013-12-11 14:33:22 +04:00
Vladimir Bystricky
e7227d3e4b
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
2013-12-11 14:26:33 +04:00
Ilya Lavrenov
8fa8b36b42
added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API
2013-12-10 23:20:28 +04:00
Ilya Lavrenov
5566d31468
more strict checks outside ROI
2013-12-10 19:30:14 +04:00
Andrey Pavlenko
d802b4d143
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear
2013-12-10 18:49:42 +04:00
Roman Donchenko
90c28d254f
Merge pull request #1961 from SpecLad:merge-2.4
2013-12-10 14:39:35 +04:00
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
2013-12-09 16:03:25 +04:00
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
2013-12-09 11:31:55 +04:00
Vladimir Bystricky
179a43ef63
Fix build errors on Linux system
2013-12-09 11:10:48 +04:00
Vladimir Bystricky
29ba7730ed
Add ocl version of filter2D to the module img_proc
2013-12-09 10:45:23 +04:00
Ilya Lavrenov
73aa43d2ca
fixed warnings
2013-12-07 01:05:07 +04:00
Andrey Pavlenko
1d01c49a06
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
2013-12-06 15:47:39 +04:00
Vladimir Bystricky
44126e350a
Change while(true) to for(;;) for fix compiler warning.
2013-12-06 15:11:26 +04:00
Vladimir Bystricky
591b1a7e70
Another fix for disable "conditional expression is constant"
2013-12-06 14:42:06 +04:00
Vladimir Bystricky
3013b469fe
Add check for depths of destination and source image. Fix warning C4127.
2013-12-06 14:21:51 +04:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Vladimir Bystricky
af6134b4b6
Fix issue in boxFilter with destination depth not equal to source depth.
2013-12-05 14:25:15 +04:00
Vladimir Bystricky
968a898a1b
Add ocl version of boxFilter to the module img_proc
2013-12-05 11:47:17 +04:00
sprice
2cc11e2c6a
Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
2013-12-04 18:13:34 -08:00
Ilya Lavrenov
eb7ff99f80
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
2013-12-04 22:04:31 +04:00
Andrey Pavlenko
458ac2592b
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
2013-12-04 21:41:44 +04:00
Roman Donchenko
0736ede7e5
Merge pull request #1914 from SpecLad:merge-2.4
2013-12-04 16:30:57 +04:00
Ilya Lavrenov
e2b99a32b2
added cv::threshold to T-API
2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6
added cv::copyMakeBorder to T-API
2013-12-04 13:41:35 +04:00
Ilya Lavrenov
5b5f5878ce
added tests to imgproc
2013-12-04 13:41:34 +04:00
Andrey Pavlenko
f9190cc662
Merge pull request #1909 from alalek:ocl_tapi_perf
2013-12-04 11:35:11 +04:00
Ilya Lavrenov
803672feea
added cv::remap to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
dcce9d7088
added cv::warpAffine to T-API
2013-12-04 00:43:43 +04:00
Ilya Lavrenov
55af7857b9
added cv::warpPerspective to T-API
2013-12-04 00:43:42 +04:00
Alexander Alekhin
7d9150460a
core/ocl: added perf test infra + "Add" perf test
2013-12-03 18:43:50 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
2013-12-03 11:20:26 +04:00
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
2013-12-02 12:28:18 +04:00
Vadim Pisarevsky
7626a8e8de
try to eliminate failure in opencv_imgproc_test
2013-12-02 12:13:50 +04:00
Vadim Pisarevsky
d7f4a223cf
fixed several compile errors/warnings; reacted on the PR comments
2013-12-01 20:58:30 +04:00
Vadim Pisarevsky
6da5d21331
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
2013-12-01 03:12:19 +04:00
Ilya Lavrenov
09795e3265
added cv::resize INTER_AREA to T-API
2013-11-29 17:57:37 +04:00
Andrey Pavlenko
d83094b412
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
2013-11-29 12:59:09 +04:00
Roman Donchenko
9ca80961fd
Merge pull request #1874 from SpecLad:merge-2.4
2013-11-28 16:43:00 +04:00
Ilya Lavrenov
4eba74ee19
added cv::LUT to T-API
2013-11-28 12:31:04 +04:00
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
Ilya Lavrenov
d2e1318341
RGBA <-> mRGBA
2013-11-27 23:42:10 +04:00
Ilya Lavrenov
f771a0ba81
RGB[A] <-> HLS
2013-11-27 23:37:58 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Ilya Lavrenov
727a5e6df4
BGR5x5 <-> Gray
2013-11-27 22:19:44 +04:00
Ilya Lavrenov
8a23646897
RGB[A] <- RGB5x5
2013-11-27 20:00:35 +04:00
Ilya Lavrenov
81b9c9c104
RGB[A] -> RGB5x5
2013-11-27 19:52:42 +04:00
Ilya Lavrenov
af367c4f85
RGB[A] <-> BGR[A]
2013-11-27 19:44:37 +04:00
Ilya Lavrenov
ab9b883c69
RGB[A] <-> XYZ
2013-11-27 19:37:27 +04:00
Ilya Lavrenov
65ee06eb2b
RGB[A] <-> XYZ
2013-11-27 19:25:26 +04:00
Ilya Lavrenov
506c19616d
YCrCb -> RGB[A]
2013-11-27 19:24:27 +04:00
Andrey Pavlenko
41ae5d5f66
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
2013-11-27 18:08:11 +04:00
Roman Donchenko
28242f09d0
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
2013-11-27 17:58:54 +04:00
Ilya Lavrenov
90d62cacc9
fixed cv::cvtColor
2013-11-27 16:43:31 +04:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Ilya Lavrenov
6679aed61e
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
2013-11-27 02:52:02 +04:00
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Roman Donchenko
aaf97c4548
Merge pull request #1863 from nevion:master
2013-11-26 13:53:48 +04:00
Eric Sommerlade
3b4f65b186
fixed comparison to stop integer wrap around
2013-11-26 00:12:30 +00:00
Ilya Lavrenov
16a3067afc
cp test_colot.cpp to imgproc ocl tests
2013-11-25 19:19:17 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
Jason Newton
88b2fe9dbb
correct upper bound for maximum number of labels for 8-way connectivity
2013-11-24 01:20:07 -08:00
StevenPuttemans
7a8bd31657
Fixed bug in report #3346
2013-11-22 09:57:47 +01:00
Ilya Lavrenov
561a7f5782
fixed kernel compilation in imgproc module
2013-11-21 18:23:57 +04:00
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
2013-11-19 19:20:24 -05:00
Vadim Pisarevsky
241002384c
fixed some more compile errors
2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
8762ee3f6f
removed unnecessary opencl kernels
2013-11-18 12:02:10 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Roman Donchenko
b5777efee6
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
2013-11-06 13:59:44 +04:00
Ilya Lavrenov
e9b54ab844
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
2013-11-06 13:53:44 +04:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Ilya Lavrenov
5546f4d77f
consistency SSE2 and plain versions of convertMaps and remap
2013-11-01 14:50:41 +04:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
2013-10-29 11:14:16 +04:00
Vadim Pisarevsky
ace0d4bad0
hopefully, the last test failures are fixed now
2013-10-24 23:31:00 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Vadim Pisarevsky
d8c8339bec
the first draft of transparent API and new UMat class. more files
2013-10-22 14:05:15 +04:00
Ilya Lavrenov
bebc1c9330
misprint
2013-10-19 22:59:47 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
723af15228
ocl: fix warnings from GCC 4.8, update Haar
2013-10-11 18:42:17 +04:00
Roman Donchenko
685eceb68a
Merge pull request #1567 from ilya-lavrenov:warn_fix
2013-10-08 13:50:49 +04:00
Roman Donchenko
895308a811
Merge pull request #1538 from StevenPuttemans:bugfix_3283
2013-10-08 13:00:39 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Ilya Lavrenov
036e99d03a
fixed ipp-related warnings
2013-10-05 14:54:00 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
StevenPuttemans
2f474db27f
Fix of bug #3283 and bug #3301
...
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
2013-10-04 11:19:45 +02:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Vadim Pisarevsky
bc1f9d6268
fixed description of createLineSegmentDetector
2013-09-30 15:07:32 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Nghia Ho
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
2013-09-26 19:13:01 +10:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
Ovidiu Parvu
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Ovidiu Parvu
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Ovidiu Parvu
73f476bd4b
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
2013-09-18 15:51:10 +01:00
Ovidiu Parvu
737c5fe781
Updated the return type of the cvMinEnclosingTriangle function in the documentation
2013-09-18 13:09:55 +01:00
Ovidiu Parvu
dc64dd7315
Made the following changes after code inspection (min_enclosing_triangle.cpp):
...
* Corrected minor typos in comments/function signatures
* Added new details to copyright statement
* Removed unreferenced macros
* Removed the assert statement which was checking the type of the OutputArray triangle
* When returning results using Mat::copyTo instead of Mat::convertTo
* Changed C-style casts to static_casts
* Added division by zero check to distanceFromPointToLine() function
* Updated reference webpages last access dates
* Moved the declaration of the gammaOfA variable outside the while loop in moveAIfLowAndBIfHigh() function for efficiency reasons
2013-09-18 12:21:24 +01:00
Ovidiu Parvu
b570a4ac47
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
2013-09-15 23:40:40 +01:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Ovidiu Parvu
caaa9e0f2d
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)
2013-09-15 15:07:17 +01:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Ovidiu Parvu
9902affae6
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.
2013-09-12 14:34:08 +01:00
Ovidiu Parvu
4fce8e6b0e
Changed the semantics of the minEnclosingTriangle function such that:
...
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
2013-09-12 13:29:10 +01:00
Ovidiu Parvu
510ad8e779
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
...
- Adapted the source code to accommodate this change
2013-09-12 10:11:38 +01:00
Roman Donchenko
f31d06f980
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
2013-09-12 12:19:37 +04:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Vadim Pisarevsky
61f2107829
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
2013-09-09 16:13:39 +04:00
Roman Donchenko
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Ilya Lavrenov
be98cd2f7f
replaced explicit __stdcall by CV_STDCALL
2013-09-05 19:25:03 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Daniel Angelov
25c0d5978c
Update on the compare lines method.
2013-09-05 00:02:24 +03:00
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
Daniel Angelov
b5e1eb7d48
Removed IOArray constness.
2013-09-04 14:59:57 +03:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vadim Pisarevsky
e85e4d3ab9
fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim)
2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f
Add IPP support in resize, warpAffine, warpPerspective functions
2013-09-02 18:04:06 +04:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Daniel Angelov
24e916059f
Added LineSegmentDetector documentation and an output image.
2013-08-31 13:46:24 +03:00
Daniel Angelov
9d78b8003e
Update on LSD no to use any Mat* (IOArrays instead).
...
Updated to new license.
2013-08-31 13:46:24 +03:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
Vadim Pisarevsky
f12702be24
fixed bugs in rectangular morphology case
2013-08-28 19:53:40 +04:00
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
2013-08-28 17:00:26 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
2013-08-28 13:31:09 +04:00
Roman Donchenko
10cb9a0c4a
Merge pull request #1342 from nevion:master
2013-08-28 12:00:39 +04:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Jason Newton
affab4f156
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
2013-08-27 00:34:22 -07:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
kdrobnyh
3c9f307193
macros -> template in IPP support cvtColor
2013-08-17 20:04:03 +04:00
Nghia Ho
d36dbe6ad6
Merge https://github.com/Itseez/opencv
2013-08-17 20:07:37 +10:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Nghia Ho
d194bb6143
Merge https://github.com/Itseez/opencv
2013-08-15 21:51:36 +10:00
Roman Donchenko
d09c89c63e
Merge pull request #1265 from abidrahmank:misc_docs2
2013-08-14 19:03:45 +04:00
Nghia Ho
2c9c4188ae
Merge https://github.com/Itseez/opencv
2013-08-14 22:38:39 +10:00
Dmitry Retinskiy
4eb85189e5
bug #3094 : added CV_Assert to PyrDown_ to check if source matrix is not empty
2013-08-14 15:30:35 +04:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Roman Donchenko
bcba3fc6b8
Merge pull request #1263 from abidrahmank:pyCLAHE_24
2013-08-14 12:10:22 +04:00
abidrahmank
1b93ecfae8
docs changes
2013-08-13 22:07:44 +05:30
abidrahmank
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
abidrahmank
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
Nghia Ho
79965c9ee9
Replaced isfinite() with cvIsInf and cvIsNan
2013-08-13 21:26:21 +10:00
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
2013-08-13 19:50:43 +10:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
390b67e5a0
Merge pull request #1251 from StevenPuttemans:bugfix_3209
2013-08-12 18:56:35 +04:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
fd056235d3
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
2013-08-12 11:44:38 +02:00
Roman Donchenko
98cd04c191
Merge pull request #1163 from kdrobnyh:Morphology
2013-08-12 12:06:31 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
kdrobnyh
7da5fa01d4
Removed extra {} in erosion and dilation functions
2013-08-08 12:30:28 +04:00
Roman Donchenko
79b6f68f54
Merge pull request #1233 from vpisarev:24_ipp_78
2013-08-08 12:00:52 +04:00
Nghia Ho
95ee02ba8e
Added extra comment to test buildbot
2013-08-08 01:33:21 +10:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Nghia
18e7aa5d19
Update intersection.cpp
...
Added #ifdef _WIN32 for finite number testing
2013-08-07 14:57:12 +10:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
2013-08-05 12:52:15 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
kdrobnyh
c1ad6a9ffb
Add IPP support in cvtColor function
2013-08-01 15:15:36 +04:00
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Nghia Ho
61386e1abd
Merge https://github.com/Itseez/opencv
...
Keeping up to date
2013-07-31 23:40:34 +10:00
Nghia Ho
00f63fa8f7
Finished test code, added image to the doc
2013-07-31 23:08:02 +10:00
Andrey Pavlenko
76a938c7ef
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests
2013-07-31 15:07:19 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
berak
03c4a6299b
expanded the CV_Assert in pyrdown_ to check for empty mats
2013-07-30 17:32:48 +02:00
Nghia Ho
3fcdbbe734
Merge https://github.com/Itseez/opencv
2013-07-30 23:58:10 +10:00
Andrey Pavlenko
b31293c984
Merge pull request #1194 from SpecLad:no-const-inputarray
2013-07-30 17:41:26 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Andrey Pavlenko
eb0d26b5be
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
2013-07-30 16:42:45 +04:00
kdrobnyh
94bc4c4429
Some changes in erosion and dilation functions
2013-07-30 15:13:04 +04:00
abidrahmank
9628bb0b44
morphologyex docs bug#2169
2013-07-30 06:46:59 +05:30
Nghia Ho
cb16f733b9
Added C interface
2013-07-28 15:31:58 +10:00
Nghia Ho
a40f217a38
changed from isnormal to isfinite, the prev ignored zero
2013-07-28 01:06:55 +10:00
Nghia Ho
a0576d7b2a
Fixed ret
2013-07-28 00:46:44 +10:00
Nghia Ho
e2f00ce846
New intersection function for rotated rectangles
2013-07-28 00:12:24 +10:00
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
2013-07-26 19:13:25 -07:00
Andrey Pavlenko
3a0e26b89d
adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so)
2013-07-26 17:27:31 +04:00
Dmitry Retinskiy
1d571b1eaa
bugfix #3121 : corrected calculation of blue channel index
2013-07-26 16:31:39 +04:00
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
2013-07-24 13:50:11 +04:00
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
Vadim Pisarevsky
8b6afd697d
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
2013-07-22 14:20:13 +04:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Andrey Pavlenko
f01cd3d99e
Merge pull request #1158 from StevenPuttemans:bugfix_3165
2013-07-21 18:47:16 +04:00
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
2013-07-21 10:39:24 +03:00
Daniel Angelov
68e348f960
Added private operator=.
2013-07-21 10:08:11 +03:00
Daniel Angelov
cedd768397
Fixed the M_PI to CV_PI
2013-07-21 01:54:27 +03:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
abidrahmank
692d807fa0
gabor filter docs Bug#1894
2013-07-20 00:15:28 +05:30
StevenPuttemans
27ed32f833
Applied bugfix #3165 : Changed min_eps value
2013-07-19 14:11:04 +02:00
Andrey Pavlenko
6b047ca0eb
minor improvement (consistency, readability)
2013-07-18 19:50:51 +04:00
Andrey Pavlenko
74c72a1d7a
removing unreachible code
2013-07-18 19:15:49 +04:00
Vladislav Vinogradov
7b87d72d80
refactored generalized hough (both CPU and GPU):
...
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
Roman Donchenko
b45d61d2ad
Merge pull request #1105 from kdrobnyh:Integral-Image-IPP
2013-07-17 13:10:24 +04:00
Alexander Smorkalov
16cfc7a531
WindowsRT build warning fixes.
2013-07-17 00:18:46 -07:00
kdrobnyh
487ded8b27
Add IPP erosion and dilation
2013-07-16 22:35:16 +04:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
Daniel Angelov
694d9ff2eb
LSD enum now anonymous.
2013-07-15 23:28:19 +03:00
Daniel Angelov
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Daniel Angelov
3350533f48
Fixed ambiguouty error, signess compare.
2013-07-13 05:08:15 +03:00
Daniel Angelov
6bd5e12be3
Added a sample to show usage of the class.
2013-07-13 04:11:27 +03:00
Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Daniel Angelov
5350a2f1d9
Added Line Segmen Detector.
2013-07-13 00:21:02 +03:00
kdrobnyh
df4b67a749
Merge pull request #1 from Itseez/2.4
...
Add calculating integral image using IPP
2013-07-10 10:45:24 -07:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
kdrobnyh
f8eb806565
Add IPP support to integral function
2013-07-10 11:25:36 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Heinz Hofbauer
a26c4fa2a2
Bugfix for an overlapping size of image and template for matchTemplate.
...
Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
2013-07-03 14:58:40 +02:00
Sergei Nosov
29955620e0
multiruns added to avoid the 'unreliable results' error
2013-06-26 15:07:39 +04:00
abidrahmank
a1ea1a7ec5
boxpoints documentation
2013-06-24 16:17:23 +05:30
abidrahmank
37f4e400e4
Added cv2.boxPoints() functionality to Python bindings (Feature #2023 )
...
http://www.code.opencv.org/issues/2023
eg:
In [3]: box = ((10,10),(5,5),0)
In [4]: cv2.boxPoints(box)
Out[4]:
array([[ 7.5, 12.5],
[ 7.5, 7.5],
[ 12.5, 7.5],
[ 12.5, 12.5]], dtype=float32)
2013-06-24 12:13:59 +05:30
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Sergei Nosov
c90abb6a03
add multiruns to fix "unreliable results" error
2013-06-13 21:14:42 +04:00
Roman Donchenko
1acbc7b7bd
Merge pull request #966 from berak:master
2013-06-11 18:17:07 +04:00
Vadim Pisarevsky
1fe7ad850b
Merge pull request #856 from ericgreveson:master
2013-06-10 15:25:09 +04:00
berak
765a2c6045
Moments.nu** fields initialized in completeMomentState( Moments* moments )
2013-06-07 18:29:00 +02:00
berak
610e29fa31
restored utility.hpp
2013-06-07 18:13:15 +02:00
berak
50e27ffc37
added initialization of Moments.nu** params in completeMomentState( Moments* moments )
2013-06-07 17:22:42 +02:00
Roman Donchenko
10340fe234
Merge pull request #949 from SpecLad:merge-2.4
2013-06-07 12:45:03 +04:00
IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
2013-06-05 21:59:01 -04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
f90fd5b0da
Split CLAHE into its own file, because it's faster that way.
...
Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely,
the previous commit makes CLAHE run about 10% slower on Android, even
though it doesn't even touch any CLAHE code. Splitting it off fixes that,
although the reason it does is a mystery for the ages.
It's cleaner when it's in its own file, anyway. ;=]
2013-05-31 12:22:04 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
abidrahmank
ca09ba6852
Bug #2960 : docs about CV_BGR2GRAY
2013-05-25 01:50:41 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
ericgreveson
e7995b4d5d
Take account of multi-channel matrices when comparing histograms
...
Ensure that all channels are considered when comparing multi-channel histograms
2013-05-18 23:31:22 +02:00
Vadim Pisarevsky
c549ec8371
Merge pull request #850 from SpecLad:convhull-orientation
2013-05-13 22:18:54 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
ericgreveson
19794e6857
Fix for spurious assert in cv::compareHist
...
When comparing histograms that look like multi-channel images (e.g a 3D histogram, of 4x4x4 bins, might appear as a CV_32FC4 matrix), cv::compareHist would complain because it was expecting the matrix type() == CV_32F. Now we test matrix depth() == CV_32F instead.
2013-04-29 19:52:41 +02:00
Roman Donchenko
2dc8642508
Changed convexHull's documentation to essentially invert the meaning of `clockwise
`.
...
The orientation of convexHull's result is currently the opposite of what the
documentation would suggest:
>>> import cv2, numpy as np
>>> points = np.array([[0,0],[0,1],[1,0]], dtype=np.int32)
>>> cv2.convexHull(points, clockwise=False)
array([[[1, 0]],
[[0, 1]],
[[0, 0]]], dtype=int32)
>>> cv2.convexHull(points, clockwise=True)
array([[[0, 0]],
[[0, 1]],
[[1, 0]]], dtype=int32)
Changing the function itself is probably not a good idea at this point, so
this fixes the documentation by flipping the coordinate system.
I also removed the mention of the origin, since it's irrelevant for this
function.
2013-04-26 14:22:55 +04:00
Andrey Kamaev
02131ffb62
Merge pull request #828 from tim36272:patch-1
2013-04-17 22:30:39 +04:00
Andrey Kamaev
8fdab9f631
Merge branch '2.4'
2013-04-17 12:07:17 +04:00
tim36272
5ef3ef9c4a
Clarified floodfill documentation
...
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
2013-04-17 00:34:20 -07:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Andrey Kamaev
96b008cd29
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
...
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
4846dcdfeb
Move borderInterpolate and copyMakeBorder documentation
2013-04-10 19:14:25 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
befd696720
Update documentation
2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Alexander Smorkalov
a914088f29
Build warning fixes.
2013-04-04 07:29:53 -07:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
605382562d
Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create
2013-04-01 15:24:35 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
969a7133a9
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
62adc01980
Move cv::Rect_
2013-04-01 15:24:33 +04:00
Andrey Kamaev
13b31b0804
Move C++ basic structures to separate header and inverse dependency from C API
...
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
Vladislav Vinogradov
5a4fa4607b
fixed misprint in imgwarp.cpp
2013-04-01 11:26:49 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Daniil Osokin
e153f0631c
Added missing enums for cvtColor RGB to YUV420p
2013-03-18 10:33:44 +04:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Andrey Kamaev
bbac4bc4cf
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-05 15:26:16 +04:00
Andrey Kamaev
d620ef0d55
Merge pull request #577 from ilya-lavrenov:BilateralFilter
2013-02-27 19:44:56 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
Ilya Lavrenov
3eed5d8c72
additional improvements for 32f
2013-02-27 17:54:22 +04:00
Ilya Lavrenov
efad6942e2
some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up)
2013-02-27 16:53:09 +04:00
Andrey Kamaev
242a6de719
Merge pull request #566 from FabricioS:master
2013-02-27 11:37:31 +04:00
Fabrice Silva
eca114ae95
Fix definition of the covariance matrix of derivatives.
2013-02-26 18:50:20 +01:00
Daniil Osokin
cf5e272878
Added multithreaded implementation for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Andrey Kamaev
d586f4a103
Fix x64 build warnings
2013-02-25 15:04:19 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Daniil Osokin
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
alegarda
62655b05f4
Indentation ok
2013-02-21 15:25:22 +01:00
alegarda
8a2b50dca6
Fixed undistort.cpp
2013-02-21 10:00:28 +01:00
alegarda
76d03fccb9
Added Thin Prism Distortion Model
...
Only the code.
2013-02-20 15:11:47 +01:00
Anna Kogan
f6e0d327b0
Increased time limits
2013-02-20 17:34:00 +04:00
Anna Kogan
a567c03fdf
Switched to TEST_CYCLE_MULTIRUN for fast tests
2013-02-20 17:05:54 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
4cc3dfe27c
Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
2013-02-14 20:13:45 +04:00
Vadim Pisarevsky
3c25ddd9ff
restored 8u->32f cvGetQuadrangleSubPix() mode (need better test for it)
2013-02-14 18:14:55 +04:00
Vadim Pisarevsky
78402bf596
made several minor fixes as pointed out by Andrey
2013-02-14 15:36:20 +04:00
Amro
42a2cb0a38
add description of ddepth param of cv::boxFilter
...
bug #2709
2013-02-13 15:16:17 +03:00
Vadim Pisarevsky
77d647b675
2 more warnings on Windows fixed
2013-02-13 02:32:10 +04:00
Vadim Pisarevsky
bd063e47d7
fixed the remaining warning in houghlines
2013-02-13 01:47:17 +04:00
Vadim Pisarevsky
8f33e80515
fixed bug in the new version of cornerSubPix
2013-02-13 01:46:02 +04:00
Vadim Pisarevsky
16d825adbc
fixed compile warnings and opencv_perf_imgproc failures
2013-02-13 01:23:57 +04:00
Vadim Pisarevsky
944588e732
converted houghlines to C++
2013-02-12 23:16:06 +04:00
Vadim Pisarevsky
7f8c925319
finished distance transform; fixed warnings
2013-02-12 21:35:37 +04:00
Vadim Pisarevsky
05ea571b08
almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet)
2013-02-12 18:56:22 +04:00
Vadim Pisarevsky
9124a76ae7
converted moments function to C++
2013-02-12 18:07:22 +04:00
Vadim Pisarevsky
59a5ba8938
converted watershed + pyrmeanshiftfilter to C++
2013-02-12 17:08:42 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Vadim Pisarevsky
06f4a56469
converted flood fill, getrectsubpix & cornersubpix to C++
2013-02-11 23:49:10 +04:00
Vadim Pisarevsky
43d61d961e
fixed problem with Nx2 numpy arrays in geometrical functions ( #2783 )
2013-02-08 18:11:56 +04:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
Andrey Kamaev
53e77ed468
Merge pull request #431 from snosov1:matchTemplate-tegra
2013-02-05 14:50:15 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Sergei Nosov
c0e3d48ebc
stricter eps for normed methods
2013-02-04 16:02:01 +04:00
Sergei Nosov
15d0484485
matchTemplate perf tests added
2013-02-04 12:57:22 +04:00
Sergei Nosov
c768731e89
enable Tegra optimizations
2013-02-04 12:57:03 +04:00
Andrey Kamaev
2a669555de
Merge pull request #414 from asmaloney:remove-unused-vars2
2013-02-02 14:34:47 +04:00
Andy Maloney
3154cdf8ac
Fix subtle bug when src & dst agree on sparsity but have different dimensions
...
Remove unused var "total"
Declare vars as locally as possible
2013-02-01 22:57:22 -05:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Daniil Osokin
4c9c27b244
Fixed formula of YCrCb to RGB conversion (bug #2725 )
2013-01-28 18:29:01 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vadim Pisarevsky
efd00238e2
fixed warnings; restored fixed_size parameter in AutoBuffer
2013-01-23 21:47:58 +04:00
Andrey Pavlenko
81721d0dce
enabling sanity checks for warp and resize functions on Android
...
- add syntetic images generation function to ts
- use generated syntetic images
2013-01-23 17:25:30 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
Vadim Pisarevsky
c2241dccc5
converted fitline to C++, fixed Mat::checkVector().
2013-01-21 01:07:47 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Vadim Pisarevsky
457fa52111
convex hull converted to C++; other 2 functions in convhull.cpp are yet to be finished.
2013-01-19 00:26:01 +04:00
Vadim Pisarevsky
e3941d0965
refactored approxpoly
2013-01-17 00:11:08 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
Andrey Kamaev
6131a847a2
Fix histogram calculation in equalizeHist
...
issue #2678
2013-01-10 14:48:31 +04:00
Vadim Pisarevsky
e383d39598
fixed bug #2679
2013-01-09 17:53:19 +04:00
Ilya Lavrenov
1bc76813f3
fixed bug connected with SSE2 version of resize with AREA interpolation
2012-12-31 15:35:40 +04:00
Kirill Kornyakov
5023afffc7
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263
2012-12-26 10:33:02 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Kamaev
16687a2655
Explicitly use double precision sin & cos in hough implementation
...
On some platforms sin and cos are calculated in single precision resulting in
diversity of results.
2012-12-25 18:05:05 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Jason Newton
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
Andrey Kamaev
b35fa6c4ff
Merge pull request #202 from Daniil-Osokin:calcHist
2012-12-19 15:07:40 +04:00
Andrey Kamaev
2c56a09bee
Merge pull request #226 from taka-no-me/equalizeHist
...
Fix equalization formula in equalizeHist function & rewrite in C++
2012-12-18 15:53:13 -08:00
Vadim Pisarevsky
31857082f4
probably fixed build problems on Android
2012-12-18 14:12:07 -08:00
Daniil Osokin
98d7d99244
Add threaded version of equalizeHist
2012-12-18 23:59:50 +04:00
Ilya Lavrenov
a319bae6e2
added #undef _mm_packus_epi32
2012-12-17 16:56:37 +04:00
Ilya Lavrenov
d246b41573
changed loop condition
2012-12-17 15:50:01 +04:00
Ilya Lavrenov
c2f2e33a5e
removed debug messages
2012-12-17 15:45:20 +04:00
Ilya Lavrenov
743dce6a4b
Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2
2012-12-17 15:27:32 +04:00
Ilya Lavrenov
aa0dafcc1f
replaced _mm_packs_epi32 to _mm_packus_epi32
2012-12-17 14:09:25 +04:00
Daniil-Osokin
cd501d947c
perf tests for calcHist 2-3D case
2012-12-17 12:35:32 +04:00
Daniil-Osokin
7d94236c14
TBB version of calcHist
2012-12-17 11:01:31 +04:00
Jason Newton
e1b60aa4e3
drop usage of macros... the type is already there!
2012-12-16 22:44:36 -08:00
Jason Newton
5f86eb8d63
proper dimensions from cv::Size in output stats/centroid
2012-12-16 18:33:50 -08:00
Vadim Pisarevsky
1eae455acb
fixed build warnings from VS; hopefully, fixes Android build too
2012-12-15 23:14:50 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Jason Newton
ad0bfdfb25
disable windows build warning for connectedcomponents template argument comparisons
2012-12-15 05:56:18 -08:00
Jason Newton
68e77ac051
use opencv's integer type convension
2012-12-15 04:25:55 -08:00
Andrey Kamaev
3de6846d12
Merge pull request #224 from wswld:2.4
2012-12-15 16:06:32 +04:00
Andrey Kamaev
0bbba847a4
Fix equalization formula in equalizeHist function & rewrite in C++
...
Old implementation did
lut[i] = 255 * (count(Y <= i)) / (width * height)
which actually shifts uniform histograms.
From now histogram is equalized as
C = count(Y == min(Y))
lut[i] = 255 * (count(Y <= i) - C) / (width * height - C)
2012-12-15 15:29:15 +04:00
Ilya Lavrenov
6059a6875a
fixed bug with s1 calculating
2012-12-14 17:54:07 +04:00
Ilya Lavrenov
4ccb5a30d9
fixed bug with s1 calculating
2012-12-14 17:41:42 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Ilya Lavrenov
16f9b6f5e4
reproducing C++ version of resize area fast
2012-12-14 14:32:00 +04:00
Vsevolod Glumov
3f417f1ec3
Fixes for issues #2570 , #2492 , #2559 , #2489 , #2592 .
2012-12-14 10:49:51 +04:00
Andrey Kamaev
817a4c0c30
Merge branch 2.4 into perf_verify_sanity
2012-12-12 20:14:25 +04:00
Andrey Kamaev
932204d197
Added thresholds to some sanity checks
2012-12-12 20:14:20 +04:00
Vadim Pisarevsky
eaeae4a1ba
Merge pull request #184 from ilya-lavrenov:Demosaicing
2012-12-12 13:54:58 +04:00
Ilya Lavrenov
d1ca934115
sse2 version of resize area fast for types CV_(8, 16)UC(1, 3, 4)
2012-12-11 15:14:50 +04:00
Andrey Kamaev
67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
Kirill Kornyakov
cdbbfc98e1
Ugly hack to make HoughLines sanity check pass on Wun32
2012-12-10 18:16:15 +04:00
Jason Newton
63debf5032
connectedcomponents test case
2012-12-10 02:21:45 -08:00
Ilya Lavrenov
615e7b2747
added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U
2012-12-10 13:29:08 +04:00
Jason Newton
d094e4bdbe
drop support for 8bit output for size cost relative to utility
2012-12-08 23:09:17 -08:00
Jason Newton
e70b3ef598
use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays
2012-12-08 23:09:14 -08:00
Ilya Lavrenov
07744ccf3d
removed imshow call
2012-12-03 12:30:19 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Ilya Lavrenov
c09a325d3e
fixed error connected with incorrect range
2012-11-30 13:26:40 +04:00
Ilya Lavrenov
98031a4147
removed const modificators
2012-11-30 12:31:33 +04:00
Alexander Smorkalov
f6ff2b87fa
Some perf tests on warping and resize disabled on Android
...
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
2012-11-29 18:21:22 +04:00
Anna Kogan
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
Ilya Lavrenov
b8b13ccd5c
parallel version of Bayer2Gray
2012-11-27 15:27:58 +04:00
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Ilya Lavrenov
ce5e9a71b5
fixed some warnings on Windows and added debug messages
2012-11-27 13:54:11 +04:00
Ilya Lavrenov
4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
2012-11-27 12:46:49 +04:00
Andrey Pavlenko
c36dcbcada
Increase accuracy interval for image filters on Android and other platforms when sensible
2012-11-26 22:29:05 +04:00
Ilya Lavrenov
3fa630639f
fixed bayer2bgra in case when size.width <= 2
2012-11-26 19:45:56 +04:00
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
Jason Newton
d5aa679d3f
adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
...
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Jason Newton
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Andrey Kamaev
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
fcad269e53
Specify sanity threshold for WarpPerspective perf test
2012-10-26 17:00:31 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Pavlenko
a94e80bea3
fixing typos in perf tests for warp funcs
2012-10-24 11:21:58 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
Daniil Osokin
e9ba5c225d
extended perf test warpPerspectiveLarge
2012-10-23 16:06:03 +04:00
Andrey Kamaev
22e352d9cc
Merge pull request #76 vpisarev/test_fixes_1
2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
2012-10-22 21:13:26 +04:00
Andrey Kamaev
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
Andrey Kamaev
546ec2af65
Merge pull request #54 from taka-no-me:doc/fix-signatures
2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
9a97c74ef3
Merge pull request #61 from vpisarev/bug_2509
2012-10-19 11:17:25 +04:00
Andrey Kamaev
e1c3ffb23f
Fix weight calculation for the last pixel in generic area resize.
...
Also removed assigned only variable.
2012-10-18 19:41:45 +04:00
Vadim Pisarevsky
80f9bd864f
fixed bug #2429
...
[edit: cleaned whitespace]
2012-10-18 19:39:22 +04:00
Vadim Pisarevsky
c40718ab61
fixed bug #2059
2012-10-18 14:41:26 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
.
Conflicts:
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/legacy/include/opencv2/legacy/legacy.hpp
2012-10-16 15:13:00 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
2012-10-15 18:12:33 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
2012-10-15 12:21:16 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Kirill Kornyakov
e770691522
deleted wrong line
2012-10-12 17:31:26 +04:00
Kirill Kornyakov
de98da42f7
commented wrong line
2012-10-12 17:30:23 +04:00
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
2012-10-12 17:14:23 +04:00
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
2012-10-12 16:28:26 +04:00
Vadim Pisarevsky
354a5f2686
added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance)
2012-10-11 22:37:14 +04:00
Andrey Kamaev
dc4a649513
Fix OS X build
2012-10-11 15:36:47 +04:00
Andrey Kamaev
be98693aaf
Enable parallel CvtColorLoop for all platforms
2012-10-11 15:05:43 +04:00
Andrey Kamaev
df94591336
Fix instability of Luv/Lab color conversions
2012-10-11 15:05:43 +04:00
Daniil Osokin
e435674a90
added perf test for gabor filter
2012-10-11 14:52:35 +04:00
Daniil Osokin
f1e025dc68
delete normalization in gabor kernel #1995
2012-10-11 14:40:15 +04:00
Evgeny Talanin
8528b0abcd
#1941 fix
2012-10-11 13:45:21 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +04:00
Vadim Pisarevsky
b0ad424087
fixed several warnings from VS2010
2012-10-09 17:24:37 +04:00
Vadim Pisarevsky
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
Evgeny Talanin
7c71c8fa52
#2258 fix
2012-10-09 14:52:47 +04:00
Andrey Kamaev
13bfcd643e
Fix sanity checks in improc perf tests
2012-10-08 21:37:58 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Andrey Kamaev
c0f2a8e0cc
Fix build without SSE
2012-10-08 16:08:16 +04:00
Vadim Pisarevsky
925d0cc769
added test for box filter 16u, fixed bug #2416
2012-10-08 14:11:39 +04:00
Ilya Lavrenov
280ecb68bf
changed file path
2012-10-08 13:27:28 +04:00
Ilya Lavrenov
2759f026e9
fixed Bug #2074
2012-10-08 12:59:15 +04:00
Ilya Lavrenov
a703df5456
parallel cvtColor for MSVS and Apple
2012-10-05 13:11:24 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Ilya Lavrenov
c560a78c65
stable cvtColor
2012-10-01 18:52:27 +04:00
Ilya Lavrenov
45593030ab
fixed TestRemap_Remap
2012-10-01 17:29:56 +04:00
Vadim Pisarevsky
57d9699058
added the note about 1-pixel border in findContours (relates to ticket #2362 )
2012-10-01 16:43:07 +04:00
Ilya Lavrenov
9ee87bd04b
added parallel version of CvtColorLoop - main inner function of cvtColor
2012-09-28 17:42:48 +04:00
Ilya Lavrenov
b8c185de9f
changed map indexes in test_remap
2012-09-24 20:36:25 +04:00
Ilya Lavrenov
6a3d5a1355
reorganized the resize algorithm
2012-09-24 17:07:08 +04:00
Ilya Lavrenov
33983bcbb7
edited misprint
2012-09-24 14:18:54 +04:00
Ilya Lavrenov
9c89947433
edited misprint
2012-09-24 13:46:09 +04:00
Ilya Lavrenov
2627c91c5e
added platform specific definitions in resize algorithm
2012-09-24 12:57:39 +04:00
Ilya Lavrenov
bb589a590e
debug
2012-09-24 11:35:46 +04:00
Ilya Lavrenov
b7b32e74a5
some restructuring of resize algorithm code
2012-09-21 18:17:54 +04:00
Ilya Lavrenov
222303f24b
attempt
2012-09-21 17:25:42 +04:00
Anatoly Baksheev
3b075a50e9
fixed warnings under windows
2012-09-21 13:41:56 +04:00
Vadim Pisarevsky
d2613dd9f6
added patches by Bram Bolder
2012-09-18 14:11:08 +04:00
Ilya Lavrenov
fffd263ce4
attempt
2012-09-17 19:39:49 +04:00
Ilya Lavrenov
f58c5646b0
fixed wrong condition with interpolation types
2012-09-17 18:30:55 +04:00
Ilya Lavrenov
5ab3fe489f
changed resize_area test
2012-09-17 17:38:23 +04:00
Ilya Lavrenov
a65cb5d2de
added extra debug parameters in resize test
2012-09-17 17:08:06 +04:00
Ilya Lavrenov
03daf44848
added recalculating scale coefficients
2012-09-17 16:31:30 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
Vladislav Vinogradov
538847e8a3
fixed compilation under VS2012 (Bug #2352 , #2355 )
2012-09-14 09:34:56 +04:00
Vladislav Vinogradov
e975259c06
several fixes in gpu module
...
fixed iterations>1 case in morphological operations
fixed possible access violation in HSV2RGB
fixed the case learningRate==0 in BackgroundSubtractorMOG2
2012-09-11 15:00:59 +04:00
Vadim Pisarevsky
9956c42804
fixed iterations>1 case in morphological operations (bug #2348 ; thanks to Andrei Zaharescu for the fix)
2012-09-11 14:49:56 +04:00
Vadim Pisarevsky
9ea5b6bb44
fixed possible access violation in HSV2RGB (patch #2020 )
2012-09-11 14:25:34 +04:00
Vadim Pisarevsky
b3408a9b3a
fixed bug #2186 (thanks to Joao Soares for the patch)
2012-09-11 13:56:25 +04:00
Ilya Lavrenov
fbd9bfba47
fixed some warnings and errors on windows
2012-09-10 21:37:44 +04:00
Andrey Kamaev
b1b5e392e6
Fix Android build warnings in new imgproc tests
2012-09-10 20:33:35 +04:00