third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3c4b24d531
opencv/modules/highgui/test
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
..
test_drawing.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
test_ffmpeg.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
test_fourcc.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test_framecount.cpp Boring changes - highgui. 2013-09-05 18:26:43 +04:00
test_grfmt.cpp Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
test_gui.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
test_main.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
test_positioning.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test_precomp.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
test_video_io.cpp Added stupid hacks to make the video tests pass with FFmpeg 2.0.2. 2013-10-25 14:34:02 +04:00
test_video_pos.cpp Added stupid hacks to make the video tests pass with FFmpeg 2.0.2. 2013-10-25 14:34:02 +04:00