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 |
|
Ian Taylor
|
45969bb3ae
|
fix variable name typo in calcBlurriness
|
2014-03-10 03:02:06 -04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Alexey Spizhevoy
|
ecb1f0e288
|
Fixed some bugs in videostab module and refactored it
|
2012-04-04 09:28:47 +00:00 |
|
Alexey Spizhevoy
|
68f26cca78
|
Refactored videostab module
|
2012-03-21 09:34:27 +00:00 |
|
Alexey Spizhevoy
|
faf845d31f
|
Fixed warning
|
2012-03-21 08:37:24 +00:00 |
|
Alexey Spizhevoy
|
5e2bcacba5
|
Fixed some warnings
|
2012-03-21 07:35:25 +00:00 |
|
Alexey Spizhevoy
|
f58c40bfab
|
Added licence message
|
2012-03-19 14:13:33 +00:00 |
|
Alexey Spizhevoy
|
a60dc947b1
|
Added first version of videostab module
|
2012-03-19 13:39:23 +00:00 |
|