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 |
|
kdrobnyh
|
f4aa7ff919
|
Add IPP support in meanStdDev, minMaxIdx, norm functions
|
2013-08-29 21:09:19 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
3c137f7a04
|
Converted tabs to spaces.
|
2013-08-21 18:59:26 +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 |
|
Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
kdrobnyh
|
6af10a2937
|
Some changes in sum and mean functions
|
2013-07-30 00:54:27 +04:00 |
|
kdrobnyh
|
4dfd40bec0
|
Add IPP mean and sum functions
|
2013-07-25 21:27:35 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
Vladislav Vinogradov
|
f50aabf012
|
fixed bug #2938
|
2013-04-09 10:14:25 +04:00 |
|
Andrey Kamaev
|
3890a74565
|
Drop outdated definitions from internal.hpp
This also fixes few clang build errors
|
2013-04-01 15:24:35 +04:00 |
|
Andrey Kamaev
|
b28f594917
|
Drop fast_abs
|
2013-04-01 15:24:35 +04:00 |
|
Alexander Smorkalov
|
6f68640d4d
|
Multiple fixes for WinRT
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
|
2013-03-26 17:19:52 -07:00 |
|
Vadim Pisarevsky
|
51eba617a8
|
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
|
2013-02-01 14:01:44 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Daniil Osokin
|
1d3ec99102
|
fixed batchDistance minimum finding #2292
|
2012-10-12 13:25:55 +04:00 |
|
Vadim Pisarevsky
|
8441cf700d
|
added function cv::findNonZero (patch #2205)
|
2012-10-11 22:52:15 +04:00 |
|
Vadim Pisarevsky
|
b9d7c712f5
|
made countNonZero SSE code SSE2-compliant and portable
|
2012-07-30 16:02:49 +04:00 |
|
Josh Doe
|
f1690557bf
|
core/stat: fix build with 32-bit
Optimization introduced in b782d8bb only works for 64-bit builds, but
ifdef failed to check for this.
|
2012-07-29 14:48:21 -04:00 |
|
Sam Bromley
|
fd98520d78
|
Protect check of CV_SSE4_2 with #if defined.
|
2012-07-26 12:43:56 -02:30 |
|
Vadim Pisarevsky
|
b782d8bb53
|
integrated patch with some SSE2/SSE4.2 optimizations from Grigory Frolov
|
2012-07-24 17:24:31 +04:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Alexander Kapustin
|
9bb6e899f3
|
12 functions from Norm_func family were Neon Optimized
|
2012-04-16 11:39:38 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Vadim Pisarevsky
|
846e37ded5
|
fixed many warnings from GCC 4.6.1
|
2012-03-17 09:22:31 +00:00 |
|
Vadim Pisarevsky
|
957e80abbd
|
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
|
2012-03-15 14:36:01 +00:00 |
|
Victoria Zhislina
|
fbdb93ec79
|
CV_ENABLE_UNROLLED
|
2012-02-10 06:05:04 +00:00 |
|
Andrey Kamaev
|
c326de43c1
|
More natural sorting of MatType constants in performance reports.
|
2012-01-16 07:04:26 +00:00 |
|
Kirill Kornyakov
|
a06dcc9e67
|
Optimized version of sqsum8u added
|
2011-12-29 07:49:22 +00:00 |
|
Andrey Kamaev
|
bdfd4c3062
|
Refactored Tegra related macro usage
|
2011-12-22 12:51:01 +00:00 |
|
Vadim Pisarevsky
|
72c23e7bbb
|
fixed most of test_core failures (except for SVD)
|
2011-12-05 22:58:27 +00:00 |
|
Kirill Kornyakov
|
d168c2b902
|
Optimized version of CountNonZero functions added
|
2011-11-23 10:16:00 +00:00 |
|
Kirill Kornyakov
|
9fb9d99bb9
|
Optimized version of Norm and NormDiff functions with f32 type added
|
2011-11-21 05:59:49 +00:00 |
|
Kirill Kornyakov
|
330357f7dd
|
Optimized version of NormDiff functions added
|
2011-11-11 11:23:44 +00:00 |
|
Kirill Kornyakov
|
5a702d7d9d
|
Optimized version of Norm functions added
|
2011-11-08 07:39:35 +00:00 |
|
Andrey Kamaev
|
664cd5460e
|
Tegra-optimized cv::compare
|
2011-11-07 06:29:34 +00:00 |
|
Kirill Kornyakov
|
e37930b649
|
Optimized version of Sum functions added
|
2011-10-31 07:04:52 +00:00 |
|
Andrey Kamaev
|
d7ff92439d
|
Better NEON Hamming distance
|
2011-10-26 13:04:53 +00:00 |
|
Vadim Pisarevsky
|
b74116e694
|
unified norm computing; added generalized Hamming distance
|
2011-10-11 15:13:53 +00:00 |
|
Andrey Kamaev
|
6ff2ae1d3a
|
Tegra-optimized minMaxLoc/minMaxIdx
|
2011-09-14 16:20:10 +00:00 |
|
Vadim Pisarevsky
|
ce2f4c6a4d
|
propagated fix for EXR from 2.3 branch to trunk
|
2011-08-02 12:55:05 +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
|
22970b8270
|
fixed multiple GCC warnings on Ubuntu 11.04
|
2011-06-14 12:03:34 +00:00 |
|
Alexander Shishkov
|
b081f8bfd6
|
changed uint to unsigned int
|
2011-06-13 19:06:32 +00:00 |
|
Alexander Shishkov
|
4cc167c5d0
|
fixed problem with norm in opencv_test_core
|
2011-06-13 18:03:33 +00:00 |
|
Vadim Pisarevsky
|
0070ce20af
|
next attempt to fix ticket #1121
|
2011-06-10 06:53:34 +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 |
|