File::init improvement, FilterDistance bug fix

Scott Klum
1 parent 05721739
Showing 2 changed files with 5 additions and 3 deletions
sdk/openbr_plugin.cpp
sdk/plugins/validate.cpp
@@ -256,11 +256,13 @@ void File::init(const QString &amp;file)
                 if (words[1][0] == '(') {
                     QStringList values = words[1].split(',');
                     if (values.size() == 2) /* QPointF */ {
-                        QPointF point(values[0].remove('(').toFloat(), values[1].remove(')').toFloat());
+                        values[1].chop(1);
+                        QPointF point(values[0].mid(1).toFloat(), values[1].remove(')').toFloat());
                         set(words[0], point);
                        }
                     else /* QRectF */ {
-                        QRectF rect(values[0].remove('(').toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].remove(')').toFloat());
+                        values[3].chop(1);
+                        QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].remove(')').toFloat());
                         set(words[0], rect);
                     }
                 }
@@ -105,7 +105,7 @@ class FilterDistance : public Distance
         foreach (const QString &key, Globals->filters.keys()) {
             bool keep = false;
             const QString metadata = a.file.get<QString>(key, "");
-            if (metadata.isEmpty()) continue;
+            if (metadata.isEmpty() || Globals->filters[key].isEmpty()) continue;
             foreach (const QString &value, Globals->filters[key]) {
                 if (metadata == value) {
                     keep = true;