Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)
commit2d6f35d6ed4bdf136fee7628a415178f08c118fe
treecd7b274e3a8a9173b0711e8e82a870f86ba6a671
parentdd25f416a6c318064ab371abbf038527ae3328f4
parent525b6eca2ed6e790e41d204399025e8280b8bb8e
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
22 files changed:
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVFindLibsGUI.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVFindLibsVideo.cmake
modules/contrib/src/inputoutput.cpp
modules/core/doc/basic_structures.rst
modules/gpuoptflow/src/tvl1flow.cpp
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/highgui/src/grfmt_png.cpp
modules/highgui/test/test_grfmt.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/arithm.cpp
samples/gpu/super_resolution.cpp