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

Browse Source

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

...

This commit is contained in:

Roman Donchenko

2013-07-22 18:38:57 +04:00

parent ef91d7e883 38a0b47b2f

commit 3939d78336

32 changed files with 358 additions and 215 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

335

modules/java/generator/src/cpp/Mat.cpp

File diff suppressed because it is too large Load Diff