opencv

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

Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp		11 years ago
..
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	12 years ago
_cvcommon.h	Merge commit '43aec5ad' into merge-2.4	12 years ago
_cvhaartraining.h	Normalize line endings and whitespace	13 years ago
createsamples.cpp	Global CMake reorganization:	13 years ago
cvboost.cpp	Compile OpenCV with GCC visibility set to hidden	12 years ago
cvclassifier.h	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
cvcommon.cpp	Remove inline sorting algorithms from core headers	12 years ago
cvhaarclassifier.cpp	Merged the trunk r8589:8653 - all changes related to build warnings	13 years ago
cvhaartraining.cpp	Drop outdated definitions from internal.hpp	12 years ago
cvhaartraining.h	Normalize line endings and whitespace	13 years ago
cvsamples.cpp	Merged the trunk r8589:8653 - all changes related to build warnings	13 years ago
haartraining.cpp	Global CMake reorganization:	13 years ago
performance.cpp	Merge commit '43aec5ad' into merge-2.4	12 years ago