mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-15 18:09:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,287 Commits 6 Branches 127 Tags 3 GiB
26228e6b4d
Commit Graph

2167 Commits

Author SHA1 Message Date
Seon-Wook Park
770e742e04 spatialGradient: Add non-SSE version 2015-06-19 02:56:51 +02:00
Seon-Wook Park
11fb1f74cc spatialGradient: Add asserts 2015-06-19 01:23:01 +02:00
Seon-Wook Park
9f1c641199 spatialGradient: Add test class and Sobel proxy method 2015-06-18 17:42:32 +02:00
Dmitry Budnikov
a5a21019b2 ipp_countNonZero build fix; 
Removed IPP port for tiny arithm.cpp functions

Additional warnings fix on various platforms.

Build without OPENCL and GCC warnings fixed

Fixed warnings, trailing spaces and removed unused secure_cpy.

IPP code refactored.

IPP code path  implemented as separate static functions to simplify future work with IPP code and make it more readable.
 2015-06-18 12:47:07 +03:00
René
3e2515d735 Fix bug in distanceATS_L1_8u and typos. 
The inner loop of the backward scan got the wrong initial "a".
 2015-06-09 17:23:22 +02:00
Vadim Pisarevsky
b46719b093 Merge pull request #4074 from vpisarev:objdetect_fixes 2015-05-28 19:43:51 +00:00
Vadim Pisarevsky
5a94a95fbf improvements in Haar CascadeClassifier: 1) use CV_32S instead of CV_32F for the integral of squares (which is more accurate and more efficient); 2) skip the window if its contrast is too low 2015-05-28 19:33:21 +03:00
S. Garrido
bd2c2f3bd1 fix isContourConvex 2015-05-27 20:51:53 +02:00
Zhigang Gong
0f7de40e66 Fixed the race condition between inc and dec on the l_counter. 
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
 2015-05-26 22:06:18 +08:00
Zhigang Gong
3c85200989 Avoid negative index for a local buffer in Canny.cl. 
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
The pix_per_thr * LOCAL_TOTAL may be larger than l_counter.
Thus the index of l_stack may be negative which may cause serious
problems. Let's skip the loop when we get negative index and we need
to add back the lcounter to keep its balance and avoid potential
negative counter.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
 2015-05-26 08:48:05 +08:00
Andreas Stührk
3ec0e0943c TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8. 
Conflicts:
	modules/highgui/src/grfmt_tiff.cpp

floodfill return value removed
 2015-05-24 14:06:33 +02:00
Alexander Smorkalov
6e1a595342 GCC 4.8 warning array subscript is above array bounds fixed. 
tiff test fixed
 2015-05-24 13:31:01 +02:00
Dikay900
7ca0557b40 typos in comments 2015-05-23 17:36:45 +02:00
Vadim Pisarevsky
e0136e39f4 Merge pull request #4011 from cr333:parula 2015-05-16 19:11:32 +00:00
Vadim Pisarevsky
a85bb091c8 Merge pull request #4018 from vpisarev:imgproc_video_fixes 2015-05-15 16:15:01 +00:00
Vadim Pisarevsky
ca90667723 fixed compile warnings on Linux and Windows 2015-05-14 16:42:51 +03:00
Vadim Pisarevsky
2e7e754032 added support for n-channel (n>4) images in warpAffine/warpPerspective/remap: http://code.opencv.org/issues/4190 2015-05-14 08:06:46 +03:00
Vadim Pisarevsky
71002e0e79 some fixes from http://code.opencv.org/issues/3733 2015-05-13 22:00:02 +03:00
Marek Nogacki
25bcca2edb fixed http://code.opencv.org/issues/4276 - set drawing thickness limit to 32767 2015-05-13 18:54:25 +02:00
Christian Richardt
6425ac3b13 Added color map similar to Matlab's new default color map 'parula'. 2015-05-13 17:34:14 +02:00
Marek Nogacki
d59a6b29d5 fixed http://code.opencv.org/issues/4276 - removed drawing thickness upper limit 2015-05-07 11:19:22 +02:00
Vadim Pisarevsky
e60dcc9b3b Merge pull request #3966 from Dikay900:master_diff_to_2_4_2 2015-04-28 11:00:57 +00:00
Mansour Moufid
b99f7a29df Cast some image coordinates and sizes to double. 
Conflicts:
	modules/gpu/perf/perf_imgproc.cpp

