Roman Donchenko [Mon, 13 Jan 2014 15:28:43 +0000 (19:28 +0400)]
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
Roman Donchenko [Mon, 13 Jan 2014 14:16:59 +0000 (18:16 +0400)]
Merge pull request #2136 from SpecLad:python-ver
Roman Donchenko [Mon, 13 Jan 2014 12:33:15 +0000 (16:33 +0400)]
Merge pull request #2137 from ilya-lavrenov:gitignore
Roman Donchenko [Mon, 13 Jan 2014 12:32:41 +0000 (16:32 +0400)]
Merge pull request #2138 from alekcac:python_tutorial_fix
Roman Donchenko [Mon, 13 Jan 2014 12:30:33 +0000 (16:30 +0400)]
Merge pull request #2121 from ilya-lavrenov:tapi_perf
Roman Donchenko [Mon, 13 Jan 2014 12:26:02 +0000 (16:26 +0400)]
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
Andrey Pavlenko [Sat, 11 Jan 2014 13:15:21 +0000 (17:15 +0400)]
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
Andrey Pavlenko [Sat, 11 Jan 2014 12:39:21 +0000 (16:39 +0400)]
Merge pull request #2112 from ilya-lavrenov:tapi_stitching
Alexander Shishkov [Sat, 11 Jan 2014 12:35:41 +0000 (16:35 +0400)]
changed code in python tutorial, these functions don’t return image
Ilya Lavrenov [Fri, 10 Jan 2014 14:59:06 +0000 (18:59 +0400)]
updated .gitignore
Ilya Lavrenov [Tue, 7 Jan 2014 16:32:22 +0000 (20:32 +0400)]
added NORM_L2SQR type to cv::norm
Ilya Lavrenov [Tue, 7 Jan 2014 16:17:45 +0000 (20:17 +0400)]
added cv::PSNR performance test
Ilya Lavrenov [Tue, 7 Jan 2014 11:08:48 +0000 (15:08 +0400)]
added some performance tests
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev
Roman Donchenko [Fri, 10 Jan 2014 14:40:47 +0000 (18:40 +0400)]
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.
Ilya Lavrenov [Thu, 9 Jan 2014 13:00:08 +0000 (17:00 +0400)]
updated docs according to the last changes
Ilya Lavrenov [Thu, 9 Jan 2014 11:21:07 +0000 (15:21 +0400)]
replaced Mat by Input/Output arrays
Ilya Lavrenov [Wed, 1 Jan 2014 19:46:19 +0000 (23:46 +0400)]
added OpenCL accelerated warpers
Roman Donchenko [Fri, 10 Jan 2014 14:12:08 +0000 (18:12 +0400)]
Merge pull request #2105 from ilya-lavrenov:norm
Roman Donchenko [Fri, 10 Jan 2014 07:44:45 +0000 (11:44 +0400)]
Merge pull request #2132 from ComFreek:patch-2
Alexander Alekhin [Thu, 9 Jan 2014 15:07:39 +0000 (19:07 +0400)]
core/ocl: runtime, remove unused declarations
ComFreek [Thu, 9 Jan 2014 16:24:20 +0000 (17:24 +0100)]
Corrected package name in tutorial
See also #2101
Ilya Lavrenov [Thu, 9 Jan 2014 13:32:13 +0000 (17:32 +0400)]
fixed case with zero mask
Andrey Pavlenko [Thu, 9 Jan 2014 13:08:48 +0000 (17:08 +0400)]
Merge pull request #2128 from alalek:ocl_cleanup_runtime
Roman Donchenko [Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)]
Merge pull request #2129 from ilya-lavrenov:mix_fix
Roman Donchenko [Thu, 9 Jan 2014 12:58:29 +0000 (16:58 +0400)]
Merge pull request #2115 from nghiaho12:kmeans_sample
Roman Donchenko [Thu, 9 Jan 2014 12:21:48 +0000 (16:21 +0400)]
Merge pull request #2118 from ilya-lavrenov:semicolons
Roman Donchenko [Thu, 9 Jan 2014 10:44:06 +0000 (14:44 +0400)]
Merge pull request #2119 from d-schmidt:patch-1
Ilya Lavrenov [Thu, 9 Jan 2014 10:26:44 +0000 (14:26 +0400)]
fixed cv::mixChannels perf test
Nghia Ho [Thu, 9 Jan 2014 10:04:17 +0000 (21:04 +1100)]
Removed unecessary initialisation of Mat centers.
Roman Donchenko [Thu, 9 Jan 2014 10:00:52 +0000 (14:00 +0400)]
Merge pull request #2126 from yinghau76:master
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev
Alexander Alekhin [Thu, 9 Jan 2014 09:47:04 +0000 (13:47 +0400)]
core/ocl: cleanup unused files
Roman Donchenko [Thu, 9 Jan 2014 09:25:59 +0000 (13:25 +0400)]
Merge pull request #2106 from robbertkl:patch-2
Roman Donchenko [Thu, 9 Jan 2014 09:24:20 +0000 (13:24 +0400)]
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
Roman Donchenko [Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)]
Merge tag '3.0-ocl-tech-preview' (-s ours)
Roman Donchenko [Thu, 9 Jan 2014 08:41:57 +0000 (12:41 +0400)]
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
Roman Donchenko [Thu, 9 Jan 2014 08:38:55 +0000 (12:38 +0400)]
Merge pull request #2103 from ilya-lavrenov:typo
Roman Donchenko [Thu, 9 Jan 2014 08:35:30 +0000 (12:35 +0400)]
Merge pull request #2102 from Nerei:compilatin_for_windows
Patrick Tsai [Thu, 9 Jan 2014 06:41:44 +0000 (14:41 +0800)]
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>)'
David Schmidt [Mon, 6 Jan 2014 23:11:33 +0000 (00:11 +0100)]
Update py_face_detection.rst
bug in example
Ilya Lavrenov [Mon, 6 Jan 2014 22:38:41 +0000 (02:38 +0400)]
deleted extra semicolons
Ilya Lavrenov [Mon, 6 Jan 2014 10:41:57 +0000 (14:41 +0400)]
fixed cv::mixChannels OpenCL version
Nghia Ho [Mon, 6 Jan 2014 09:19:07 +0000 (20:19 +1100)]
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.
Kazuki Matsuda [Sun, 5 Jan 2014 17:24:14 +0000 (02:24 +0900)]
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
Ilya Lavrenov [Wed, 1 Jan 2014 19:46:19 +0000 (23:46 +0400)]
fixed overflow for cv::norm NORM_L2
Pierre-Emmanuel Viel [Fri, 3 Jan 2014 12:16:36 +0000 (13:16 +0100)]
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
Robbert Klarenbeek [Thu, 2 Jan 2014 20:17:55 +0000 (21:17 +0100)]
Fix algorithm setter argument validation for uchar
Ilya Lavrenov [Wed, 1 Jan 2014 15:41:14 +0000 (19:41 +0400)]
fixed typo
Anatoly Baksheev [Wed, 1 Jan 2014 11:38:59 +0000 (15:38 +0400)]
compilation for windows
Roman Donchenko [Tue, 31 Dec 2013 12:51:29 +0000 (16:51 +0400)]
Merge pull request #2084 from ilya-lavrenov:cont
Vadim Pisarevsky [Tue, 31 Dec 2013 11:54:59 +0000 (15:54 +0400)]
Merge pull request #1957 from Nerei:format_declaration_by_default
Roman Donchenko [Tue, 31 Dec 2013 11:37:47 +0000 (15:37 +0400)]
Set the version status to "-tp", for "technical preview".
Ilya Lavrenov [Fri, 27 Dec 2013 21:40:21 +0000 (01:40 +0400)]
fixed bug #3319
Roman Donchenko [Tue, 31 Dec 2013 07:53:24 +0000 (11:53 +0400)]
Merge pull request #2096 from kamjagin:master
Roman Donchenko [Tue, 31 Dec 2013 07:40:43 +0000 (11:40 +0400)]
Merge pull request #2094 from SpecLad:multimon-be-gone
Andrey Pavlenko [Mon, 30 Dec 2013 20:35:39 +0000 (00:35 +0400)]
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
Andrey Pavlenko [Mon, 30 Dec 2013 20:26:22 +0000 (00:26 +0400)]
Merge pull request #2093 from SpecLad:merge-2.4
Andrey Pavlenko [Mon, 30 Dec 2013 20:17:33 +0000 (00:17 +0400)]
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
Miroslav Kobetski [Mon, 30 Dec 2013 16:00:17 +0000 (17:00 +0100)]
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
Andrey Pavlenko [Mon, 30 Dec 2013 15:54:26 +0000 (19:54 +0400)]
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
Ilya Lavrenov [Sun, 29 Dec 2013 21:21:04 +0000 (01:21 +0400)]
added OpenCL version of cv::patchNaNs
Ilya Lavrenov [Mon, 30 Dec 2013 15:27:06 +0000 (19:27 +0400)]
fixed umat access
Roman Donchenko [Mon, 30 Dec 2013 14:18:41 +0000 (18:18 +0400)]
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
Roman Donchenko [Mon, 30 Dec 2013 14:00:29 +0000 (18:00 +0400)]
Fixed MinGW build by declaring the minimal required Windows version.
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
Roman Donchenko [Mon, 30 Dec 2013 13:57:43 +0000 (17:57 +0400)]
Merge pull request #2086 from ilya-lavrenov:mul_fix
Roman Donchenko [Mon, 30 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #2085 from severin-lemaignan:emscripten
Roman Donchenko [Mon, 30 Dec 2013 13:42:49 +0000 (17:42 +0400)]
Merge pull request #2089 from ilya-lavrenov:tapi_examples
Roman Donchenko [Mon, 30 Dec 2013 13:30:59 +0000 (17:30 +0400)]
Merge commit '
05b9c991dd' into merge-2.4
Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp
Ilya Lavrenov [Sat, 28 Dec 2013 12:28:17 +0000 (16:28 +0400)]
SSE2 optimization of cv::remap doesn't work with big images
Séverin Lemaignan [Sat, 28 Dec 2013 10:05:00 +0000 (11:05 +0100)]
[emscripten] Do not link to system libraries
This is not meaningful when compiling to javascript, and causes warning
at linking stage.
Roman Donchenko [Mon, 30 Dec 2013 12:52:16 +0000 (16:52 +0400)]
Merge commit '
46be47cb4b8' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)]
Merge commit '
0566ab4d3d' into merge-2.4
Conflicts:
modules/core/src/system.cpp
Roman Donchenko [Mon, 30 Dec 2013 12:50:09 +0000 (16:50 +0400)]
Merge commit '
719149877e' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:49:39 +0000 (16:49 +0400)]
Merge commit '
ee36717d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)]
Merge commit '
4b885e206' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)]
Merge commit '
709e8e8e0' into merge-2.4
Ilya Lavrenov [Sat, 28 Dec 2013 11:09:45 +0000 (15:09 +0400)]
fixed bug #3341
Roman Donchenko [Mon, 30 Dec 2013 12:47:05 +0000 (16:47 +0400)]
Merge commit '
60906d917' into merge-2.4
Conflicts:
modules/ts/src/cuda_perf.cpp
Roman Donchenko [Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)]
Merge commit '
8fe79738c' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)]
Merge commit '
b94963d38' into merge-2.4
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
Roman Donchenko [Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)]
Merge commit '
24be7b26c' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)]
Merge commit '
1acc1085d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)]
Merge commit '
edce617a5' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)]
Merge commit '
83cdd43a' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
Roman Donchenko [Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)]
Merge commit '
f22d9a23' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 11:34:16 +0000 (15:34 +0400)]
Merge pull request #2092 from alalek:fix_mingw_warn
Konstantin Matskevich [Mon, 30 Dec 2013 09:06:32 +0000 (13:06 +0400)]
fix
Alexander Alekhin [Mon, 30 Dec 2013 08:31:00 +0000 (12:31 +0400)]
eliminate MINGW pragma warning
Ilya Lavrenov [Sun, 29 Dec 2013 10:36:30 +0000 (14:36 +0400)]
converted CPU-based example to T-API (Mat 2 UMat, etc)
Ilya Lavrenov [Sun, 29 Dec 2013 14:46:25 +0000 (18:46 +0400)]
added OpenCL version of cv::scaleAdd
Ilya Lavrenov [Sun, 29 Dec 2013 14:01:01 +0000 (18:01 +0400)]
implemented OpenCL version of cv::convertScaleAbs
Ilya Lavrenov [Sat, 28 Dec 2013 22:28:43 +0000 (02:28 +0400)]
added the first T-API example - CamShift tracking
Andrey Pavlenko [Sat, 28 Dec 2013 18:06:12 +0000 (22:06 +0400)]
Merge pull request #2081 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Sat, 28 Dec 2013 18:05:49 +0000 (22:05 +0400)]
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
Andrey Pavlenko [Fri, 27 Dec 2013 18:38:08 +0000 (22:38 +0400)]
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
Ilya Lavrenov [Fri, 27 Dec 2013 17:57:20 +0000 (21:57 +0400)]
disabled cv::split perf test
Roman Donchenko [Fri, 27 Dec 2013 17:09:18 +0000 (21:09 +0400)]
Merge pull request #2083 from jet47:gpu_android_tests
Roman Donchenko [Fri, 27 Dec 2013 16:53:42 +0000 (20:53 +0400)]
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
Roman Donchenko [Fri, 27 Dec 2013 16:23:56 +0000 (20:23 +0400)]
Merge pull request #2077 from ilya-lavrenov:tapi_context