Fixed FTO processing in a few cases

Scott Klum
1 parent 82113eb9
Showing 6 changed files with 51 additions and 40 deletions
openbr/core/bee.cpp
openbr/openbr_plugin.cpp
openbr/plugins/distance.cpp
openbr/plugins/format.cpp
openbr/plugins/pp5.cpp
openbr/plugins/regions.cpp
@@ -43,9 +43,15 @@ FileList BEE::readSigset(const File &amp;sigset, bool ignoreMetadata)
     QFile file(sigset.resolved());
     bool success;
     success = file.open(QIODevice::ReadOnly); if (!success) qFatal("Unable to open %s for reading.", qPrintable(sigset));
-    success = doc.setContent(&file);          if (!success) qFatal("Unable to parse %s.", qPrintable(sigset));
+    success = doc.setContent(&file);
+
     file.close();
  
+    if (!success) {
+        qWarning("Unable to parse %s.", qPrintable(sigset));
+        return fileList;
+    }
+
     QDomElement docElem = doc.documentElement();
     if (docElem.nodeName() != "biometric-signature-set")
         return fileList;
@@ -368,7 +368,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
  
-        // If file is a Format not a Gallery
+        // If file is a Format not a Gallery (e.g. XML Format vs. XML Gallery)
         if (newTemplates.isEmpty())
             newTemplates.append(file);
  
@@ -56,6 +56,8 @@ private:
  
     float compare(const Template &a, const Template &b) const
     {
+        if (a.file.getBool("FTO") || b.file.getBool("FTO")) return -std::numeric_limits<float>::max();
+
         if ((a.m().size != b.m().size) ||
             (a.m().type() != b.m().type()))
                 return -std::numeric_limits<float>::max();
@@ -659,8 +659,8 @@ class xmlFormat : public Format
         QDomDocument doc(fileName);
         QFile f(fileName);
  
-        if (!f.open(QIODevice::ReadOnly)) qWarning("Unable to open %s for reading.", qPrintable(file.flat()));
-        if (!doc.setContent(&f))          qWarning("Unable to parse %s.", qPrintable(file.flat()));
+        if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file.flat()));
+        if (!doc.setContent(&f)) qWarning("Unable to parse %s.", qPrintable(file.flat()));
         f.close();
  
         QDomElement docElem = doc.documentElement();
@@ -241,41 +241,43 @@ class PP5EnrollTransform : public UntrainableMetaTransform
         PP5Context *context = contexts.acquire();
  
         foreach(const Template & src, srcList) {
-            ppr_raw_image_type raw_image;
-            PP5Context::createRawImage(src, raw_image);
-            ppr_image_type image;
-            TRY(ppr_create_image(raw_image, &image))
-            ppr_face_list_type face_list;
-            TRY(ppr_detect_faces(context->context, image, &face_list))
-
-            for (int i=0; i<face_list.length; i++) {
-                ppr_face_type face = face_list.faces[i];
-                int extractable;
-                TRY(ppr_is_template_extractable(context->context, face, &extractable))
-                if (!extractable && !detectOnly) continue;
-
-                cv::Mat m;
-                if (detectOnly) {
-                    m = src;
-                } else {
-                    TRY(ppr_extract_face_template(context->context, image, &face))
-                    context->createMat(face, m);
-                }
-                Template dst;
-                dst.file = src.file;
-
-                dst.file.append(PP5Context::toMetadata(face));
-                dst += m;
-                dstList.append(dst);
-
-                // Found a face, nothing else to do (if we aren't trying to find multiple faces).
-                if (!Globals->enrollAll)
-                    break;
+            if (!src.isEmpty()) {
+                ppr_raw_image_type raw_image;
+                PP5Context::createRawImage(src, raw_image);
+                ppr_image_type image;
+                TRY(ppr_create_image(raw_image, &image))
+                ppr_face_list_type face_list;
+                TRY(ppr_detect_faces(context->context, image, &face_list))
+
+                for (int i=0; i<face_list.length; i++) {
+                    ppr_face_type face = face_list.faces[i];
+                    int extractable;
+                    TRY(ppr_is_template_extractable(context->context, face, &extractable))
+                    if (!extractable && !detectOnly) continue;
+
+                    cv::Mat m;
+                    if (detectOnly) {
+                        m = src;
+                    } else {
+                        TRY(ppr_extract_face_template(context->context, image, &face))
+                        context->createMat(face, m);
+                    }
+                    Template dst;
+                    dst.file = src.file;
+
+                    dst.file.append(PP5Context::toMetadata(face));
+                    dst += m;
+                    dstList.append(dst);
+
+                    // 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);
             }
-
-            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.
@@ -95,8 +95,9 @@ class CatTransform : public UntrainableMetaTransform
         for (int i=0; i<src.size(); i++)
             sizes[i%partitions] += src[i].total();
  
-        foreach (int size, sizes)
-            dst.append(Mat(1, size, src.m().type()));
+        if (!src.empty())
+            foreach (int size, sizes)
+                dst.append(Mat(1, size, src.m().type()));
  
         QVector<int> offsets(partitions, 0);
         for (int i=0; i<src.size(); i++) {