Cast a long integer to double explicitly.

Conflicts:
	modules/python/src2/cv2.cpp

Cast some matrix sizes to type int.

Change some vector mask types to unsigned.

Conflicts:
	modules/core/src/arithm.cpp
 2015-04-25 18:54:53 +02:00
Andrey Pavlenko
d2409d12c6 porting polylines with empty vector<Point> from 2.4 to master 2015-04-24 17:11:51 +03:00
Vadim Pisarevsky
882dc0a7f6 Merge pull request #3950 from paroj:fix-gftt_ocl 2015-04-22 19:08:15 +00:00
Pavel Rojtberg
1ea41e7246 fix gftt opencv kernel when using mask 2015-04-22 16:13:50 +02:00
Vadim Pisarevsky
415a212d09 Merge pull request #3936 from dhood:fitEllipse-bug 2015-04-22 11:22:35 +00:00
Vadim Pisarevsky
4c875dc393 Merge pull request #3932 from nisargthakkar:Bug4243 2015-04-21 12:18:37 +00:00
Deanna Hood
37f77e7397 Change condition on parallel ellipse case so can only calculate t if necessary 2015-04-18 13:51:32 -04:00
Deanna Hood
103336c76e Fix Bug #3989: correctly identify ellipse with its axes parallel to x-y axes during semi-major axis calculation 2015-04-16 11:59:05 -04:00
Ahmatnurov Dinar
2358c79db2 move 3265 to 3.0; 2015-04-16 14:36:46 +03:00
Nisarg Thakkar
00094a8792 Fix for Bug4243. Made changes relating to non OpenCL devices 2015-04-16 00:22:08 +05:30
Nisarg Thakkar
a0bc0ab7cb Fix for Bug4243 2015-04-15 23:49:01 +05:30
Vadim Pisarevsky
b91313a84e initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report) 2015-03-26 16:26:41 +03:00
Dmitry-Me
6318409a5d Reduce variable scope 2015-03-25 10:35:11 +03:00
Scott Graybill
3d2c0ed97f Removed check on limits. A common use of HoughLines would be to restrict theta to be between a small negative number and a small positive number, e.g. -pi/16 to pi/16. This wasn't possible with the previous checks. 2015-03-13 17:04:13 -07:00
Dmitry-Me
135701feac Double used as boolean for no reason 2015-03-06 17:04:54 +03:00
Vadim Pisarevsky
f9b8ce1d25 Merge pull request #3784 from ilya-lavrenov:nvidia_android 2015-03-05 06:43:03 +00:00
Ilya Lavrenov
cf4c79ebdd disabled some kernels for Android && NVidia 2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
e4bc592c46 Merge pull request #3583 from oresths:tbb_canny 2015-03-04 10:49:27 +00:00
Vladislav Vinogradov
cda6fed41f move tegra namespace out of cv to prevent conflicts 2015-02-27 12:52:11 +03:00
Vladislav Vinogradov
44e41baffe use new functions before all tegra:: calls 2015-02-26 19:34:58 +03:00
Mansour Moufid
35a89b1541 Change some vector mask types to unsigned. 2015-02-23 23:10:57 -05:00
Nisarg Thakkar
b8f65d0252 Same as Bug #3309. Pushing to master 2015-02-21 09:20:00 +05:30
Maksim Shabunin
da383e65e2 Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00
sergei
0d72420480 HAVE_TEGRA_OPTIMIZATION was fixed 2015-01-30 11:57:35 +03:00
Vadim Pisarevsky
9c81338cb9 Merge pull request #3505 from karelknoest:lsd_subpixel 2015-01-22 09:44:29 +00:00
Vadim Pisarevsky
03fc3d1ceb Merge pull request #3591 from ilya-lavrenov:sse_avx 2015-01-21 10:46:23 +00:00
Ilya Lavrenov
e9a6c5db21 sqsum 2015-01-20 21:10:06 +03:00
karelknoest
b5bd2fd880 Improved documentation and method comment to clarify that LineSegmentDetector::detect method accepts both Vec4i and Vec4f as return vector. 2015-01-20 17:05:57 +01:00
karelknoest
1ded2de2dd Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm. 2015-01-20 17:05:38 +01:00
Vadim Pisarevsky
21a9a17478 Merge pull request #3568 from ilya-lavrenov:neon_runtime 2015-01-20 12:47:51 +00:00
Vadim Pisarevsky
5cc4aa0e93 Merge pull request #3554 from wangyan42164:match_template_mask 2015-01-19 11:03:44 +00:00
Vadim Pisarevsky
b6023eab9c Merge pull request #3594 from asmorkalov:opencv4tegra_support 2015-01-19 10:47:49 +00:00
Yan Wang
46ed461e22 Add template match with mask. 
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2015-01-16 11:09:26 +08:00
Ilya Lavrenov
81f786393a NEON detection in runtime 2015-01-13 01:35:53 +03:00
Alexander Smorkalov
1fa37fe733 OpenCV for Tegra compilation fix for 
- Gaussian blur;
- CascadeClassifier;
- Blenders in stitching module;
- Laplacial pyromids in stitching module.
 2015-01-12 23:43:26 +03:00
