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

Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp

2013-11-05 16:38:23 +04:00

..

androidcamera

…

bioinspired

Suppressed -Wundef in bioinspired, because of OpenCL headers.

2013-10-22 15:16:22 +04:00

calib3d

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

2013-10-28 13:38:25 +04:00

contrib

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

2013-10-22 14:28:00 +04:00

core

OpenCV Version++. OpenCV Manager Version++.

2013-11-01 15:22:34 +04:00

cuda

moved BufferPool management functions to public

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

cudaarithm

used new device layer for cv::cuda::norm

2013-10-01 15:28:51 +04:00

cudabgsegm

…

cudacodec

switched to new device layer in gpucodec module

2013-09-23 12:16:57 +04:00

cudafeatures2d

…

cudafilters

…

cudaimgproc

…

cudalegacy

…

cudaoptflow

…

cudastereo

Fix a typo in kernel size

2013-10-11 23:31:31 -04:00

cudawarping

Small OpenCV-CUDA bugs are fixed.

2013-10-22 12:08:43 +05:30

cudev

Merge pull request #1540 from jet47:gpuarithm-cudev

2013-10-21 16:34:45 +04:00

features2d

Minimized the number of arguments required to workaround the MSVC2013 compiler bug.

2013-10-21 21:43:26 +02:00

flann

Cherry-picked mariusmuja/flann@8c8b0e0cb8.

2013-10-02 16:09:45 +04:00

highgui

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

2013-11-05 16:38:23 +04:00

imgproc

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

2013-11-05 16:38:23 +04:00

java

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

2013-11-05 16:38:23 +04:00

legacy

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

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

matlab

Replace $(Configuration) with $<CONFIGURATION>

2013-10-24 18:20:16 +01:00

ml

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

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

nonfree

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

2013-11-05 16:38:23 +04:00

objdetect

Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix

2013-10-29 16:03:51 +04:00

ocl

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

2013-11-05 16:38:23 +04:00

optim

Merge pull request #1521 from nailbiter:optimCG

2013-10-29 16:14:32 +04:00

photo

fixed warnings

2013-10-08 12:46:43 +04:00

python

fixed crash in Python bindings

2013-10-24 17:37:33 +04:00

shape

Merge pull request #1567 from ilya-lavrenov:warn_fix

2013-10-08 13:50:49 +04:00

softcascade

…

stitching

Named GraphCutSeamFinderBase to allow its usage in makePtr.

2013-10-08 18:13:56 +04:00

superres

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

2013-11-05 16:38:23 +04:00

ts

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

2013-10-22 14:28:00 +04:00

video

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

2013-11-05 16:38:23 +04:00

videostab

…

viz

Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)

2013-10-03 02:10:27 +02:00

world

…

CMakeLists.txt

…

refman.rst.in

…