Open Source Computer Vision Library https://opencv.org/

Tree: c9d8025fab

opencv/modules/highgui

History

Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp		11 years ago
..
doc	…
include/opencv2	…
perf	…
src	…
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
CMakeLists.txt	…