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

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp

2013-12-16 15:02:12 +04:00

..

cuda

Merge pull request #1575 from jet47:gpu-buffer-pool

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

opencl

core/ocl: autogenerated files for dynamic runtime

2013-12-11 15:56:54 +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

fixed kernel compilation of cv::min, cv::max for CV_64F

2013-12-12 02:42:24 +04:00

array.cpp

Merge branch 'master' into gpu-cuda-rename

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

command_line_parser.cpp

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

2013-12-03 17:35:21 +04:00

convert.cpp

more strict checks outside ROI

2013-12-10 19:30:14 +04:00

copy.cpp

Merge pull request #1936 from ElenaGvozdeva:ocl_flip

2013-12-06 16:40:30 +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

added cv::sqrt to T-API (using built-in sqrt OpenCL function)

2013-12-12 18:12:30 +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

added cv::merge to T-API

2013-12-08 13:49:28 +04:00

ocl.cpp

core/ocl: replace dynamic runtime

2013-12-11 15:56:54 +04:00

opengl.cpp

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

2013-11-26 15:05:26 +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

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +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

added cv::norm to T-API

2013-12-08 15:27:48 +04:00

stl.cpp

War on Whitespace, master edition: file endings.

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

system.cpp

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

2013-12-16 15:02:12 +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

fixed UMat sync problems

2013-12-13 18:38:12 +04:00