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

Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp

2013-11-11 16:55:36 +04:00

..

cuda

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

2013-11-11 16:55:36 +04:00

affine.hpp

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

base.hpp

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

2013-11-11 16:55:36 +04:00

core_c.h

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

core.hpp

Enabled CV_Assert and such to print the function name with Visual C++.

2013-11-07 17:22:02 +04:00

cuda_stream_accessor.hpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

cuda_types.hpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

cuda.hpp

now Allocator accepts GpuMat* instead of 3 pointers

2013-10-08 17:21:25 +04:00

cuda.inl.hpp

removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now

2013-10-24 16:08:15 +04:00

cvdef.h

Redefine CPU_xx constants in cv::namespace

2013-09-20 20:04:33 +02:00

cvstd.hpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

cvstd.inl.hpp

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

eigen.hpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

mat.hpp

changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.

2013-10-25 16:46:03 +04:00

mat.inl.hpp

removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now

2013-10-24 16:08:15 +04:00

matx.hpp

Removed CV_EXPORTS from all template classes (that I could find).

2013-07-25 19:40:08 +04:00

ocl.hpp

changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.

2013-10-25 16:46:03 +04:00

opengl.hpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

operations.hpp

remove CV_EXPORT from templates

2013-09-15 13:48:54 +04:00

persistence.hpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

private.cuda.hpp

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

2013-11-11 16:55:36 +04:00

private.hpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

ptr.inl.hpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

traits.hpp

Finalize core headers reorganization

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

types_c.h

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

2013-10-15 20:08:52 +04:00

types.hpp

Make similar default typedefs for Point_, Size_ and Rect_

2013-09-24 11:48:04 +02:00

utility.hpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

version.hpp

OpenCV Version++. OpenCV Manager Version++.

2013-11-01 15:22:34 +04:00

wimage.hpp

Normalize line endings and whitespace

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