Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

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

..

performance

refactored FGD algorithm

2013-07-18 15:39:42 +04:00

768x576.avi

added background subtraction sample for gpu module

2012-06-25 12:48:54 +00:00

aloeL.jpg

added bigger images for SURF performance test (it shows better results on them)

2011-02-01 09:51:23 +00:00

aloeR.jpg

added bigger images for SURF performance test (it shows better results on them)

2011-02-01 09:51:23 +00:00

alpha_comp.cpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

basketball1.png

Added the GPU version of the Farneback's optical flow

2012-02-16 11:23:51 +00:00

basketball2.png

Added the GPU version of the Farneback's optical flow

2012-02-16 11:23:51 +00:00

bgfg_segm.cpp

refactored FGD algorithm

2013-07-18 15:39:42 +04:00

brox_optical_flow.cpp

Normalized file endings.

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

cascadeclassifier_nvidia_api.cpp

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

2013-06-10 18:18:01 +04:00

cascadeclassifier.cpp

fixed compilation

2013-07-17 11:41:48 +04:00

CMakeLists.txt

Normalized file endings.

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

driver_api_multi.cpp

fix gpu::DeviceInfo compilation under linux

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

driver_api_stereo_multi.cpp

fix gpu::DeviceInfo compilation under linux

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

farneback_optical_flow.cpp

switched to Input/Output Array in reductions operations

2013-06-11 17:58:05 +04:00

generalized_hough.cpp

refactored generalized hough (both CPU and GPU):

2013-07-18 15:17:33 +04:00

hog.cpp

Merge commit '43aec5ad' into merge-2.4

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

houghlines.cpp

Merge commit '43aec5ad' into merge-2.4

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

morphology.cpp

refactored Morphology Filters

2013-06-14 17:25:57 +04:00

multi.cpp

fix gpu::DeviceInfo compilation under linux

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

opengl.cpp

renamed gpu headers (made it more consistent)

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

optical_flow.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

opticalflow_nvidia_api.cpp

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00

pyrlk_optical_flow.cpp

refactored GoodFeaturesToTrackDetector

2013-07-17 11:39:56 +04:00

road.png

added gpu HOG sample

2010-11-17 12:49:53 +00:00

rubberwhale1.png

[+] Added Brox optical flow (implementation courtesy of Michael Smirnov)

2011-09-29 14:46:39 +00:00

rubberwhale2.png

[+] Added Brox optical flow (implementation courtesy of Michael Smirnov)

2011-09-29 14:46:39 +00:00

softcascade.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

stereo_match.cpp

Merge commit '43aec5ad' into merge-2.4

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

stereo_multi.cpp

fix gpu::DeviceInfo compilation under linux

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

super_resolution.cpp

Deleted all trailing whitespace.

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

surf_keypoint_matcher.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

tsucuba_left.png

added first version of stereo match sample on gpu

2010-12-21 07:35:46 +00:00

tsucuba_right.png

added first version of stereo match sample on gpu

2010-12-21 07:35:46 +00:00

video_reader.cpp

refactored VideoReader (convert it to abstract interface)

2013-06-11 17:57:40 +04:00

video_writer.cpp

refactored VideoWriter class (convert it to abstract interface)

2013-06-11 17:57:39 +04:00