cc05493730
Conflicts: cmake/OpenCVDetectAndroidSDK.cmake cmake/OpenCVGenAndroidMK.cmake cmake/OpenCVModule.cmake cmake/templates/OpenCV.mk.in cmake/templates/OpenCVConfig.cmake.in doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst modules/cudabgsegm/src/cuda/mog.cu modules/imgproc/perf/opencl/perf_filters.cpp modules/imgproc/src/opencl/filterSep_singlePass.cl modules/nonfree/CMakeLists.txt modules/nonfree/perf/perf_precomp.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/filtering.cpp modules/ocl/src/opencl/bgfg_mog.cl modules/superres/CMakeLists.txt modules/superres/src/btv_l1_cuda.cpp modules/superres/src/cuda/btv_l1_gpu.cu modules/superres/src/frame_source.cpp modules/superres/src/input_array_utility.cpp modules/superres/src/optical_flow.cpp modules/superres/src/precomp.hpp samples/gpu/CMakeLists.txt samples/gpu/brox_optical_flow.cpp samples/gpu/super_resolution.cpp |
||
---|---|---|
.. | ||
performance | ||
768x576.avi | ||
aloeL.jpg | ||
aloeR.jpg | ||
alpha_comp.cpp | ||
basketball1.png | ||
basketball2.png | ||
bgfg_segm.cpp | ||
brox_optical_flow.cpp | ||
cascadeclassifier_nvidia_api.cpp | ||
cascadeclassifier.cpp | ||
CMakeLists.txt | ||
driver_api_multi.cpp | ||
driver_api_stereo_multi.cpp | ||
farneback_optical_flow.cpp | ||
generalized_hough.cpp | ||
hog.cpp | ||
houghlines.cpp | ||
morphology.cpp | ||
multi.cpp | ||
opengl.cpp | ||
optical_flow.cpp | ||
opticalflow_nvidia_api.cpp | ||
pyrlk_optical_flow.cpp | ||
road.png | ||
rubberwhale1.png | ||
rubberwhale2.png | ||
softcascade.cpp | ||
stereo_match.cpp | ||
stereo_multi.cpp | ||
super_resolution.cpp | ||
surf_keypoint_matcher.cpp | ||
tsucuba_left.png | ||
tsucuba_right.png | ||
video_reader.cpp | ||
video_writer.cpp |