Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Roman Donchenko
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
Roman Donchenko
890f1baff0
Merge pull request #2132 from ComFreek:patch-2
2014-01-10 11:44:46 +04:00
Alexander Alekhin
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
Andrey Pavlenko
4d28e8243c
'master'-like Haar perf test
2014-01-10 00:14:48 +04:00
Andrey Pavlenko
2c0e24e948
adding Haar & LBP cascades perf test using UMat, removing old incomplete test
2014-01-10 00:08:15 +04:00
ComFreek
ae795e5797
Corrected package name in tutorial
...
See also #2101
2014-01-09 17:24:20 +01:00
Ilya Lavrenov
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
Andrey Pavlenko
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
Roman Donchenko
560cfa5672
Merge pull request #2129 from ilya-lavrenov:mix_fix
2014-01-09 17:04:03 +04:00
Roman Donchenko
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
2014-01-09 16:58:29 +04:00
Roman Donchenko
d509165d96
Merge pull request #2118 from ilya-lavrenov:semicolons
2014-01-09 16:21:49 +04:00
Roman Donchenko
dfeba1e8dd
Merge pull request #2119 from d-schmidt:patch-1
2014-01-09 14:44:07 +04:00
Ilya Lavrenov
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +04:00
Nghia Ho
bf4994554d
Removed unecessary initialisation of Mat centers.
2014-01-09 21:04:17 +11:00
Roman Donchenko
b45bb60c8b
Merge pull request #2126 from yinghau76:master
2014-01-09 14:00:53 +04:00
Ilya Lavrenov
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
Alexander Alekhin
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
Roman Donchenko
7acea48788
Merge pull request #2106 from robbertkl:patch-2
2014-01-09 13:25:59 +04:00
Roman Donchenko
58882e5c22
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
2014-01-09 13:24:20 +04:00
Roman Donchenko
cab67cd9ac
OpenCV 3.0 OpenCL Technical Preview
...
Use at your own risk.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iF4EABEIAAYFAlLCrRIACgkQdDiF7KIeJGpzpAEAwAorX4YH+p3ggS1QNy4jJeGe
b6djUHo1SsOftAL1lY0A/3J+dDzgLKJX1ItpxJBono5iCfXLQVg+oXpzuU3YHlhx
=tCm0
-----END PGP SIGNATURE-----
Merge tag '3.0-ocl-tech-preview' (-s ours)
2014-01-09 12:42:58 +04:00
Roman Donchenko
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
Roman Donchenko
ea3dd9d5e7
Merge pull request #2103 from ilya-lavrenov:typo
2014-01-09 12:38:55 +04:00
Roman Donchenko
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +04:00
Patrick Tsai
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
David Schmidt
ef61964768
Update py_face_detection.rst
...
bug in example
2014-01-07 00:11:33 +01:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Ilya Lavrenov
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
Nghia Ho
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
Matthias Bady
e17da9a843
merge with upstream
2014-01-05 19:00:25 +01:00
Kazuki Matsuda
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
Max Khardin
699eda46b6
Remove three sneaky tabs
2014-01-04 20:09:30 +08:00
Ilya Lavrenov
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
Max Khardin
34b05794d6
Fix source code indents
2014-01-04 19:01:32 +08:00
Max Khardin
214e9d4b12
Add performance tests for elementwise multiplication
2014-01-04 18:56:32 +08:00
Pierre-Emmanuel Viel
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
Nghia Ho
d3e24f3cbf
Improved documentation for neural network
2014-01-03 14:18:07 +11:00
Robbert Klarenbeek
e21c6e19db
Fix algorithm setter argument validation for uchar
2014-01-02 21:17:55 +01:00
Ilya Lavrenov
0c49360318
fixed typo
2014-01-01 19:41:14 +04:00
Anatoly Baksheev
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
Roman Donchenko
5327482b46
Merge pull request #2084 from ilya-lavrenov:cont
2013-12-31 16:51:30 +04:00
Vadim Pisarevsky
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
Roman Donchenko
984c4d200f
Set the version status to "-tp", for "technical preview".
2013-12-31 15:37:47 +04:00
Ilya Lavrenov
4f9c081dc3
fixed bug #3319
2013-12-31 13:56:59 +04:00
Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +04:00
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
2013-12-31 11:40:44 +04:00
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
2013-12-31 00:35:39 +04: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
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
2013-12-30 17:00:17 +01:00