40a740ff88
Conflicts: modules/imgproc/src/opencl/precornerdetect.cl modules/nonfree/perf/perf_main.cpp modules/nonfree/perf/perf_surf.ocl.cpp modules/ocl/src/arithm.cpp modules/ocl/src/gftt.cpp modules/ocl/src/opencl/arithm_bitwise.cl modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl modules/ocl/src/opencl/arithm_minMax.cl modules/ocl/src/opencl/arithm_nonzero.cl modules/ocl/src/opencl/arithm_sum.cl modules/ocl/test/test_arithm.cpp modules/viz/src/precomp.hpp modules/viz/src/vizcore.cpp modules/viz/src/vtk/vtkCloudMatSink.h modules/viz/src/vtk/vtkXYZReader.cpp modules/viz/src/vtk/vtkXYZReader.h modules/viz/test/test_precomp.hpp |
||
|---|---|---|
| .. | ||
| clp.hpp | ||
| deblurring.cpp | ||
| fast_marching.cpp | ||
| frame_source.cpp | ||
| global_motion.cpp | ||
| inpainting.cpp | ||
| log.cpp | ||
| motion_stabilizing.cpp | ||
| optical_flow.cpp | ||
| outlier_rejection.cpp | ||
| precomp.hpp | ||
| stabilizer.cpp | ||
| wobble_suppression.cpp | ||