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

Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp

2013-11-26 15:05:26 +04:00

..

cuda

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

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

opencl

fixed kernel compilation

2013-11-21 14:22:24 +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

ocl/core: added prototype for tests

2013-11-22 18:37:44 +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

updated patch to bring in the first functions with "transparent API"

2013-11-18 11:48:00 -05: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

fixed few compile errors and doc build errors

2013-11-18 13:48:04 -05:00

ocl.cpp

fixed error in setting kernel arguments

2013-11-22 18:56:03 +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

fixed failure in Tonemap test

2013-11-19 19:20:24 -05: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

recursive mutex for linux

2013-11-22 17:30:32 +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 failure in Tonemap test

2013-11-19 19:20:24 -05:00