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 pull request #1575 from jet47:gpu-buffer-pool

2013-10-21 16:35:14 +04:00

algorithm.cpp

Merge branch 'master' into gpu-cuda-rename

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

alloc.cpp

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

arithm.cpp

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

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

array.cpp

Merge branch 'master' into gpu-cuda-rename

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

command_line_parser.cpp

Fix bug: CommandLineParserParams's comparator would fail with equal arguments.

2013-07-04 17:09:29 +04:00

convert.cpp

trying to fix failures in tests

2013-10-24 17:23:48 +04:00

copy.cpp

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

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

cuda_buffer_pool.cpp

now Allocator accepts GpuMat* instead of 3 pointers

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

cuda_gpu_mat.cpp

added GpuMat::Allocator interface

2013-10-07 09:42:43 +04:00

cuda_host_mem.cpp

renamed gpu* source to cuda* in core module

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

cuda_info.cpp

renamed gpu* source to cuda* in core module

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

cuda_stream.cpp

added BufferPool class

2013-10-08 17:20:29 +04:00

datastructs.cpp

Remove more old definitions from internal.hpp

2013-04-01 16:32:08 +04:00

drawing.cpp

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

dxt.cpp

added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.

2013-09-09 16:13:39 +04:00

gl_core_3_1.cpp

Make core/internal.hpp a private header

2013-04-01 17:29:10 +04:00

gl_core_3_1.hpp

updated license header in whole gpu module

2013-03-22 14:03:15 +04:00

glob.cpp

Globbing accuracy test fail on Windows RT fixed.

2013-09-02 04:31:58 -07:00

lapack.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

mathfuncs.cpp

Move cv::Mat out of core.hpp

2013-04-01 15:24:34 +04:00

matmul.cpp

Merge pull request #1224 from mbarnach:pca_io

2013-09-03 18:43:54 +04:00

matop.cpp

the first draft of transparent API and new UMat class. more files

2013-10-22 14:05:15 +04:00

matrix.cpp

yet another attempt to fix test failures

2013-10-24 18:00:15 +04:00

ocl.cpp

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.cpp

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

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

out.cpp

Merge branch 'master' into gpu-cuda-rename

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

parallel.cpp

Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)

2013-08-23 15:35:55 +08:00

persistence.cpp

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

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

precomp.hpp

fixed build on Windows

2013-10-23 00:17:18 +04:00

rand.cpp

the first draft of transparent API and new UMat class. more files

2013-10-22 14:05:15 +04:00

stat.cpp

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

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

stl.cpp

War on Whitespace, master edition: file endings.

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

system.cpp

fixed build on Windows

2013-10-23 00:17:18 +04:00

tables.cpp

Normalize line endings and whitespace

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

types.cpp

War on Whitespace, master edition: file endings.

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

umatrix.cpp

added first very simple test for UMat<=>Mat conversion

2013-10-24 22:33:41 +04:00