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
c3bfe3f33e
Merge pull request #2136 from SpecLad:python-ver
2014-01-13 18:17:00 +04:00
9628abc786
Merge pull request #2137 from ilya-lavrenov:gitignore
2014-01-13 16:33:16 +04:00
85c713b59e
Merge pull request #2138 from alekcac:python_tutorial_fix
2014-01-13 16:32:42 +04:00
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
87e0c26129
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
2014-01-13 16:26:02 +04:00
6071671bda
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
2014-01-11 17:15:22 +04:00
d64f05cd59
Merge pull request #2112 from ilya-lavrenov:tapi_stitching
2014-01-11 16:39:22 +04:00
e90d0b6e4c
changed code in python tutorial, these functions don’t return image
2014-01-11 16:35:41 +04:00
f197d8b91c
updated .gitignore
2014-01-10 18:59:06 +04:00
da2790249e
added NORM_L2SQR type to cv::norm
2014-01-10 18:45:52 +04:00
2e5e278271
added cv::PSNR performance test
2014-01-10 18:45:40 +04:00
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
1592234f1a
added mask support to cv::norm, cv::meanStdDev
2014-01-10 18:45:40 +04:00
9e3673ef53
Don't use PYTHON_VERSION_STRING when searching for Python libraries
...
It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.
2014-01-10 18:40:47 +04:00
7852b2f155
updated docs according to the last changes
2014-01-10 18:19:26 +04:00
8f9ccc099b
replaced Mat by Input/Output arrays
2014-01-10 18:16:56 +04:00
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
890f1baff0
Merge pull request #2132 from ComFreek:patch-2
2014-01-10 11:44:46 +04:00
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
560cfa5672
Merge pull request #2129 from ilya-lavrenov:mix_fix
2014-01-09 17:04:03 +04:00
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
2014-01-09 16:58:29 +04:00
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
dfeba1e8dd
Merge pull request #2119 from d-schmidt:patch-1
2014-01-09 14:44:07 +04:00
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +04:00
bf4994554d
Removed unecessary initialisation of Mat centers.
2014-01-09 21:04:17 +11:00
b45bb60c8b
Merge pull request #2126 from yinghau76:master
2014-01-09 14:00:53 +04:00
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
58882e5c22
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
2014-01-09 13:24:20 +04:00
cab67cd9ac
Merge tag '3.0-ocl-tech-preview' (-s ours)
2014-01-09 12:42:58 +04:00
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
ea3dd9d5e7
Merge pull request #2103 from ilya-lavrenov:typo
2014-01-09 12:38:55 +04:00
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +04:00
b24f7ee57c
Fix compiler error with Android NDK r8e
...
Original error without the fix:
opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'
2014-01-09 14:49:20 +08:00
ef61964768
Update py_face_detection.rst
...
bug in example
2014-01-07 00:11:33 +01:00
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
601b7d1dd3
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
2014-01-06 20:19:07 +11:00
2ae20c74a2
Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)
...
Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113
2014-01-06 02:24:14 +09:00
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
2014-01-03 13:16:36 +01:00
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
0c49360318
fixed typo
2014-01-01 19:41:14 +04:00
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
Roman Donchenko
Andrey Pavlenko
Alexander Shishkov
Ilya Lavrenov
Alexander Alekhin
ComFreek
Nghia Ho
Patrick Tsai
David Schmidt
Kazuki Matsuda
Pierre-Emmanuel Viel
Robbert Klarenbeek
Anatoly Baksheev