third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0c0ebca855
opencv/modules/videostab/src
History
Roman Donchenko 40a740ff88 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
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
2014-03-17 14:14:07 +04:00
..
clp.hpp Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
deblurring.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-17 14:14:07 +04:00
fast_marching.cpp
frame_source.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
global_motion.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
inpainting.cpp Build fixes for GPU module. 2013-12-19 19:12:18 +04:00
log.cpp
motion_stabilizing.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
optical_flow.cpp Build fixes for GPU module. 2013-12-19 19:12:18 +04:00
outlier_rejection.cpp
precomp.hpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
stabilizer.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
wobble_suppression.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00