third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d64f05cd59
opencv/modules/nonfree/src
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
..
cuda renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
opencl optimize SURF by 2013-12-17 14:12:33 +04:00
nonfree_init.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
precomp.hpp updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
sift.cpp DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
surf.cpp DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
surf.cuda.cpp DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
surf.ocl.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00