Ilya Lavrenov
33176db5dc compareHist 2015-01-12 10:59:31 +03:00
Ilya Lavrenov
6bce6ee34a checks 2015-01-12 10:59:31 +03:00
Ilya Lavrenov
3b23e57925 convertMaps 2015-01-12 10:59:31 +03:00
Ilya Lavrenov
0fd8f50522 warpAffine INTER_NEAREST 2015-01-12 10:59:31 +03:00
Ilya Lavrenov
d92f67ee2c warpPerspective 2015-01-12 10:59:31 +03:00
Ilya Lavrenov
7b060d9122 cvtColor 4 cn 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
f2cd65cf1e fixes 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
25e99c453f avx2 in arithm 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
612b8ce2cb fixed compilation issues 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
b2f851af06 cornerMinEigenVal 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
d87457a025 split/merge 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
fc0869735d used popcnt 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
31827d8dfe fixed typo 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
3a426660ea sse_utils.hpp 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
a340ea872e cvtColor Luv 2 RGB u8 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
e20613a776 cvtColor RGB 2 Luv u8 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
584eed633e cvtColor Lab 2 RGB u8 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
05e21015e9 cvtColor HLS 2 RGB u8 2015-01-12 10:59:30 +03:00
Ilya Lavrenov
51684c109e cvtColor RGB 2 HLS u8 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
51e7fb76b6 cvtColor HSV 2 RGB u8 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
c4c86a8990 cvtColor XYZ 2 RGB f32 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
93f8800844 cvtColor RGB 2 XYZ f32 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
e1773749ae cvtColor RGB 2 gray 16s 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
1c9e886a6a cvtColor YCrCb 2 RGB 32f 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
97fad1cb53 cvtColor RGB 2 YCrCb 32f 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
b99396ab12 cvtColor RGB 2 YCrCb 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
940f1e7914 interliving / deinterliving 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
fe371bf624 cvtColor Gray 2 BGR5x5 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
9cacd3261d cvtColor BGR5x5 2 Gray 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
edee922b59 cvtColor YCrCb 2 RGB 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
5f2135695e cvtColor rgb 2 YCrCb 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
bfb45b27e6 column sum 32s 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
1ca35b7424 resize are fast 2015-01-12 10:59:29 +03:00
Ilya Lavrenov
56f3c92737 pyrUp and pyrDown 2015-01-12 10:59:29 +03:00
Timur Sattarov
4762728fd5 More sensible error messages 2015-01-11 03:56:07 +04:00
orestis
c7b2e48efe Canny TBB Optimization 2015-01-07 19:54:20 +02:00
Vadim Pisarevsky
c937e15763 Merge pull request #3555 from ilya-lavrenov:sse_integral 2014-12-31 09:13:18 +00:00
Vadim Pisarevsky
2bddbd2cb5 Merge pull request #3558 from ilya-lavrenov:sse_resize 2014-12-31 08:04:00 +00:00
Vadim Pisarevsky
ba8a971742 Merge pull request #3551 from serval2412:master 2014-12-31 06:09:29 +00:00
Vadim Pisarevsky
622cf566b9 Merge pull request #3560 from ilya-lavrenov:sse_remap 2014-12-31 06:07:02 +00:00
Ilya Lavrenov
02b2fdeda9 SSE resize Lanczos 2014-12-30 10:41:23 +03:00
Ilya Lavrenov
042895977e SSE2 conversio in remap 2014-12-30 01:00:22 +03:00
Ilya Lavrenov
9436103ed6 SSE2 optimization of cv::integral 2014-12-29 15:51:55 +03:00
Julien Nabet
2d5e3b57ea Fix cppcheck reports warnings: 
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check
 2014-12-27 10:54:34 +01:00
