improved/fixed demographic filter thread safety

Josh Klontz
1 parent 28ac05ec
Showing 2 changed files with 5 additions and 5 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
@@ -1318,8 +1318,9 @@ float Distance::compare(const Template &amp;target, const Template &amp;query) const
     if (!Globals->demographicFilters.isEmpty()) // If statement is faster than iterating over an empty list of filters
         foreach (const QString &filter, Globals->demographicFilters.keys()) {
             const QString targetMetadata = target.file.getString(filter, "");
-            if (!targetMetadata.isEmpty() &&
-                (Globals->demographicFilters[filter].indexIn(targetMetadata) == -1))
+            if (targetMetadata.isEmpty()) continue;
+            const QRegExp re(Globals->demographicFilters[filter]);
+            if (re.indexIn(targetMetadata) == -1)
                 return -std::numeric_limits<float>::max();
         }
@@ -496,10 +496,9 @@ public:
     BR_PROPERTY(bool, enrollAll, false)
     /*!
-     * \brief Keys to use when matching templates to automatically determine non-match based on template metadata.
+     * \brief Regular expressions that automatically determine impostor matches based on target (gallery) template metadata.
      */
-
-    typedef QHash<QString,QRegExp> DemographicFilters;
+    typedef QHash<QString,QString> DemographicFilters;
     Q_PROPERTY(DemographicFilters demographicFilters READ get_demographicFilters WRITE set_demographicFilters RESET reset_demographicFilters)
     BR_PROPERTY(DemographicFilters, demographicFilters, DemographicFilters())