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

Keyur Patel
2 parents 09086d6d 2948a515
Showing 1 changed file with 12 additions and 6 deletions
openbr/core/core.cpp
@@ -74,17 +74,20 @@ struct AlgorithmCore
                 if (data[i].file.get<bool>("allPartitions",false))
                     data.removeAt(i);
-        if (transform.isNull()) qFatal("Null transform.");
         qDebug("%d Training Files", data.size());
         Globals->startTime.start();
-        qDebug("Training Enrollment");
-        trainingWrapper->train(data);
+        if (!transform.isNull()) {
+            qDebug("Training Enrollment");
+            trainingWrapper->train(data);
+        }
         if (!distance.isNull() && distance->trainable()) {
-            qDebug("Projecting Enrollment");
-            trainingWrapper->projectUpdate(data,data);
+            if (!transform.isNull()) {
+                qDebug("Projecting Enrollment");
+                trainingWrapper->projectUpdate(data,data);
+            }
             TemplateList distanceData;
             for (int i=0; i<data.size(); i++)
@@ -109,6 +112,9 @@ struct AlgorithmCore
     void simplifyTransform()
     {
+        if (transform.isNull())
+            return;
+
         bool newTForm = false;
         Transform *temp = transform->simplify(newTForm);
         if (newTForm)
@@ -592,7 +598,7 @@ private:
         if ((words.size() < 1) || (words.size() > 2)) qFatal("Invalid algorithm format.");
-        transform = QSharedPointer<Transform>(Transform::make(words[0], NULL));
+        transform = QSharedPointer<Transform>(words[0].isEmpty() ? NULL : Transform::make(words[0], NULL));
         simplifyTransform();
         if (words.size() > 1) {