opencv

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

gpu_perf.cpp

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

gpu_test.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

precomp.cpp

Performance testing branch is merged back into trunk

2011-09-06 15:30:28 +00:00

precomp.hpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4