opencv

Files

Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp

2013-11-11 16:55:36 +04:00

cuda

used new device layer for cv::cuda::norm

2013-10-01 15:28:51 +04:00

arithm.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

core.cpp

used new device layer for cv::cuda::LUT

2013-10-01 15:24:17 +04:00

element_operations.cpp

switched to new device layer in polar <-> cart