third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-11-17 13:50:04 +00:00
parent d7540c9a3c 183bc5c281
commit 22dbcf98c5
237 changed files with 2990 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/tapi/hog.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ int main(int argc, char** argv)
"{ h help | | print help message }"
"{ i input | | specify input image}"
"{ c camera | -1 | enable camera capturing }"
"{ v video | ../data/vtest.avi | use video as input }"
"{ v video | vtest.avi | use video as input }"
"{ g gray | | convert image to gray one or not}"
"{ s scale | 1.0 | resize the image before detect}"
"{ o output | output.avi | specify output path when input is images}";
@@ -107,7 +107,7 @@ App::App(CommandLineParser& cmd)
make_gray = cmd.has("gray");
resize_scale = cmd.get<double>("s");
vdo_source = cmd.get<string>("v");
vdo_source = samples::findFileOrKeep(cmd.get<string>("v"));
img_source = cmd.get<string>("i");
output = cmd.get<string>("o");
camera_id = cmd.get<int>("c");