Peter M. Groen / openbr

Commit 37f9dc82b497d4c2df4b8e6bcdd217ae8d4c0006

Authored by Josh Klontz
1 parent b3a20242

fixed #35 and minor cleanup

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
openbr/plugins/pp5.cpp
  View file @37f9dc8
... ... @@ -154,10 +154,10 @@ struct PP5Context
154 154  
155 155 ppr_face_attributes_type face_attributes;
156 156 ppr_get_face_attributes(face, &face_attributes);
157   - metadata.insert("PP5_Face_X", face_attributes.position.x - face_attributes.dimensions.width/2);
158   - metadata.insert("PP5_Face_Y", face_attributes.position.y - face_attributes.dimensions.height/2);
159   - metadata.insert("PP5_Face_Width", face_attributes.dimensions.width);
160   - metadata.insert("PP5_Face_Height", face_attributes.dimensions.height);
  157 + metadata.insert("Face", QRect(face_attributes.position.x - face_attributes.dimensions.width/2,
  158 + face_attributes.position.y - face_attributes.dimensions.height/2,
  159 + face_attributes.dimensions.width,
  160 + face_attributes.dimensions.height));
161 161 metadata.insert("PP5_Face_Confidence", face_attributes.confidence);
162 162 metadata.insert("PP5_Face_Roll", face_attributes.rotation.roll);
163 163 metadata.insert("PP5_Face_Pitch", face_attributes.rotation.pitch);
... ... @@ -213,7 +213,7 @@ struct PP5Context
213 213 * \author Josh Klontz \cite jklontz
214 214 * \author E. Taborsky \cite mmtaborsky
215 215 */
216   -class PP5Enroll : public UntrainableTransform
  216 +class PP5EnrollTransform : public UntrainableTransform
217 217 {
218 218 Q_OBJECT
219 219 Q_PROPERTY(bool detectOnly READ get_detectOnly WRITE set_detectOnly RESET reset_detectOnly STORED false)
... ... @@ -248,7 +248,7 @@ class PP5Enroll : public UntrainableTransform
248 248 dst.file.append(PP5Context::toMetadata(face));
249 249 dst += m;
250 250  
251   - if (!src.file.get<bool>("enrollAll", false)) break;
  251 + if (!src.file.getBool("enrollAll")) break;
252 252 }
253 253  
254 254 ppr_free_face_list(face_list);
... ... @@ -257,14 +257,14 @@ class PP5Enroll : public UntrainableTransform
257 257  
258 258 contexts.release(context);
259 259  
260   - if (!src.file.get<bool>("enrollAll", false) && dst.isEmpty()) {
  260 + if (!src.file.getBool("enrollAll") && dst.isEmpty()) {
261 261 if (detectOnly) dst += src;
262 262 else dst += cv::Mat();
263 263 }
264 264 }
265 265 };
266 266  
267   -BR_REGISTER(Transform, PP5Enroll)
  267 +BR_REGISTER(Transform, PP5EnrollTransform)
268 268  
269 269 /*!
270 270 * \ingroup distances
... ... @@ -272,8 +272,8 @@ BR_REGISTER(Transform, PP5Enroll)
272 272 * \author Josh Klontz \cite jklontz
273 273 * \author E. Taborsky \cite mmtaborsky
274 274 */
275   -class PP5Compare : public Distance
276   - , public PP5Context
  275 +class PP5CompareDistance : public Distance
  276 + , public PP5Context
277 277 {
278 278 Q_OBJECT
279 279  
... ... @@ -332,6 +332,6 @@ class PP5Compare : public Distance
332 332 }
333 333 };
334 334  
335   -BR_REGISTER(Distance, PP5Compare)
  335 +BR_REGISTER(Distance, PP5CompareDistance)
336 336  
337 337 #include "plugins/pp5.moc"
... ...