Vadim Pisarevsky
61991a3330 Merge pull request #3444 from Sync-my-L2P:patch-1 2014-12-26 14:40:29 +00:00
Vadim Pisarevsky
5d15676b7b Merge pull request #3532 from oresths:filter_neon 2014-12-24 09:02:24 +00:00
orestis
9c6da03504 SymmRowSmallVec_32f 1x5 asymm 
NEON speedup: 2.31x
Auto-vect speedup: 2.26x

Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
 2014-12-19 22:51:42 +02:00
orestis
13c0855114 SymmRowSmallVec_32f 1x5 
NEON speedup: 2.36x
Auto-vect speedup: 2.36x

Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
 2014-12-19 22:47:06 +02:00
orestis
ed0ce48179 SymmColumnVec_32f16s asymm 
NEON speedup: 9.46x
Auto-vect speedup: 1x

Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
 2014-12-19 22:44:39 +02:00
orestis
a2a131799f SymmColumnVec_32f16s 
NEON speedup: 8.64x
Auto-vect speedup: 1x

Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
 2014-12-19 22:42:31 +02:00
orestis
37e018454d SymmColumnSmallVec_32s16s 3x1 asymm 
NEON speedup: 2.12x
Auto-vect speedup: 1.01x

Test kernel: [-2, 0, 2]
 2014-12-19 22:40:55 +02:00
orestis
4443d6b0a1 SymmColumnSmallVec_32s16s [-1, 0, 1] 
NEON speedup: 3.27x
Auto-vect speedup: 1.01x
 2014-12-19 22:37:52 +02:00
orestis
99e782e62c SymmColumnSmallVec_32s16s 3x1 
NEON speedup: 1.75x
Auto-vect speedup: 1x
 2014-12-19 22:36:46 +02:00
orestis
33dfeb85be SymmColumnSmallVec_32s16s [3, 10, 3] Scharr 
NEON speedup: 2.04x
Auto-vect speedup: 1x
 2014-12-19 22:35:52 +02:00
orestis
61a7f48bf4 SymmColumnSmallVec_32s16s [1, -2, 1] 
NEON speedup: 2.75x
Auto-vect speedup: 1.01x
 2014-12-19 22:34:11 +02:00
orestis
4f906372e2 SymmColumnSmallVec_32s16s [1, 2, 1] 
NEON speedup: 2.66x
Auto-vect speedup: 1x
 2014-12-19 22:33:11 +02:00
orestis
80a0364465 SymmColumnVec_32s8u asymm 
NEON speedup: 2.95x
Auto-vect speedup: 1x

Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
 2014-12-19 22:29:54 +02:00
