Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents 8e8b4370 78de8565
Showing 2 changed files with 25 additions and 15 deletions
openbr/plugins/gallery.cpp
openbr/plugins/pp5.cpp
@@ -856,8 +856,18 @@ class FDDBGallery : public Gallery
             for (int i=0; i<numDetects; i++) {
                 const QStringList detect = lines.takeFirst().split(' ');
                 Template t(fileName);
-                t.file.set("Face", QRectF(detect[0].toFloat(), detect[1].toFloat(), detect[2].toFloat(), detect[3].toFloat()));
-                t.file.set("Confidence", detect[4].toFloat());
+                if (detect.size() == 5) { //rectangle
+                    t.file.set("Face", QRectF(detect[0].toFloat(), detect[1].toFloat(), detect[2].toFloat(), detect[3].toFloat()));
+                    t.file.set("Confidence", detect[4].toFloat());
+                } else if (detect.size() == 6) { //ellipse
+                    float x = detect[3].toFloat(),  
+                          y = detect[4].toFloat(),
+                          radius = detect[1].toFloat();
+                    t.file.set("Face", QRectF(x - radius,y - radius,radius * 2.0, radius * 2.0));
+                    t.file.set("Confidence", detect[5].toFloat());
+                } else {
+                    qFatal("Unknown FDDB annotation format.");
+                }
                 templates.append(t);
             }
         }
@@ -154,10 +154,10 @@ struct PP5Context
         ppr_face_attributes_type face_attributes;
         ppr_get_face_attributes(face, &face_attributes);
-        metadata.insert("Face", QRectF(face_attributes.position.x - face_attributes.dimensions.width/2,
-                                       face_attributes.position.y - face_attributes.dimensions.height/2,
-                                       face_attributes.dimensions.width,
-                                       face_attributes.dimensions.height));
+        metadata.insert("FrontalFace", QRectF(face_attributes.position.x - face_attributes.dimensions.width/2,
+                                              face_attributes.position.y - face_attributes.dimensions.height/2,
+                                              face_attributes.dimensions.width,
+                                              face_attributes.dimensions.height));
         metadata.insert("PP5_Face_Confidence", face_attributes.confidence);
         metadata.insert("PP5_Face_Roll", face_attributes.rotation.roll);
         metadata.insert("PP5_Face_Pitch", face_attributes.rotation.pitch);
@@ -240,7 +240,8 @@ class PP5EnrollTransform : public UntrainableMetaTransform
         PP5Context *context = contexts.acquire();
-        foreach(const Template & src, srcList) {
+        foreach (const Template &src, srcList) {
+            bool foundFace = false;
             if (!src.isEmpty()) {
                 ppr_raw_image_type raw_image;
                 PP5Context::createRawImage(src, raw_image);
@@ -254,6 +255,7 @@ class PP5EnrollTransform : public UntrainableMetaTransform
                     int extractable;
                     TRY(ppr_is_template_extractable(context->context, face, &extractable))
                     if (!extractable && !detectOnly) continue;
+                    else foundFace = true;
                     cv::Mat m;
                     if (detectOnly) {
@@ -272,20 +274,18 @@ class PP5EnrollTransform : public UntrainableMetaTransform
                     // Found a face, nothing else to do (if we aren't trying to find multiple faces).
                     if (!Globals->enrollAll)
                         break;
-                    }
+                }
                 ppr_free_face_list(face_list);
                 ppr_free_image(image);
                 ppr_raw_image_free(raw_image);
             }
-        }
-        // No faces were detected, output something with FTE set.
-        if (dstList.empty()) {
-            dstList.append(srcList.first());
-            dstList.first().file.set("FTE",true);
-            if (!detectOnly)
-                dstList.first().m() = cv::Mat();
+            // No faces were detected when we were expecting one, output something with FTE set.
+            if (!foundFace && !Globals->enrollAll) {
+                dstList.append(Template(src.file, detectOnly ? src.m() : cv::Mat()));
+                dstList.last().file.set("FTE", true);
+            }
         }
         contexts.release(context);