opencv

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

Roman Donchenko 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		11 years ago
..
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
src	deleted excess semicolons, commas	11 years ago
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
CMakeLists.txt	renamed gpulegacy -> cudalegacy	12 years ago