Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp

2014-02-17 15:24:05 +04:00

..

test_cloning.cpp

fixed warnings

2013-12-06 15:20:29 +04:00

test_decolor.cpp

whitespaces removed and other minor changes to fix build error

2013-12-04 19:17:59 +05:30

test_denoising.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

test_denoising.cuda.cpp

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

2014-02-17 15:24:05 +04:00

test_hdr.cpp

added some diagnostic into Tonemap test

2013-11-18 23:14:44 -05:00

test_inpaint.cpp

Make photo.hpp independent from C API

2013-04-08 15:47:29 +04:00

test_main.cpp

lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.

2012-03-15 14:36:01 +00:00

test_npr.cpp

fixed warnings

2013-12-06 15:20:29 +04:00

test_precomp.hpp

fixed compilation for vs2008

2013-11-17 14:13:13 +04:00