mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
ff9a0815b9
opencv/modules/photo
History
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
..
doc fixed warnings 2013-12-06 15:20:29 +04:00
include/opencv2 fixed warnings 2013-12-06 15:20:29 +04:00
perf added performance tests for NLMeans 2014-02-11 18:21:53 +04:00
src deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +04:00
CMakeLists.txt renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00