Commit Graph

54 Commits

Author SHA1 Message Date
Roman Donchenko
9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Roman Donchenko
188d3f02ee Merge pull request #1302 from kdrobnyh:compare 2013-09-02 15:11:20 +04:00
kdrobnyh
7a7aa148d4 Add IPP support in compare function 2013-08-29 17:55:57 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Alexander Smorkalov
a3dd13450c All optimized function tables wrapped to getters to change its
initialization time.
2013-08-16 12:10:07 +04:00
Andrey Kamaev
b0e6606b98 Cleanup core module API
* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray
2013-04-09 13:36:32 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Bo Li
92e7e7d8e8 fix issue 2788 2013-02-11 15:09:42 +01:00
marina.kolpakova
99c666691e Restore core multiply/divide depth to CV_64F value.
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests  for multiply/device functions.
2012-10-21 11:20:39 +04:00
Andrey Kamaev
8fb6d9f650 Fix Android build warnings 2012-10-19 16:14:14 +04:00
Vadim Pisarevsky
f5742e6cac fix bug #2447 - unary operator bug for single column matrix 2012-10-18 13:28:01 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
0afd51253d Add else branch to previous fix 2012-10-09 20:34:10 +04:00
Andrey Kamaev
34bfda10ca Fix regression in core arithmetic 2012-10-09 20:25:36 +04:00
Andrey Kamaev
25a9b0a255 Fix depth calculation for Scalar in core arithmetic 2012-10-08 16:15:27 +04:00
Vadim Pisarevsky
d09b3828b8 fixed fail in arithmetic test 2012-09-24 16:14:19 +04:00
Alexander Kapustin
8f4ddad52d 1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
2012-09-20 17:24:20 +04:00
Alexander Kapustin
bb3332508e 1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added

Conflicts:
	modules/core/src/arithm.cpp
2012-09-20 16:59:48 +04:00
Vadim Pisarevsky
1ded1597e7 fixed mixed-type array operations (bug #2336) 2012-09-19 17:55:34 +04:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Alexander Kapustin
79e2070606 5 functions from addWeighted_func family were Neon Optimized 2012-04-26 08:18:01 +00:00
Alexander Kapustin
3675ef516a 6 functions from Inrange_func family were Neon Optimized 2012-04-23 09:31:08 +00:00
Vadim Pisarevsky
bf12855007 fixed mask operations with uninitialized output array, added the corresponding test (ticket #1286) 2012-03-28 09:07:00 +00:00
Vadim Pisarevsky
4985c1b632 fixed hundreds of warnings from MSVC 2010. 2012-03-16 21:21:04 +00:00
Andrey Kamaev
805d88a8d2 Tegra version of cv::subtract 2012-03-11 14:28:34 +00:00
Victoria Zhislina
fbdb93ec79 CV_ENABLE_UNROLLED 2012-02-10 06:05:04 +00:00
Vadim Pisarevsky
e7946d98a9 fixed SSE-optimized cmp_8u (ticket #1530) 2011-12-27 16:07:26 +00:00
Vadim Pisarevsky
dec0af8d79 implemented invert(A, B, DECOMP_EIG) 2011-12-27 15:56:17 +00:00
Vadim Pisarevsky
eef900e46a optimized cmp and cvtscale(16s->16s) using SSE2 (thanks to Victoria) 2011-12-15 21:15:51 +00:00
Vadim Pisarevsky
72c23e7bbb fixed most of test_core failures (except for SVD) 2011-12-05 22:58:27 +00:00
Andrey Kamaev
664cd5460e Tegra-optimized cv::compare 2011-11-07 06:29:34 +00:00
Andrey Kamaev
3b558508be TEGRA optimized add8u, sub8u and logical 8u operations 2011-07-27 13:36:53 +00:00
Vadim Pisarevsky
d8417af086 fixed and improving formatting in opencv2refman.pdf. added support for n-channel mask in Mat::copyTo() and n-channel images in cv::compare(). fixed 2 compile warnings in opencv_python. 2011-07-24 10:34:14 +00:00
Vadim Pisarevsky
ff5e97c8e4 added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
Vadim Pisarevsky
12715c210d fixed mixed-type arithmetic operations (ticket #1224) 2011-07-14 14:54:05 +00:00
Vadim Pisarevsky
cc9a1bb62f propagated some more fixes from 2.3 branch to the trunk 2011-06-30 12:06:26 +00:00
Vadim Pisarevsky
b204e73d9a propagated some more fixes from 2.3 branch to the trunk 2011-06-29 22:06:42 +00:00
Vadim Pisarevsky
6407093463 extended Mat::setTo() to support multi-channel arrays; fixed bug #1095 2011-06-13 20:56:27 +00:00
Vadim Pisarevsky
2d2b8a496e renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122) 2011-06-08 06:55:04 +00:00
Vadim Pisarevsky
0c877f62e9 replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()). 2011-06-06 14:51:27 +00:00
Vladimir Dudnik
2057f2c452 fixed build issues related to changes in IPP calls. 2011-04-18 21:24:57 +00:00
Vadim Pisarevsky
9a991a2e10 fixed build problems on Windows 2011-04-18 15:14:32 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
061b49e0b2 reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine. 2011-02-09 20:55:11 +00:00
Vladimir Dudnik
c987b9f180 added IPP Sobel and Sharr filters. Also some minor changes. 2011-01-19 23:27:30 +00:00
Vladimir Dudnik
a961cfe135 fixed mistake in integration of IPP Sub functions. Added IPP min/max/absdiff/and/or/xor functions. 2011-01-10 00:43:14 +00:00
Vladimir Dudnik
a34f044d19 add IPP Sub operations to arithm.cpp for 8u, 16u, 16s, 32s, 32f, 64f data types. 2011-01-08 21:24:31 +00:00
Vladimir Dudnik
abdb139096 add IPP Add operations to arithm.cpp for 8u, 16u, 16s, 32s, 32f, 64f data types.
Added print of IPP info in test log files
2011-01-07 00:26:09 +00:00
Vadim Pisarevsky
d8ace43753 fixed some more tests on Windows; changed inheritance Matx -> Vec to Vec -> Matx 2010-11-06 21:51:21 +00:00