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

Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp

2013-08-19 19:02:36 +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

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

2013-08-19 19:02:36 +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 remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-19 19:02:36 +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

Warning and review notes fixes.

2013-08-02 04:10:56 -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 pull request #795 from taka-no-me:move_imgproc_utils_to_core

2013-04-11 11:35:15 +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

Finalize core headers reorganization

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

parallel.cpp

API restricted on WinRT partially removed from core.

2013-07-31 05:43:51 -07: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 remote-tracking branch 'origin/2.4' into merge-2.4

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

stl.cpp

Add cv::String class

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

system.cpp

Merge remote-tracking branch 'origin/2.4'

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

tables.cpp

Normalize line endings and whitespace

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

types.cpp

Move cv::KeyPoint and cv::DMatch to core

2013-03-26 16:08:43 +04:00