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

Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp

2013-08-27 19:15:47 +04:00

..

cuda

rewrote matrix operations with cudev module

2013-07-22 13:07:07 +04:00

algorithm.cpp

Move FileStorage to separate header

2013-04-01 19:18:05 +04:00

alloc.cpp

Merge remote-tracking branch 'origin/2.4'

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

arithm.cpp

Deleted all trailing whitespace.

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

array.cpp

Remove more old definitions from internal.hpp

2013-04-01 16:32:08 +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

Merge commit '43aec5ad' into merge-2.4

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

copy.cpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +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

polished the patch

2013-08-07 22:34:29 +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

Invalid usage of cv::Ptr for arrays fixed.

2013-08-21 07:20:35 -07:00

gpu_cuda_mem.cpp

made createContinuous & ensureSizeIsEnough generic (OutputArray support)

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

gpu_info.cpp

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

gpu_mat.cpp

rewrote matrix operations with cudev module

2013-07-22 13:07:07 +04:00

gpu_stream.cpp

added Event class (wrapper for cudaEvent)

2013-06-10 12:40:32 +04: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 remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-19 19:02:36 +04:00

matop.cpp

Merge branch '2.4'

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

matrix.cpp

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

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

opengl.cpp

added Stream support to ogl::Buffer

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

out.cpp

Normalized file endings.

2013-08-21 18:59:25 +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'

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

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

2013-07-10 16:02:07 +04:00

rand.cpp

Merge remote-tracking branch 'origin/2.4'

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

stat.cpp

Merge commit '43aec5ad' into merge-2.4

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

stl.cpp

War on Whitespace, master edition: file endings.

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

system.cpp

Merge commit '43aec5ad^' into merge-2.4

2013-08-27 13:23:26 +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