2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
87935f3560
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
2014-01-31 12:49:10 +04:00
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
2013-10-25 14:34:02 +04:00
dfe07df87b
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
2013-10-24 14:09:08 +04:00
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
7c5bd78804
Test fixes
...
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
2013-06-27 15:47:37 +04:00
43122939cb
Media foundation video i/o fixes.
...
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
996f02a531
Multiple Media Foundation video i/o fixes.
...
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
2013-06-24 02:45:27 -07:00
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
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
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
d3c73071ea
Temporarily disable test on Mac
2012-05-29 11:41:24 +00:00
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
cff117c08b
Updated saving paths for highgui tests
2012-03-28 15:27:55 +00:00
76852a499d
Minor refactoring of video i/o tests: fixed error with indexes
2012-03-28 14:05:26 +00:00
8313095734
Changed saving paths for another highgui tests
2012-03-28 13:49:55 +00:00
fc68c18c92
unrolled changes from r7601 (problems with Android,...)
2012-03-22 13:36:07 +00:00
ce8c2892d8
Removed OS conditions from highgui tests
2012-03-22 09:38:44 +00:00
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
d7763d99de
Minor code changes in test_video_io.cpp
2012-02-22 22:10:53 +00:00
23c2275449
Added conditional compiling for video i/o tests in highgui.
2012-02-22 17:12:25 +00:00
deee349ba7
removed highgui video tests execution on macos; also minor code changes
2012-02-15 12:06:46 +00:00
edc9d4f951
fixed compiling error under Windows; updated test_video_io.cpp
2012-02-13 12:41:27 +00:00
35c19442a7
updated 3 highgui tests
2012-02-11 15:28:03 +00:00
a41b0902f4
Prepared some videos for future tests. Added first version of common positioning video test.
2012-01-31 21:02:05 +00:00
4168a698f6
Fixed highgui tests for Android
2011-12-20 07:45:49 +00:00
03c7784186
added several new highgui tests
2011-06-03 08:33:27 +00:00
19900d9894
converted all highgui tests to the format of google test system
2011-06-02 15:23:37 +00:00
bf05872929
added opencv_test_highgui
2011-06-01 14:23:55 +00:00
b906ad3108
Test system included into Android build
2011-04-11 14:47:06 +00:00
061b49e0b2
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
2011-02-09 20:55:11 +00:00
Roman Donchenko