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

..

cuda

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

2013-06-25 15:55:52 +04:00

affine.hpp

Finalize core headers reorganization

2013-04-03 14:10:03 +04:00

base.hpp

added Event class (wrapper for cudaEvent)

2013-06-10 12:40:32 +04:00

core_c.h

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

2013-06-10 18:18:01 +04:00

core.hpp

Merge pull request #1002 from asmorkalov:doc_warning_fix

2013-06-25 11:42:00 +04:00

cvdef.h

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

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

cvstd.hpp

Fix bug: cv::String would break if assigned to itself.

2013-07-04 17:06:00 +04:00

cvstd.inl.hpp

Fix findEssentialMat function

2013-04-03 17:25:00 +04:00

eigen.hpp

Finalize core headers reorganization

2013-04-03 14:10:03 +04:00

gpu_stream_accessor.hpp

added Event class (wrapper for cudaEvent)

2013-06-10 12:40:32 +04:00

gpu_types.hpp

fixed documentation build

2013-06-10 15:52:01 +04:00

gpu.hpp

Merge pull request #1047 from jet47:gpustream-remove-obsolete

2013-07-02 18:39:12 +04:00

gpu.inl.hpp

Merge pull request #1047 from jet47:gpustream-remove-obsolete

2013-07-02 18:39:12 +04:00

mat.hpp

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

2013-07-03 19:53:21 +04:00

mat.inl.hpp

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

matx.hpp

Changed / for Matx to Matx::div, for symmetry with Matx::mul.

2013-07-16 12:25:26 +04:00

opengl.hpp

added Stream support to ogl::Buffer

2013-06-10 12:40:31 +04:00

operations.hpp

changed reinterpret_cast to static_cast

2013-04-11 22:32:50 +05:30

persistence.hpp

Finalize core headers reorganization

2013-04-03 14:10:03 +04:00

private.gpu.hpp

renamed gpu_private.hpp to private.gpu.hpp

2013-06-10 12:40:32 +04:00

private.hpp

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

2013-07-03 19:53:21 +04:00

traits.hpp

Finalize core headers reorganization

2013-04-03 14:10:03 +04:00

types_c.h

Changed first approach to a more general MS-specific approach.

2013-07-18 14:24:19 +02:00

types.hpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00

utility.hpp

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

2013-06-10 18:18:01 +04:00

version.hpp

moving version to 2.9.0,

2013-07-17 15:03:11 +04:00

wimage.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00