generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f404315368
opencv/modules/photo
History
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +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