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
..
vtk	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
clouds.cpp	Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color	2014-02-15 17:02:17 +04:00
precomp.hpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
shapes.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
types.cpp	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00
viz3d.cpp	fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.	2014-02-15 20:08:04 +04:00
vizcore.cpp	iteractor work	2014-03-02 23:15:53 +04:00
vizimpl.cpp	Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)	2014-03-16 20:07:05 +04:00
vizimpl.hpp	iteractor work	2014-03-02 23:15:53 +04:00
widget.cpp	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00