Roman Donchenko f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp

2013-06-25 15:55:52 +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

Add a workaround to interpolate between oclMat and Input/OutputArray.

2013-06-21 14:05:29 +08:00

cvdef.h

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

cvstd.hpp

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +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

fixed documentation build

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

gpu.inl.hpp

made createContinuous & ensureSizeIsEnough generic (OutputArray support)

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

mat.hpp

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

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

mat.inl.hpp

Merge branch '2.4'

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

matx.hpp

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +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-06-25 15:55:52 +04:00

traits.hpp

Finalize core headers reorganization

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

types_c.h

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

2013-06-10 18:18:01 +04: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

OpenCV verison incremented

2013-04-04 15:50:36 +04:00

wimage.hpp

Normalize line endings and whitespace

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