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 |
|
kamjagin
|
c24c1a5926
|
added HAVE_QTKIT to tests
|
2013-08-14 13:40:50 +02:00 |
|
Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|
Alexander Smorkalov
|
34c6598752
|
Perf test failure fixes for Media Foundation.
|
2013-06-25 03:35:57 -07:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Alexander Smorkalov
|
c6cab50c5c
|
Perf tests for Video IO on WInRT fixed.
|
2013-03-28 00:15:30 -07:00 |
|
Alexander Smorkalov
|
09bc99a0c0
|
HAVE_WIN32UI and HAVE_VFW checks and defines added.
|
2013-03-27 08:03:51 -07:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|
Alexander Smorkalov
|
8c45b9d03d
|
Video IO perf tests guarded.
|
2013-01-29 11:09:49 +04:00 |
|
Andrey Kamaev
|
a126532cb7
|
Fix OS X build warnings
|
2012-11-09 11:29:52 +04:00 |
|
marina.kolpakova
|
7a5b9a6b7f
|
replase __APPLE__ marco with __clang__
|
2012-11-01 19:34:05 +04:00 |
|
Andrey Kamaev
|
2b0072d823
|
Suppress more warnings in gtest on OS X
|
2012-10-24 20:36:30 +04:00 |
|
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
2012-07-05 12:56:31 +00:00 |
|
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
2012-06-08 14:54:17 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|