generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1b10860f36
opencv/modules/python/src2
History
Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
..
cv2.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
gen2.py Updated usage of METH_X definitions for python 3. 2013-06-13 20:10:01 -04:00
hdr_parser.py Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
pycompat.hpp Updated cv2.cpp to support Python 3 API. 2013-06-13 20:10:01 -04:00