orestis
4f5916f12d SymmColumnVec_32s8u 
NEON speedup: 1.96x
Auto-vect speedup: 1x

Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
 2014-12-19 22:26:41 +02:00
orestis
1fb966dc61 SymmRowSmallVec_8u32s 1x5 asymm 
NEON speedup: 3.14x
Auto-vect speedup: 1.6x

Test kernel: [-5, -2, 0, 2, 5]
 2014-12-19 22:23:09 +02:00
orestis
2e7b9a2c0f SymmRowSmallVec_8u32s 1x3 asymmetric 
NEON speedup: 1.95x
Auto-vect speedup: 1.17x

Test kernel: [-2, 0, 2]
 2014-12-19 22:15:37 +02:00
orestis
969a218057 SymmRowSmallVec_8u32s [-1, 0, 1] 
NEON speedup: 1.84x
Auto-vect speedup: 1.2x
 2014-12-19 22:11:52 +02:00
orestis
c0019a42e4 SymmRowSmallVec_8u32s 1x5 general 
NEON speedup: 3.86x
Auto-vect speedup: 1.67x

Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
 2014-12-19 22:10:58 +02:00
orestis
cb48d7798d SymmRowSmallVec_8u32s 1x3 general 
NEON speedup: 2.56x
Auto-vect speedup: 1.26x

Test kernel: [1, 3, 1]
 2014-12-19 22:08:23 +02:00
orestis
0ba3b06efd SymmRowSmallVec_8u32s [1, 2, 1] 
NEON speedup: 4.1
Auto-vect speedup: 2.25
 2014-12-19 22:02:57 +02:00
Sync-my-L2P
5a43c7a28e Update segmentation.cpp 
removed trailing whitespaces
 2014-12-11 17:36:36 +01:00
orestis
c762da9893 Fix SymmColumnSmallVec_32s16s SSE code 
Specifically, in general antisymmetric case src[-1] (S0) should be
subtracted from from src[1] (S2), and not the opposite.
 2014-12-06 19:53:07 +02:00
Vadim Pisarevsky
be5c910358 Merge pull request #3443 from HelenWong:bug3363Fix 2014-12-02 09:14:36 +00:00
Artur Wieczorek
41afe54696 Fix determining bounding box of the edge collection in FillEdgeCollection(). 
There is necessary to account also x-coordinate of the end of the edge when determining bounding box of the edge collection.
 2014-12-01 14:30:05 +01:00
HelenWong
e88bf2bc30 Updated Documentation (HoughCircles) 
Rewrite the note on HoughCircles documentation to make it more clear

Add note to clarify that the output vector of found circles is sorted by
descending order of centres accumulator values.

Also delete reductant lines on the HoughCircles documentation.

Added comments to hough circles function.

Added comments to icvhoughgradient

Misalignment in line 1183 corrected
 2014-11-26 11:37:33 -08:00
Yan Wang
6e7050555e Optimize pyrUp_unrolled() by mad function. 
It could improve performance when image size is large.
E.g. OCL_PyrUpFixture_PyrUp.PyrUp/18
 2014-11-26 16:55:08 +08:00
Sync-my-L2P
f14b8b4341 Update segmentation.cpp 
Added detailed comments to watershed()
 2014-11-25 16:25:56 +01:00
orestis
a7757b0eb6 Fix anchor for small symmetrical column filters. 
In the unoptimized version of small symmetrical column filters, when we
try to detect if the kernel, ky, is equal to [1;2;1] or [1;-2;1] we
should take into consideration that the anchor points in the middle
element.
 2014-11-19 23:12:58 +02:00
