Alexander Alekhin 2c6f1ab57d Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-06 20:04:31 +00:00

..

alpha_comp.cpp

…

bgfg_segm.cpp

samples(gpu): cleanup samples for legacy API

2018-10-31 23:57:10 +00:00

cascadeclassifier.cpp

…

CMakeLists.txt

samples(gpu): cleanup samples for legacy API

2018-10-31 23:57:10 +00:00

farneback_optical_flow.cpp

…

generalized_hough.cpp

…

hog.cpp

…

houghlines.cpp

…

morphology.cpp

…

multi.cpp

…

optical_flow.cpp

…

pyrlk_optical_flow.cpp

…

stereo_match.cpp

…

stereo_multi.cpp

…

super_resolution.cpp

…

surf_keypoint_matcher.cpp

…

video_reader.cpp

Fixes #12692: Update samples/gpu/videoreader.cpp

2018-10-03 17:42:57 +05:30

video_writer.cpp

…