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 |
|
Roman Donchenko
|
6d7f29a03a
|
Made it so that a dummy .cpp is actually created when compiling with VC++.
|
2013-08-08 16:49:14 +04:00 |
|
Andrey Kamaev
|
762aefd71b
|
Compile opencv_test_core with cv::String instead of std::string
All tests passed!
|
2013-03-22 22:14:22 +04:00 |
|
Andrey Kamaev
|
b6efec5f8b
|
Add support for Android NDK r8d
|
2012-12-21 15:39:23 +04:00 |
|
Andrey Kamaev
|
2e91405833
|
Fix OS X build warnings
|
2012-10-22 20:33:14 +04:00 |
|
Andrey Kamaev
|
02b33792cb
|
Fix precompiled headers support detection for gcc-4.6 toolchain from Android NDK r8b
The version reported by toolchain is 4.6.x-google so regex needs an adjustment.
|
2012-09-04 16:50:55 +04:00 |
|
Andrey Kamaev
|
3fb3851c7a
|
Remove debug print
|
2012-09-01 08:42:07 +04:00 |
|
Andrey Kamaev
|
bd12f636c8
|
Unify manifest files in Android examples
|
2012-08-31 17:47:12 +04:00 |
|
Andrey Kamaev
|
0f01d8df1c
|
Fixed Visual Studio precompiled headers
|
2012-06-18 09:19:57 +00:00 |
|
Andrey Kamaev
|
a20837fb7c
|
Fixed precompiled headers support detection
|
2012-06-18 06:53:13 +00:00 |
|
Andrey Kamaev
|
ffa44fb114
|
Fixed precompiled headers build on Linux
|
2012-06-08 16:04:14 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Andrey Kamaev
|
8cab65c173
|
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
|
2012-01-03 13:48:12 +00:00 |
|