opencv/modules/gpuwarping/src
Roman Donchenko 2d6f35d6ed 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
2013-08-27 19:15:47 +04:00
..
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
precomp.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
precomp.hpp renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
pyramids.cpp added cudev::GpuMat_<T> support to Input/Output arrays 2013-07-22 10:33:40 +04:00
remap.cpp switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00
resize.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
warp.cpp switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00