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 |
|
Andrey Pavlenko
|
4902db1c42
|
also fixing JNI library name in JUnit tests
|
2013-08-13 13:18:01 +04:00 |
|
Andrey Kamaev
|
f77a375354
|
Merge branch '2.4'
|
2013-03-29 19:38:35 +04:00 |
|
Andrey Kamaev
|
49f6dad13f
|
Move cv::KeyPoint and cv::DMatch to core
|
2013-03-26 16:08:43 +04:00 |
|
Andrey Kamaev
|
f282498b1d
|
Drop outdated targets and fix solution folders
|
2013-03-25 21:57:53 +04:00 |
|
Andrey Kamaev
|
caa2c06e50
|
Quiet output of cv::error in Java tests
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
|
2013-01-23 18:08:09 +04:00 |
|
Andrey Kamaev
|
5eabcf8e4f
|
Java tests: print summary for tests run
|
2013-01-23 18:08:09 +04:00 |
|
Andrey Kamaev
|
3889b34ec3
|
Add option to run java tests with run.py
|
2013-01-23 18:08:08 +04:00 |
|
Andrey Kamaev
|
46c4390a2e
|
Hardly refactored CMake script for Java wrappers
|
2013-01-22 17:59:01 +04:00 |
|