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 |
|
Anatoly Baksheev
|
eb8728d727
|
Updated cloud io functionality - removed dependency from VTK legacy
|
2014-02-10 15:45:44 +04:00 |
|
Anatoly Baksheev
|
02ebc4368c
|
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
|
2014-01-20 22:51:33 +04:00 |
|
Anatoly Baksheev
|
e472d45d99
|
updated mesh reading (texture support)
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
f37c31742a
|
created tests for images, created vtk/vtkImageMatSource, and switched all images to that class
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
a8556134ae
|
refactored simple trajectory to use TensorGlyph
|
2014-01-19 18:38:49 +04:00 |
|
Anatoly Baksheev
|
c1b41caa7c
|
added vtkCloudMatSink, reworked cloud IO functions, added normals support
|
2014-01-19 18:38:44 +04:00 |
|