Commit edba806663b4b7d989aed8f743beae8cc6b47131
1 parent
1aa9a312
PP5 tweaks
Showing
3 changed files
with
11 additions
and
15 deletions
.gitignore
| 1 | -#Repository specific | |
| 1 | +### Repository Specific ### | |
| 2 | 2 | build* |
| 3 | 3 | 3rdparty/pittpatt* |
| 4 | 4 | |
| 5 | -#Generic | |
| 5 | +### Generic ### | |
| 6 | 6 | *.log |
| 7 | 7 | *.user |
| 8 | 8 | |
| 9 | -#Latex | |
| 9 | +### Latex ### | |
| 10 | 10 | *.aux |
| 11 | 11 | *.nav |
| 12 | 12 | *.out |
| 13 | 13 | *.snm |
| 14 | 14 | *.toc |
| 15 | 15 | |
| 16 | -#QtCreator | |
| 16 | +### QtCreator ### | |
| 17 | 17 | *CMakeLists.txt.user* |
| 18 | 18 | |
| 19 | -#R | |
| 19 | +### R ### | |
| 20 | 20 | *.RData |
| 21 | 21 | *.Rhistory |
| 22 | 22 | |
| 23 | -#Subversion | |
| 23 | +### Subversion ### | |
| 24 | 24 | *.svn* |
| 25 | 25 | |
| 26 | -#Synology | |
| 26 | +### Synology ### | |
| 27 | 27 | *.DS* | ... | ... |
sdk/plugins/pp5.cpp
| ... | ... | @@ -38,7 +38,6 @@ using namespace br; |
| 38 | 38 | * \author Josh Klontz \cite jklontz |
| 39 | 39 | * \author E. Taborsky \cite mmtaborsky |
| 40 | 40 | */ |
| 41 | - | |
| 42 | 41 | class PP5Initializer : public Initializer |
| 43 | 42 | { |
| 44 | 43 | Q_OBJECT |
| ... | ... | @@ -62,7 +61,6 @@ BR_REGISTER(Initializer, PP5Initializer) |
| 62 | 61 | * \author Josh Klontz \cite jklontz |
| 63 | 62 | * \author E. Taborsky \cite mmtaborsky |
| 64 | 63 | */ |
| 65 | - | |
| 66 | 64 | struct PP5Context |
| 67 | 65 | { |
| 68 | 66 | ppr_context_type context; |
| ... | ... | @@ -213,7 +211,6 @@ struct PP5Context |
| 213 | 211 | * \author Josh Klontz \cite jklontz |
| 214 | 212 | * \author E. Taborsky \cite mmtaborsky |
| 215 | 213 | */ |
| 216 | - | |
| 217 | 214 | class PP5Enroll : public UntrainableTransform |
| 218 | 215 | { |
| 219 | 216 | Q_OBJECT |
| ... | ... | @@ -249,7 +246,7 @@ class PP5Enroll : public UntrainableTransform |
| 249 | 246 | dst.file.append(PP5Context::toMetadata(face)); |
| 250 | 247 | dst += m; |
| 251 | 248 | |
| 252 | - if (src.file.getBool("ForceEnrollment")) break; | |
| 249 | + if (!src.file.getBool("enrollAll")) break; | |
| 253 | 250 | } |
| 254 | 251 | |
| 255 | 252 | ppr_free_face_list(face_list); |
| ... | ... | @@ -258,7 +255,7 @@ class PP5Enroll : public UntrainableTransform |
| 258 | 255 | |
| 259 | 256 | contexts.release(context); |
| 260 | 257 | |
| 261 | - if (src.file.getBool("ForceEnrollment") && dst.isEmpty()) { | |
| 258 | + if (!src.file.getBool("enrollAll") && dst.isEmpty()) { | |
| 262 | 259 | if (detectOnly) dst += src; |
| 263 | 260 | else dst += cv::Mat(); |
| 264 | 261 | } |
| ... | ... | @@ -273,7 +270,6 @@ BR_REGISTER(Transform, PP5Enroll) |
| 273 | 270 | * \author Josh Klontz \cite jklontz |
| 274 | 271 | * \author E. Taborsky \cite mmtaborsky |
| 275 | 272 | */ |
| 276 | - | |
| 277 | 273 | class PP5Compare : public Distance |
| 278 | 274 | , public PP5Context |
| 279 | 275 | { |
| ... | ... | @@ -283,7 +279,7 @@ class PP5Compare : public Distance |
| 283 | 279 | { |
| 284 | 280 | (void) target; |
| 285 | 281 | (void) query; |
| 286 | - qFatal("PP5Compare: _compare should never be called"); | |
| 282 | + qFatal("PP5Compare::compare (single templates) should never be called!"); | |
| 287 | 283 | return 0; |
| 288 | 284 | } |
| 289 | 285 | ... | ... |