Commit 363e2052b9218fac5c74bc15dc45b37f4f2f34b2
1 parent
6cbb4612
fixed pp5 compilation errors resulting from #24
Showing
1 changed file
with
4 additions
and
4 deletions
sdk/plugins/pp5.cpp
| @@ -148,9 +148,9 @@ struct PP5Context | @@ -148,9 +148,9 @@ struct PP5Context | ||
| 148 | return "Unknown"; | 148 | return "Unknown"; |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | - static QHash<QString,QVariant> toMetadata(const ppr_face_type &face) | 151 | + static QMap<QString,QVariant> toMetadata(const ppr_face_type &face) |
| 152 | { | 152 | { |
| 153 | - QHash<QString,QVariant> metadata; | 153 | + QMap<QString,QVariant> metadata; |
| 154 | 154 | ||
| 155 | ppr_face_attributes_type face_attributes; | 155 | ppr_face_attributes_type face_attributes; |
| 156 | ppr_get_face_attributes(face, &face_attributes); | 156 | ppr_get_face_attributes(face, &face_attributes); |
| @@ -250,7 +250,7 @@ class PP5Enroll : public UntrainableTransform | @@ -250,7 +250,7 @@ class PP5Enroll : public UntrainableTransform | ||
| 250 | dst.file.append(PP5Context::toMetadata(face)); | 250 | dst.file.append(PP5Context::toMetadata(face)); |
| 251 | dst += m; | 251 | dst += m; |
| 252 | 252 | ||
| 253 | - if (!src.file.getBool("enrollAll")) break; | 253 | + if (!src.file.get<bool>("enrollAll", false)) break; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | ppr_free_face_list(face_list); | 256 | ppr_free_face_list(face_list); |
| @@ -259,7 +259,7 @@ class PP5Enroll : public UntrainableTransform | @@ -259,7 +259,7 @@ class PP5Enroll : public UntrainableTransform | ||
| 259 | 259 | ||
| 260 | contexts.release(context); | 260 | contexts.release(context); |
| 261 | 261 | ||
| 262 | - if (!src.file.getBool("enrollAll") && dst.isEmpty()) { | 262 | + if (!src.file.get<bool>("enrollAll", false) && dst.isEmpty()) { |
| 263 | if (detectOnly) dst += src; | 263 | if (detectOnly) dst += src; |
| 264 | else dst += cv::Mat(); | 264 | else dst += cv::Mat(); |
| 265 | } | 265 | } |