third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
953aafbd3d
opencv/modules/viz/src/vtk
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
..
vtkCloudMatSink.cpp fixed size_t/int conversion warnings 2014-02-10 15:45:45 +04:00
vtkCloudMatSink.h Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-17 14:14:07 +04:00
vtkCloudMatSource.cpp fixed size_t/int conversion warnings 2014-02-10 15:45:45 +04:00
vtkCloudMatSource.h
vtkCocoaInteractorFix.mm iteractor work 2014-03-06 03:26:21 +04:00
vtkImageMatSource.cpp
vtkImageMatSource.h
vtkOBJWriter.cpp iteractor work 2014-03-02 23:15:53 +04:00
vtkOBJWriter.h Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00
vtkTrajectorySource.cpp fixed size_t/int conversion warnings 2014-02-10 15:45:45 +04:00
vtkTrajectorySource.h
vtkVizInteractorStyle.cpp iteractor work 2014-03-06 03:26:21 +04:00
vtkVizInteractorStyle.hpp iteractor work 2014-03-02 23:15:53 +04:00
vtkXYZReader.cpp Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00
vtkXYZReader.h Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00
vtkXYZWriter.cpp Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00
vtkXYZWriter.h Updated cloud io functionality - removed dependency from VTK legacy 2014-02-10 15:45:44 +04:00