opencv

History

Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt

2014-02-03 13:23:59 +04:00

doc

Doc fix.

2014-01-16 16:30:54 +02:00

include/opencv2

Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()

2014-01-16 11:09:25 +02:00

perf

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

src

Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2