Yan Wang
184b6e314c Fix canny segment fault (Bug #3978) 
Avoid stack overflow based on std::vector cause
std::vector::resize() segmentation fault.
 2014-11-12 17:48:05 +08:00
Alexander Alekhin
569a95e9e1 Merge pull request #3394 from akarsakov:ocl_canny 2014-11-07 12:42:24 +00:00
Vadim Pisarevsky
573be75f50 Merge pull request #3392 from wangyan42164:houghlines_bug_fix 2014-11-07 11:52:58 +00:00
Yan Wang
0692bf5f34 Fix HoughLines crashes (Bug #3959). 
Avoid phi exceed PI/2 to get the negative value of cos(phi).
 2014-11-07 17:52:16 +08:00
Alexander Karsakov
7c870014fb Correctly unrolled some cycles 2014-11-07 12:13:00 +03:00
Alexander Alekhin
f50f249f80 Merge pull request #3138 from alalek:icv_update 2014-11-06 15:58:14 +00:00
Alexander Karsakov
0ec0aeb7d0 Minor optimization for ocl_canny 2014-11-06 13:07:33 +03:00
Vadim Pisarevsky
1d804bc695 Merge pull request #3360 from mirab:threshold_triangle 2014-11-06 08:36:24 +00:00
Miroslav Benes
4046f0398a Make Otsu and Triangle algorithms mutually exclusive 
Make Otsu and Triangle algorithms mutually exclusive in cv::threshold code.

Signed-off-by: Miroslav Benes <mbenes@suse.cz>
 2014-11-05 16:04:26 +01:00
Vadim Pisarevsky
7de4e0496c Merge pull request #3390 from vbystricky:fix_houghlines 2014-11-05 11:41:12 +00:00
vbystricky
957e5ef8eb Fix OpenCL version of HoughLinesP function 2014-11-05 14:31:06 +04:00
Alexander Alekhin
58e054a003 IPPICV: disable boxFilter 16SC1/16UC1 (performance) 2014-11-05 13:26:23 +03:00
Ilya Lavrenov
1fe5441185 cv::convertMaps 2014-11-01 10:13:28 -07:00
Ilya Lavrenov
aa11e102fd removed saturation from pyramids 2014-11-01 13:23:45 +03:00
Ilya Lavrenov
8d0383180c fixes for cv::warpAffine 2014-11-01 13:19:52 +03:00
Ilya Lavrenov
15af3f7114 fixes in VResizeLinearVec_32s8u 2014-11-01 13:19:52 +03:00
Ilya Lavrenov
a4dd2162f2 cv::resize (INTER_LANCZOS4) 2014-11-01 13:19:52 +03:00
Ilya Lavrenov
1b01e1fe68 cv::resize (INTER_AREA CV_16S, CV_32F) 2014-11-01 13:19:52 +03:00
Ilya Lavrenov
4ed696d770 cv::compareHist (CV_COMP_INTERSECT) 2014-11-01 13:19:51 +03:00
Ilya Lavrenov
d5f006eee5 cv::magnitude; cv::corner** 2014-11-01 13:19:51 +03:00
Ilya Lavrenov
7e6fb668ed cv::pyrUp 2014-11-01 13:19:51 +03:00
Ilya Lavrenov
46faf592fc cv::warpAffine 2014-11-01 13:19:51 +03:00
Ilya Lavrenov
85a814f748 VResizeLinearVec_32s8u 2014-11-01 13:19:51 +03:00
Alexander Alekhin
cae89a7a88 Merge pull request #3318 from akarsakov:ocl_cvtcolor 2014-10-29 14:25:09 +00:00
Alexander Karsakov
967a88759f Don't process empty src image in GFTT 2014-10-28 16:06:36 +03:00
Alexander Karsakov
643c906f3d Added optimized loading to YUV2RGB_422 kernel 2014-10-28 15:07:51 +03:00
Alexander Karsakov
1466621f99 Added loading 4 pixels in line instead of 2 to RGB[A] -> YUV(420) kernel 2014-10-27 16:00:34 +03:00
Maksim Shabunin
09fb7512ed Fixed iOS framework compilation warnings 2014-10-27 15:28:21 +03:00
Miroslav Benes
5b1fd739d9 Add Triangle thresholding algorithm 
Add Triangle method for automatic threshold computation next to the existing
Otsu's method. Triangle deals better with images whose histogram does not
contain dominant peak.

See paper Zack GW, Rogers WE, Latt SA.: Automatic measurement of sister
chromatid exchange frequency. J Histochem Cytochem. 1977 Jul;25(7):741-53.
 2014-10-22 16:54:39 +02:00
Alexander Karsakov
60367907fe Used direct float calculations 2014-10-21 17:18:03 +03:00
Alexander Karsakov
5aa9ac9a77 Added OCL code for YUV422 -> RGB[A]|BGR[A] color conversion 2014-10-21 17:18:03 +03:00
Alexander Karsakov
c8707b891b Added OCL code for RGB[A]|BGR[A] -> YUV_[YV12|IYUV] color conversion 2014-10-21 17:18:03 +03:00
Alexander Karsakov
8c91604f5a Added OCL code for YUV2GRAY_420 color conversion 2014-10-21 17:18:02 +03:00
Alexander Karsakov
1cc17a7186 Added OCL code for YUV2BGR_YV12 and YUV2BGR_IYUV color conversions 2014-10-21 17:18:02 +03:00
Alexander Karsakov
85b60ee3cb Added support for YUV2RGB[A]_NV21 and YUV2BGR[A]_NV21 conversion 2014-10-21 17:18:02 +03:00
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
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
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
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
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
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
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
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
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
Alexander Karsakov
b027eac173 Fixed range for 'v' channel for 8U images. 2014-08-20 11:09:21 +04:00
Vadim Pisarevsky
8658aef3bf Merge pull request #3104 from dkanafeev:new_ipp_func_master 2014-08-19 09:06:45 +00: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
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
ce0297ed61 Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg 2014-08-08 14:06:49 +00: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
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
Vadim Pisarevsky
432b7cb235 Merge pull request #3032 from vpisarev:refactor_ml2 2014-08-04 14:51:38 +00: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
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
Richard Yoo
c38023f4e7 Modifications to support dynamic vector dispatch. 2014-07-09 16:55:39 -07: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
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
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
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
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
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
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
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
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
mletavin
68883775fb Adding explicit variable conversion in ocl_medianFilter() to suppress build errors on Linux & Mac 2014-05-28 13:30:50 +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
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
c43e32854a Merge pull request #2713 from alalek:icv_enable_fns 2014-05-23 13:35:45 +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
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
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
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
7ac5c367e9 Merge pull request #2715 from akarsakov:fix_corner_min_eigen 2014-05-12 13:03:19 +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 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
Ilya Lavrenov
55bbca2d09 added more types to cv::GaussianBlur 2014-04-28 13:50:28 +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
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 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
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
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
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
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
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
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
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
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
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
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
Ilya Lavrenov
e1efed1914 added support of ksize >= 5 to cv::Laplacian 2014-03-31 13:17:58 +04:00
Alexander Karsakov
d17142b83d Prototype OCL version of gaussian blur with integer arithmetic 2014-03-28 21:46:03 +04:00
Ilya Lavrenov
f7d6d3cff5 improved cv::filter2D 2014-03-26 14:19:59 +04:00
Andrey Pavlenko
d63a8ba018 Merge pull request #2523 from ilya-lavrenov:tapi_filters 2014-03-25 16:23:02 +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
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
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
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
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
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
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
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
Ilya Lavrenov
c8e22c04c8 extended performance test 2014-02-16 13:42:25 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Roman Donchenko
685eceb68a Merge pull request #1567 from ilya-lavrenov:warn_fix 2013-10-08 13:50:49 +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
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
John Stowers
51341738ba Add cv::logPolar, cv::linearPolar, and a python example 2013-09-30 22:31:19 +02:00
Alexander Mordvintsev
0a8d62e5fd createLineSegmentDetectorPtr -> createLineSegmentDetector 2013-09-30 14:30:01 +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
e6a9c22b9d Merge remote-tracking branch 'upstream/master' 2013-09-26 19:13:01 +10:00