third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
63e4af8536
opencv/samples/cpp/tutorial_code
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
..
bioinspired
calib3d Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
features2D Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04:00
gpu/gpu-basics-similarity Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
HighGUI Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
Histograms_Matching Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
images
ImgProc Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
ImgTrans Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
introduction Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
ml Fixed suggestion of bugfix 3431 2013-12-16 11:05:53 +01:00
objectDetection Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
photo/hdr_imaging Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
ShapeDescriptors Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
TrackingMotion Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
video fixing trailing whitespaces 2013-09-01 22:13:49 +02:00
viz removed trailing spaces 2013-09-18 12:50:55 +01:00