Commit 45c2f593cb1cb2042a2abad33f5c3ed6297090fc
1 parent
48aec2e8
Fixed make test issue
Showing
2 changed files
with
7 additions
and
4 deletions
3rdparty/stasm4.0.0/stasm/MOD_1/facedet.cpp
| @@ -146,7 +146,10 @@ static void TraceFaces( // write image showing detected face rects | @@ -146,7 +146,10 @@ static void TraceFaces( // write image showing detected face rects | ||
| 146 | const Image& img, // in | 146 | const Image& img, // in |
| 147 | const char* filename) // in | 147 | const char* filename) // in |
| 148 | { | 148 | { |
| 149 | - (void) detpars, img, filename; | 149 | + (void) detpars; |
| 150 | + (void) img; | ||
| 151 | + (void) filename; | ||
| 152 | + | ||
| 150 | #if TRACE_IMAGES // will be 0 unless debugging (defined in stasm.h) | 153 | #if TRACE_IMAGES // will be 0 unless debugging (defined in stasm.h) |
| 151 | 154 | ||
| 152 | CImage cimg; cvtColor(img, cimg, CV_GRAY2BGR); // color image | 155 | CImage cimg; cvtColor(img, cimg, CV_GRAY2BGR); // color image |
openbr/plugins/gui.cpp
| @@ -292,6 +292,9 @@ public: | @@ -292,6 +292,9 @@ public: | ||
| 292 | 292 | ||
| 293 | void projectUpdate(const TemplateList &src, TemplateList &dst) | 293 | void projectUpdate(const TemplateList &src, TemplateList &dst) |
| 294 | { | 294 | { |
| 295 | + if (Globals->parallelism > 1) | ||
| 296 | + qFatal("ManualTransform cannot execute in parallel."); | ||
| 297 | + | ||
| 295 | dst = src; | 298 | dst = src; |
| 296 | 299 | ||
| 297 | if (src.empty()) | 300 | if (src.empty()) |
| @@ -320,9 +323,6 @@ public: | @@ -320,9 +323,6 @@ public: | ||
| 320 | 323 | ||
| 321 | void init() | 324 | void init() |
| 322 | { | 325 | { |
| 323 | - if (Globals->parallelism > 1) | ||
| 324 | - qFatal("ManualTransform cannot be run in parallel."); | ||
| 325 | - | ||
| 326 | if (!Globals->useGui) | 326 | if (!Globals->useGui) |
| 327 | return; | 327 | return; |
| 328 | 328 |