Merge pull request #1996 from SpecLad:merge-2.4

This commit is contained in:
Roman Donchenko
2013-12-17 13:21:47 +04:00
committed by OpenCV Buildbot
24 changed files with 1529 additions and 302 deletions

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)