generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp
This commit is contained in:
Roman Donchenko
2013-12-16 15:02:12 +04:00
parent 172a5d42a9 e88253ccad
commit 9d8d70d6ca
21 changed files with 1577 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/cpp/stereo_match.cpp
View File

@@ -46,7 +46,7 @@ int main(int argc, char** argv)
const char* algorithm_opt = "--algorithm=";
const char* maxdisp_opt = "--max-disparity=";
const char* blocksize_opt = "--blocksize=";
const char* nodisplay_opt = "--no-display=";
const char* nodisplay_opt = "--no-display";
const char* scale_opt = "--scale=";
if(argc < 3)