Updated compareBlock to deal with empty templates

Scott Klum
1 parent 97156d76
Showing 3 changed files with 2 additions and 5 deletions
openbr/openbr_plugin.cpp
openbr/plugins/distance.cpp
openbr/plugins/quality.cpp
@@ -1269,5 +1269,6 @@ void Distance::compareBlock(const TemplateList &amp;target, const TemplateList &amp;quer
 {
     for (int i=0; i<query.size(); i++)
         for (int j=0; j<target.size(); j++)
-            output->setRelative(compare(target[j], query[i]), i+queryOffset, j+targetOffset);
+            if (target[j].isEmpty() || query[i].isEmpty()) output->setRelative(-std::numeric_limits<float>::max(),i+queryOffset, j+targetOffset);
+            else output->setRelative(compare(target[j], query[i]), i+queryOffset, j+targetOffset);
 }
@@ -56,8 +56,6 @@ 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();
@@ -272,8 +272,6 @@ class HeatMapDistance : public Distance
         return 0;
     }
  
-    // Switch this to template list version, use compare(template, template) in
-    // heat map distance, and index into the proper match probability
     void compare(const TemplateList &target, const TemplateList &query, Output *output) const
     {
         for (int i=0; i<step; i++) {