mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 16:00:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,184 Commits 6 Branches 126 Tags 3 GiB
73e16dbc3f
Commit Graph

1493 Commits

Author SHA1 Message Date
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