mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
63b3db53d7
opencv/samples
History
Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
..
android Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
c Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
cpp Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
gpu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
java Normalized file endings. 2013-08-21 18:59:25 +04:00
MacOSX/FaceTracker Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
ocl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
python2 Add cv::logPolar, cv::linearPolar, and a python example 2013-09-30 22:31:19 +02:00
winrt/ImageManipulations Removed incorrect iCCP chunks from GUI resources. 2013-08-30 09:49:24 -04:00
CMakeLists.txt cmake: revert CRT linkage option for MSVS 2013-10-09 17:49:11 +04:00