Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Alexander Smorkalov
|
4c1ed13846
|
Warning fixes for GCC 4.8.
|
2014-02-18 23:53:35 +04:00 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +04:00 |
|
Andrey Kamaev
|
62adc01980
|
Move cv::Rect_
|
2013-04-01 15:24:33 +04:00 |
|
Alexander Smorkalov
|
e21a1d3124
|
Test system refactoring
cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.
|
2013-02-21 12:07:04 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04: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
|
6f44457de8
|
the combined cxts + gtest
|
2011-02-09 22:03:01 +00:00 |
|
Vadim Pisarevsky
|
23e83f8fc7
|
|
2011-02-09 21:58:31 +00:00 |
|
Vadim Pisarevsky
|
e4b91918b1
|
the combined cxts + gtest
|
2011-02-09 21:56:48 +00:00 |
|