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

Charles Otto
2 parents c6a5dfec 217047b1
Showing 2 changed files with 6 additions and 1 deletions
openbr/openbr_plugin.h
openbr/plugins/meta.cpp
@@ -856,7 +856,7 @@ struct Factory
             else    qFatal("%s registry does not contain object named: %s", qPrintable(baseClassName()), qPrintable(name));
         }
         T *object = registry->value(name)->_make();
-        object->init(file);
+        static_cast<Object*>(object)->init(file);
         return object;
     }
     //! [Factory make]
@@ -274,6 +274,11 @@ class ContractTransform : public UntrainableMetaTransform
         foreach (const Template & t, src) {
             out.merge(t);
         }
+        out.file.clearRects();
+        foreach (const Template & t, src) {
+            if (!t.file.rects().empty())
+                out.file.appendRects(t.file.rects());
+        }
         dst.clear();
         dst.append(out);
     }