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

Scott Klum
2 parents 9e9e9d5d 635d2dc2
Showing 57 changed files with 562 additions and 244 deletions
openbr/core/qtutils.cpp
openbr/frvt2012.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/algorithms.cpp
openbr/plugins/cascade.cpp
openbr/plugins/cluster.cpp
openbr/plugins/crop.cpp
openbr/plugins/ct8.cpp
openbr/plugins/cvt.cpp
openbr/plugins/denoising.cpp
openbr/plugins/distance.cpp
openbr/plugins/draw.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/eyes.cpp
openbr/plugins/fill.cpp
openbr/plugins/filter.cpp
openbr/plugins/format.cpp
openbr/plugins/gallery.cpp
openbr/plugins/gui.cpp
@@ -290,10 +290,10 @@ QPointF QtUtils::toPoint(const QString &amp;string)
     QStringList values = string.split(',');
     if (values.size() == 2) {
         values[1].chop(1);
-        QPointF point(values[0].mid(1).toFloat(), values[1].toFloat());
-        return point;
+        return QPointF(values[0].mid(1).toFloat(), values[1].toFloat());
     }
-    else qFatal("Failed to convert %s to QPoint format.", qPrintable(string));
+    else qFatal("Failed to convert %s to QPointF format.", qPrintable(string));
+    return QPointF();
 }
 QRectF QtUtils::toRect(const QString &string)
@@ -301,10 +301,10 @@ QRectF QtUtils::toRect(const QString &amp;string)
     QStringList values = string.split(',');
     if (values.size() == 4) {
         values[3].chop(1);
-        QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].toFloat());
-        return rect;
+        return QRectF(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].toFloat());
     }
-    else qFatal("Failed to convert %s to QRect format.", qPrintable(string));
+    else qFatal("Failed to convert %s to QRectF format.", qPrintable(string));
+    return QRectF();
 }
 bool QtUtils::runRScript(const QString &file)
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <openbr/openbr_plugin.h>
+#include <openbr/plugins/openbr_internal.h>
 #include "frvt2012.h"
 #include "core/distance_sse.h"
@@ -25,6 +25,7 @@
 #include <algorithm>
 #include <iostream>
 #include <openbr/openbr_plugin.h>
+#include <openbr/plugins/openbr_internal.h>
 #ifndef BR_EMBEDDED
 #include <QApplication>
@@ -1085,6 +1085,14 @@ public:
         return dst;
     }
+    /*!
+     * \brief Perform the minimum amount of work necessary to make a
+     * transform that can be used safely from a different thread than this
+     * transform. For transforms that aren't time-varying, nothing needs to be
+     * done, returning this is sufficient.
+     */
+    virtual Transform * smartCopy() { return this;}
+
 protected:
     Transform(bool independent = true, bool trainable = true); /*!< \brief Construct a transform. */
     inline Transform *make(const QString &description) { return make(description, this); } /*!< \brief Make a subtransform. */
@@ -1125,133 +1133,6 @@ inline QDataStream &amp;operator&gt;&gt;(QDataStream &amp;stream, Transform &amp;f)
     f.load(stream);
     return stream;
 }
-
-/*!
- * \brief A br::Transform for which the results of project may change due to prior calls to project
- */
-class BR_EXPORT TimeVaryingTransform : public Transform
-{
-    Q_OBJECT
-
-public:
-    virtual bool timeVarying() const { return true; }
-
-    virtual void project(const Template &src, Template &dst) const
-    {
-        qFatal("No const project defined for time-varying transform");
-        (void) dst; (void) src;
-    }
-
-    virtual void project(const TemplateList &src, TemplateList &dst) const
-    {
-        qFatal("No const project defined for time-varying transform");
-        (void) dst; (void) src;
-    }
-
-    // Get a compile failure if this isn't here to go along with the other
-    // projectUpdate, no idea why
-    virtual void projectUpdate(const Template & src, Template & dst)
-    {
-        (void) src; (void) dst;
-        qFatal("do something useful");
-    }
-
-    virtual void projectUpdate(const TemplateList &src, TemplateList &dst)
-    {
-        foreach (const Template & src_part, src) {
-            Template out;
-            projectUpdate(src_part, out);
-            dst.append(out);
-        }
-    }
-
-protected:
-    TimeVaryingTransform(bool independent = true, bool trainable = true) : Transform(independent, trainable) {}
-};
-
-/*!
- * \brief A br::Transform expecting multiple matrices per template.
- */
-class BR_EXPORT MetaTransform : public Transform
-{
-    Q_OBJECT
-
-protected:
-    MetaTransform() : Transform(false) {}
-};
-
-/*!
- * \brief A br::Transform that does not require training data.
- */
-class BR_EXPORT UntrainableTransform : public Transform
-{
-    Q_OBJECT
-
-protected:
-    UntrainableTransform(bool independent = true) : Transform(independent, false) {} /*!< \brief Construct an untrainable transform. */
-
-private:
-    Transform *clone() const { return const_cast<UntrainableTransform*>(this); }
-    void train(const TemplateList &data) { (void) data; }
-    void store(QDataStream &stream) const { (void) stream; }
-    void load(QDataStream &stream) { (void) stream; }
-};
-
-/*!
- * \brief A br::MetaTransform that does not require training data.
- */
-class BR_EXPORT UntrainableMetaTransform : public UntrainableTransform
-{
-    Q_OBJECT
-
-protected:
-    UntrainableMetaTransform() : UntrainableTransform(false) {}
-};
-
-/*!
- * \brief A MetaTransform that aggregates some sub-transforms
- */
-class BR_EXPORT CompositeTransform : public TimeVaryingTransform
-{
-    Q_OBJECT
-
-public:
-    Q_PROPERTY(QList<br::Transform*> transforms READ get_transforms WRITE set_transforms RESET reset_transforms)
-    BR_PROPERTY(QList<br::Transform*>, transforms, QList<br::Transform*>())
-
-    virtual void project(const Template &src, Template &dst) const
-    {
-        if (timeVarying()) qFatal("No const project defined for time-varying transform");
-        _project(src, dst);
-    }
-
-    virtual void project(const TemplateList &src, TemplateList &dst) const
-    {
-        if (timeVarying()) qFatal("No const project defined for time-varying transform");
-        _project(src, dst);
-    }
-
-    bool timeVarying() const { return isTimeVarying; }
-
-    void init()
-    {
-        isTimeVarying = false;
-        trainable = false;
-        foreach (const br::Transform *transform, transforms) {
-            isTimeVarying = isTimeVarying || transform->timeVarying();
-            trainable = trainable || transform->trainable;
-        }
-    }
-
-protected:
-    bool isTimeVarying;
-
-    virtual void _project(const Template & src, Template & dst) const = 0;
-    virtual void _project(const TemplateList & src, TemplateList & dst) const = 0;
-
-    CompositeTransform() : TimeVaryingTransform(false) {}
-};
-
 /*! @}*/
 /*!
@@ -14,7 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 namespace br
 {
@@ -42,7 +42,8 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("OpenBR", "FaceRecognition");
         Globals->abbreviations.insert("GenderEstimation", "GenderClassification");
         Globals->abbreviations.insert("AgeEstimation", "AgeRegression");
-        Globals->abbreviations.insert("FaceRecognitionHoG", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+Gradient+Bin(0,360,9,true)+Merge+Integral+RecursiveIntegralSampler(4,2,8,Center(Hellinger)+LDA(.95)+Normalize(L1)+Div(3)+ProductQuantization(3,L1,true)[fraction=0.2]):RecursiveProductQuantization");
+        Globals->abbreviations.insert("FaceRecognition2", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+(Gradient+Bin(0,360,9,true))/(Blur(1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2,true)+Bin(0,10,10,true))+Merge+Integral+RecursiveIntegralSampler(4,2,8,Center(Hellinger)+LDA(.95)+Normalize(L1)+Div(3)+ProductQuantization(3,L1,true)[fraction=0.2]):RecursiveProductQuantization");
+        Globals->abbreviations.insert("FaceRecognitionHoG", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+Gradient+Bin(0,360,9)+KernelHash(9,81)+Bin(0,81,81,true)+Merge+Integral+RecursiveIntegralSampler(4,2,8,LDA(.95)+Normalize(L1)+Div(3)+ProductQuantization(3,L1,true)[fraction=0.2]):RecursiveProductQuantization");
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -50,7 +51,6 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("SmallSIFT", "Open+LimitSize(512)+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
         Globals->abbreviations.insert("SmallSURF", "Open+LimitSize(512)+KeyPointDetector(SURF)+KeyPointDescriptor(SURF):KeyPointMatcher(BruteForce)");
         Globals->abbreviations.insert("ColorHist", "Open+LimitSize(512)!EnsureChannels(3)+SplitChannels+Hist(256,0,8)+Cat+Normalize(L1):L2");
-        Globals->abbreviations.insert("ImageRetrieval", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(88,88,0.25,0.35)+Gradient+Bin(0,360,8,true)+Merge+Integral+IntegralSampler+WordWise(RowWisePCA(8)+RowWiseMeanCenter+Binarize,RowWisePCA)+Sentence:SentenceSimilarity");
         // Hash
         Globals->abbreviations.insert("FileName", "Name+Identity:Identical");
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/objdetect/objdetect.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 #include "openbr/core/resource.h"
@@ -14,7 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include <opencv2/flann/flann.hpp>
 #include "openbr/core/opencvutils.h"
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
@@ -11,7 +11,7 @@
 #include <exception>
 #include <string>
 #include <vector>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "core/resource.h"
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/photo/photo.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -17,7 +17,7 @@
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/distance_sse.h"
 #include "openbr/core/qtutils.h"
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <Eigen/Dense>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/eigenutils.h"
@@ -34,8 +34,7 @@
 */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/photo/photo.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/tanh_sse.h"
 using namespace cv;
@@ -19,7 +19,7 @@
 #include <QtXml>
 #endif // BR_EMBEDDED
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/bee.h"
 #include "openbr/core/opencvutils.h"
@@ -245,6 +245,31 @@ BR_REGISTER(Format, DefaultFormat)
 /*!
  * \ingroup formats
+ * \brief Reads a NIST LFFS file.
+ * \author Josh Klontz \cite jklontz
+ */
+class lffsFormat : public Format
+{
+    Q_OBJECT
+
+    Template read() const
+    {
+        QByteArray byteArray;
+        QtUtils::readFile(file.name, byteArray);
+        return Mat(1, byteArray.size(), CV_8UC1, byteArray.data()).clone();
+    }
+
+    void write(const Template &t) const
+    {
+        QByteArray byteArray((const char*)t.m().data, t.m().total()*t.m().elemSize());
+        QtUtils::writeFile(file.name, byteArray);
+    }
+};
+
+BR_REGISTER(Format, lffsFormat)
+
+/*!
+ * \ingroup formats
  * \brief Reads a NIST BEE similarity matrix.
  * \author Josh Klontz \cite jklontz
  */
@@ -24,7 +24,7 @@
 #include <QSqlRecord>
 #endif // BR_EMBEDDED
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "NaturalStringCompare.h"
 #include "openbr/core/bee.h"
 #include <QApplication>
 #include <QLabel>
 #include <QElapsedTimer>
+#include <QWaitCondition>
+#include <QMutex>
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -47,20 +49,39 @@ QImage toQImage(const Mat &amp;mat)
     return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
 }
+
 // Provides slots for manipulating a QLabel, but does not inherit from QWidget.
 // Therefore, it can be moved to the main thread if not created there initially
 // since god forbid you create a QWidget subclass in not the main thread.
 class GUIProxy : public QObject
 {
     Q_OBJECT
+    QMutex lock;
+    QWaitCondition wait;
+
 public:
-    QLabel * window;
+    bool eventFilter(QObject * obj, QEvent * event)
+    {
+        if (event->type() == QEvent::KeyPress)
+        {
+            wait.wakeAll();
+        }
+        return QObject::eventFilter(obj, event);
+    }
+
+    QLabel * window;
     GUIProxy()
     {
         window = NULL;
     }
+    void waitForKey()
+    {
+        QMutexLocker locker(&lock);
+        wait.wait(&lock);
+    }
+
 public slots:
     void showImage(const QPixmap & input)
@@ -75,6 +96,13 @@ public slots:
         delete window;
         window = new QLabel();
         window->setVisible(true);
+
+        QApplication::instance()->installEventFilter(this);
+        Qt::WindowFlags flags = window->windowFlags();
+
+        flags = flags & ~Qt::WindowCloseButtonHint;
+        window->setWindowFlags(flags);
+        window->show();
     }
 };
@@ -89,9 +117,13 @@ class Show2Transform : public TimeVaryingTransform
 {
     Q_OBJECT
 public:
+    Q_PROPERTY(bool waitInput READ get_waitInput WRITE set_waitInput RESET reset_waitInput STORED false)
+    BR_PROPERTY(bool, waitInput, false)
+
     Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false)
     BR_PROPERTY(QStringList, keys, QStringList("FrameNumber"))
+
     Show2Transform() : TimeVaryingTransform(false, false)
     {
         // Create our GUI proxy
@@ -146,6 +178,11 @@ public:
                 // by the main thread isn't damaged when we update displayBuffer
                 // later.
                 emit updateImage(displayBuffer.copy(displayBuffer.rect()));
+
+                // Blocking wait for a key-press
+                if (this->waitInput)
+                    gui->waitForKey();
+
             }
         }
     }
@@ -15,10 +15,11 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <QCryptographicHash>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/qtutils.h"
+using namespace cv;
+
 namespace br
 {
@@ -55,6 +56,40 @@ private:
 BR_REGISTER(Transform, CryptographicHashTransform)
+/*!
+ * \ingroup transforms
+ * \brief Kernel hash
+ * \author Josh Klontz \cite jklontz
+ */
+class KernelHashTransform : public UntrainableTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(uchar dimsIn READ get_dimsIn WRITE set_dimsIn RESET reset_dimsIn STORED false)
+    Q_PROPERTY(uchar dimsOut READ get_dimsOut WRITE set_dimsOut RESET reset_dimsOut STORED false)
+    BR_PROPERTY(uchar, dimsIn, 8)
+    BR_PROPERTY(uchar, dimsOut, 7)
+
+    void project(const Template &src, Template &dst) const
+    {
+        if (src.m().type() != CV_8UC1)
+            qFatal("Expected 8UC1 input.");
+
+        dst = Mat::zeros(src.m().rows, src.m().cols, CV_8UC1);
+        const uchar *srcData = src.m().data;
+        uchar *dstData = dst.m().data;
+        const int step = src.m().cols;
+        for (int i=0; i<src.m().rows; i++)
+            for (int j=0; j<src.m().cols-1; j++) {
+                dstData[i*step+j] = (uint(pow(float(dimsIn),1.f))*srcData[i    *step+j]
+                                   /*+ uint(pow(float(dimsIn),2.f))*srcData[(i+1)*step+j]*/
+                                   + uint(pow(float(dimsIn),0.f))*srcData[i    *step+(j+1)]
+                                   /*+ uint(pow(float(dimsIn),0.f))*srcData[(i+1)*step+(j+1)]*/) % dimsOut;
+            }
+    }
+};
+
+BR_REGISTER(Transform, KernelHashTransform)
+
 } // namespace br
 #include "hash.moc"
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
 #include <opencv2/imgproc/imgproc.hpp>
 #include <Eigen/Core>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
@@ -285,7 +285,6 @@ private:
     void project(const Template &src, Template &dst) const
     {
-        if (src.m().type() != CV_8UC1) qFatal("Requires CV_8UC1 input.");
         Mat dx, dy, magnitude, angle;
         Sobel(src, dx, CV_32F, 1, 0);
         Sobel(src, dy, CV_32F, 0, 1);
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include <pxcaccelerator.h>
 #include <pxcface.h>
 #include <pxcimage.h>
@@ -16,8 +16,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/nonfree/nonfree.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
@@ -109,7 +108,7 @@ BR_REGISTER(Transform, KeyPointDescriptorTransform)
  * \brief Wraps OpenCV Key Point Matcher
  * \author Josh Klontz \cite jklontz
  */
-class KeyPointMatcherTransform : public Distance
+class KeyPointMatcherDistance : public Distance
 {
     Q_OBJECT
     Q_PROPERTY(QString matcher READ get_matcher WRITE set_matcher RESET reset_matcher STORED false)
@@ -148,7 +147,7 @@ class KeyPointMatcherTransform : public Distance
     }
 };
-BR_REGISTER(Distance, KeyPointMatcherTransform)
+BR_REGISTER(Distance, KeyPointMatcherDistance)
 /*!
  * \ingroup transforms
@@ -16,7 +16,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <limits>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -16,11 +16,11 @@
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
 #include "openbr/core/qtutils.h"
+#include "openbr/core/resource.h"
 using namespace cv;
@@ -183,7 +183,6 @@ class PipeTransform : public CompositeTransform
         }
     }
-
 protected:
     // Template list project -- process templates in parallel through Transform::project
     // or if parallelism is disabled, handle them sequentially
@@ -590,6 +589,56 @@ static void _projectList(const Transform *transform, const TemplateList *src, Te
 }
+class TransformCopier : public ResourceMaker<Transform>
+{
+public:
+    Transform * basis;
+    TransformCopier(Transform * _basis)
+    {
+        basis = _basis;
+    }
+
+    virtual Transform *make() const
+    {
+        return basis->smartCopy();
+    }
+
+};
+
+class TimeInvariantWrapperTransform : public MetaTransform
+{
+public:
+    Resource<Transform> transformSource;
+
+    TimeInvariantWrapperTransform(Transform * basis) : transformSource(new TransformCopier(basis))
+    {
+        baseTransform = basis;
+    }
+
+    virtual void project(const Template &src, Template &dst) const
+    {
+        Transform * aTransform = transformSource.acquire();
+        aTransform->projectUpdate(src,dst);
+        transformSource.release(aTransform);
+    }
+
+
+    void project(const TemplateList &src, TemplateList &dst) const
+    {
+        Transform * aTransform = transformSource.acquire();
+        aTransform->projectUpdate(src,dst);
+        transformSource.release(aTransform);
+    }
+
+    void train(const TemplateList &data)
+    {
+        baseTransform->train(data);
+    }
+
+private:
+    Transform * baseTransform;
+};
+
 class DistributeTemplateTransform : public MetaTransform
 {
     Q_OBJECT
@@ -598,6 +647,16 @@ class DistributeTemplateTransform : public MetaTransform
 public:
+    Transform * smartCopy()
+    {
+        if (!transform->timeVarying())
+            return this;
+
+        DistributeTemplateTransform * output = new DistributeTemplateTransform;
+        output->transform = transform->smartCopy();
+        return output;
+    }
+
     void train(const TemplateList &data)
     {
         transform->train(data);
@@ -620,15 +679,6 @@ public:
     // Process the single elemnt templates in parallel if parallelism is enabled.
     void project(const TemplateList &src, TemplateList &dst) const
     {
-        // Little ugly, but if we own a timeVaryingTransform and this gets called
-        // cast off the const modifier and use projectUpdate. This allows us to
-        // act as a single point of entry.
-        if (transform->timeVarying())
-        {
-            DistributeTemplateTransform * non_const = (DistributeTemplateTransform *) this;
-            non_const->projectUpdate(src,dst);
-            return;
-        }
         // Pre-allocate output for each template
         QList<TemplateList> output_buffer;
         output_buffer.reserve(src.size());
@@ -655,15 +705,16 @@ public:
     void projectUpdate(const TemplateList &src, TemplateList &dst)
     {
-        if (!transform->timeVarying()) {
-            this->project(src, dst);
-            return;
-        }
-        this->transform->projectUpdate(src, dst);
+        this->project(src, dst);
+        return;
     }
+    void init()
+    {
-    private:
+        if (transform && transform->timeVarying())
+            transform = new br::TimeInvariantWrapperTransform(transform);
+    }
 };
 BR_REGISTER(Transform, DistributeTemplateTransform)
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include <mongoose.h>
 namespace br
@@ -4,7 +4,7 @@
 #include <NeoFacePro.h>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "core/resource.h"
 using namespace br;
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include <LatentEFS.h>
-// necessary to allocate a large memory though the actual template size
-// may be much smaller
+// Necessary to allocate a large memory though the actual template size may be much smaller
 #define MAX_TEMPLATE_SIZE 400000
 namespace br
@@ -21,6 +20,7 @@ class NECLatent1Initialier : public Initializer
     {
         Globals->abbreviations.insert("NECTenprint1", "Open+Cvt(Gray)+NECLatent1Enroll:NECLatent1Compare");
         Globals->abbreviations.insert("NECLatent1", "Open+Cvt(Gray)+NECLatent1Enroll(true):NECLatent1Compare");
+        Globals->abbreviations.insert("NECLatentLFFS1", "Open+NECLatent1Enroll(true,ELFT_M):NECLatent1Compare(ELFT_M)");
     }
 };
@@ -41,7 +41,8 @@ class NECLatent1EnrollTransform : public UntrainableTransform
 public:
     enum Algorithm { LFML,
-                     ELFT };
+                     ELFT,
+                     ELFT_M };
 private:
     BR_PROPERTY(bool, latent, false)
@@ -50,27 +51,35 @@ private:
     void project(const Template &src, Template &dst) const
     {
         if (src.m().type() != CV_8UC1) qFatal("Requires 8UC1 data!");
-        unsigned char data[MAX_TEMPLATE_SIZE];
+        uchar *data = src.m().data;
+        const int rows = src.m().rows;
+        const int columns = src.m().cols;
+        uchar buff[MAX_TEMPLATE_SIZE];
+        uchar* pBuff = NULL;
         int size = 0;
         int error;
         if (latent) {
-            if (algorithm == LFML) error = NEC_LFML_ExtractLatent(src.m().data, src.m().rows, src.m().cols, 500, data, &size);
-            else                   error = NEC_ELFT_ExtractLatent(src.m().data, src.m().rows, src.m().cols, 500, 4, data, &size);
+            if      (algorithm == LFML) error = NEC_LFML_ExtractLatent(data, rows, columns, 500, buff, &size);
+            else if (algorithm == ELFT) error = NEC_ELFT_ExtractLatent(data, rows, columns, 500, 4, buff, &size);
+            else                        error = NEC_ELFT_M_ExtractLatent(data, columns, 1, &pBuff, &size);
         } else {
-            if (algorithm == LFML) error = NEC_LFML_ExtractTenprint(src.m().data, src.m().rows, src.m().cols, 500, data, &size);
-            else                   error = NEC_ELFT_ExtractTenprint(src.m().data, src.m().rows, src.m().cols, 500, 2, data, &size);
+            if      (algorithm == LFML) error = NEC_LFML_ExtractTenprint(data, rows, columns, 500, buff, &size);
+            else if (algorithm == ELFT) error = NEC_ELFT_ExtractTenprint(data, rows, columns, 500, 2, buff, &size);
+            else                        qFatal("ELFT_M Tenprint not implemented.");
         }
         if (!error) {
             cv::Mat n(1, size, CV_8UC1);
-            memcpy(n.data, data, size);
+            memcpy(n.data, buff, size);
             dst.m() = n;
         } else {
             qWarning("NECLatent1EnrollTransform error %d for file %s.", error, qPrintable(src.file.flat()));
             dst.m() = cv::Mat();
             dst.file.set("FTE", true);
         }
+
+        if (pBuff != NULL) NEC_ELFT_M_FreeTemplate(&pBuff);
     }
 };
@@ -89,17 +98,21 @@ class NECLatent1CompareDistance : public Distance
 public:
     enum Algorithm { LFML,
-                     ELFT };
+                     ELFT,
+                     ELFT_M };
 private:
     BR_PROPERTY(Algorithm, algorithm, LFML)
     float compare(const Template &a, const Template &b) const
     {
+        uchar *aData = a.m().data;
+        uchar *bData = b.m().data;
         if (!a.m().data || !b.m().data) return -std::numeric_limits<float>::max();
         int score;
-        if (algorithm == LFML) NEC_LFML_Verify(b.m().data, b.m().total(), a.m().data, a.m().total(), &score);
-        else                   NEC_ELFT_Verify(b.m().data, a.m().data, &score, 2);
+        if      (algorithm == LFML) NEC_LFML_Verify(bData, b.m().total(), aData, a.m().total(), &score);
+        else if (algorithm == ELFT) NEC_ELFT_Verify(bData, aData, &score, 1);
+        else                        NEC_ELFT_M_Verify(bData, aData, &score, 1);
         return score;
     }
 };
@@ -19,7 +19,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <Eigen/Core>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -58,6 +58,9 @@ class NormalizeTransform : public UntrainableTransform
     Q_ENUMS(NormType)
     Q_PROPERTY(NormType normType READ get_normType WRITE set_normType RESET reset_normType STORED false)
+    Q_PROPERTY(bool ByRow READ get_ByRow WRITE set_ByRow RESET reset_ByRow STORED false)
+    BR_PROPERTY(bool, ByRow, false)
+
 public:
     /*!< */
     enum NormType { Inf = NORM_INF,
@@ -69,7 +72,16 @@ private:
     void project(const Template &src, Template &dst) const
     {
-        normalize(src, dst, 1, 0, normType, CV_32F);
+        if (!ByRow) normalize(src, dst, 1, 0, normType, CV_32F);
+        else {
+            dst = src;
+            for (int i=0; i<dst.m().rows; i++) {
+                Mat temp;
+                cv::normalize(dst.m().row(i), temp, 1, 0, normType);
+                temp.copyTo(dst.m().row(i));
+            }
+        }
+
     }
 };
@@ -10,7 +10,7 @@
 #include <NMatcherParams.h>
 #include <NTemplate.h>
 #include <NLicensing.h>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 //IRIS
 #include <NEExtractor.h>
+#ifndef __OPENBR_INTERNAL_H
+#define __OPENBR_INTERNAL_H
+
+#include "openbr/openbr_plugin.h"
+
+namespace br
+{
+/*!
+ * \brief A br::Transform that does not require training data.
+ */
+class BR_EXPORT UntrainableTransform : public Transform
+{
+    Q_OBJECT
+
+protected:
+    UntrainableTransform(bool independent = true) : Transform(independent, false) {} /*!< \brief Construct an untrainable transform. */
+
+private:
+    Transform *clone() const { return const_cast<UntrainableTransform*>(this); }
+    void train(const TemplateList &data) { (void) data; }
+    void store(QDataStream &stream) const { (void) stream; }
+    void load(QDataStream &stream) { (void) stream; }
+};
+
+/*!
+ * \brief A br::MetaTransform that does not require training data.
+ */
+class BR_EXPORT UntrainableMetaTransform : public UntrainableTransform
+{
+    Q_OBJECT
+
+protected:
+    UntrainableMetaTransform() : UntrainableTransform(false) {}
+};
+
+/*!
+ * \brief A br::Transform for which the results of project may change due to prior calls to project
+ */
+class BR_EXPORT TimeVaryingTransform : public Transform
+{
+    Q_OBJECT
+
+public:
+    virtual bool timeVarying() const { return true; }
+
+    virtual void project(const Template &src, Template &dst) const
+    {
+        qFatal("No const project defined for time-varying transform");
+        (void) dst; (void) src;
+    }
+
+    virtual void project(const TemplateList &src, TemplateList &dst) const
+    {
+        qFatal("No const project defined for time-varying transform");
+        (void) dst; (void) src;
+    }
+
+    // Get a compile failure if this isn't here to go along with the other
+    // projectUpdate, no idea why
+    virtual void projectUpdate(const Template & src, Template & dst)
+    {
+        (void) src; (void) dst;
+        qFatal("do something useful");
+    }
+
+    virtual void projectUpdate(const TemplateList &src, TemplateList &dst)
+    {
+        foreach (const Template & src_part, src) {
+            Template out;
+            projectUpdate(src_part, out);
+            dst.append(out);
+        }
+    }
+
+    /*!
+     *\brief For transforms that don't do any training, this default implementation
+     * which creates a new copy of the Transform from its description string is sufficient.
+     */
+    virtual Transform * smartCopy()
+    {
+        return this->clone();
+    }
+
+
+protected:
+    TimeVaryingTransform(bool independent = true, bool trainable = true) : Transform(independent, trainable) {}
+};
+
+/*!
+ * \brief A br::Transform expecting multiple matrices per template.
+ */
+class BR_EXPORT MetaTransform : public Transform
+{
+    Q_OBJECT
+
+protected:
+    MetaTransform() : Transform(false) {}
+};
+
+/*!
+ * \brief A MetaTransform that aggregates some sub-transforms
+ */
+class BR_EXPORT CompositeTransform : public TimeVaryingTransform
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(QList<br::Transform*> transforms READ get_transforms WRITE set_transforms RESET reset_transforms)
+    BR_PROPERTY(QList<br::Transform*>, transforms, QList<br::Transform*>())
+
+    virtual void project(const Template &src, Template &dst) const
+    {
+        if (timeVarying()) qFatal("No const project defined for time-varying transform");
+        _project(src, dst);
+    }
+
+    virtual void project(const TemplateList &src, TemplateList &dst) const
+    {
+        if (timeVarying()) qFatal("No const project defined for time-varying transform");
+        _project(src, dst);
+    }
+
+    bool timeVarying() const { return isTimeVarying; }
+
+    void init()
+    {
+        isTimeVarying = false;
+        trainable = false;
+        foreach (const br::Transform *transform, transforms) {
+            isTimeVarying = isTimeVarying || transform->timeVarying();
+            trainable = trainable || transform->trainable;
+        }
+    }
+
+    /*!
+     * \brief Composite transforms need to create a copy of themselves if they
+     * have any time-varying children. If this object is flagged as time-varying,
+     * it creates a new copy of its own class, and gives that copy the child transforms
+     * returned by calling smartCopy on this transforms children
+     */
+    Transform * smartCopy()
+    {
+        if (!timeVarying())
+            return this;
+
+        QString name = metaObject()->className();
+        name.replace("Transform","");
+        name += "([])";
+        name.replace("br::","");
+        CompositeTransform * output = dynamic_cast<CompositeTransform *>(Transform::make(name, NULL));
+
+        if (output == NULL)
+            qFatal("Dynamic cast failed!");
+
+        foreach(Transform* t, transforms )
+        {
+            Transform * maybe_copy = t->smartCopy();
+            if (maybe_copy->parent() == NULL)
+                maybe_copy->setParent(output);
+            output->transforms.append(t->smartCopy());
+        }
+
+        output->file = this->file;
+        output->classes = classes;
+        output->instances = instances;
+        output->fraction = fraction;
+
+        output->init();
+
+        return output;
+    }
+
+protected:
+    bool isTimeVarying;
+
+    virtual void _project(const Template & src, Template & dst) const = 0;
+    virtual void _project(const TemplateList & src, TemplateList & dst) const = 0;
+
+    CompositeTransform() : TimeVaryingTransform(false) {}
+};
+
+}
+
+#endif
@@ -35,7 +35,7 @@
 #include <iostream>
 #include <limits>
 #include <assert.h>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/bee.h"
 #include "openbr/core/common.h"
@@ -2,7 +2,7 @@
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "core/opencvutils.h"
@@ -14,7 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
 # Add source to BR_THIRDPARTY_SRC
 # Add libs to BR_THIRDPARTY_LIBS
-file(GLOB PLUGINS plugins/*.cpp)
+file(GLOB PLUGINS plugins/*.cpp plugins/*.h)
 foreach(PLUGIN ${PLUGINS} ${BR_THIRDPARTY_PLUGINS})
   get_filename_component(PLUGIN_BASENAME ${PLUGIN} NAME_WE)
   get_filename_component(PLUGIN_PATH ${PLUGIN} PATH)
@@ -11,8 +11,7 @@
 #include <pittpatt_raw_image_io.h>
 #include <pittpatt_sdk.h>
 #include <pittpatt_license.h>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/resource.h"
 #define TRY(CC)                                                                                               \
@@ -5,7 +5,7 @@
 #include <QTcpSocket>
 #include <opencv2/highgui/highgui.hpp>
 #include <http_parser.h>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
 #include <QFutureSynchronizer>
 #include <QtConcurrent>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -16,7 +16,7 @@
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
 #include <QFutureSynchronizer>
 #include <QtConcurrent>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -14,7 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 #include <stdint.h>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
 #include <stasm_dll.hpp>
 #include <opencv2/highgui/highgui.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
@@ -5,14 +5,12 @@
 #include <QMap>
 #include <opencv/highgui.h>
 #include <QtConcurrent>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
 #include "openbr/core/qtutils.h"
-#include <iostream>
-
 using namespace cv;
 namespace br
@@ -258,12 +256,16 @@ public:
         next_idx = 0;
         basis = input;
         video.open(input.file.name.toStdString());
-        return video.isOpened();
+        video_ok = video.isOpened();
+        return video_ok;
     }
+    bool video_ok;
-    bool isOpen() { return video.isOpened(); }
+    bool isOpen() { return video_ok; }
-    void close() { video.release(); }
+    void close() {
+        video.release();
+    }
 private:
     bool getNext(FrameData & output)
@@ -279,8 +281,8 @@ private:
         bool res = video.read(output.data.last().last());
         if (!res) {
-            video.release();
-            return false;
+            video_ok = false;
+            return video_ok;
         }
         output.data.last().file.set("FrameNumber", output.sequenceNumber);
         return true;
@@ -299,7 +301,9 @@ public:
     TemplateDataSource(int maxFrames) : DataSource(maxFrames)
     {
         current_idx = INT_MAX;
+        data_ok = false;
     }
+    bool data_ok;
     bool open(Template &input)
     {
@@ -309,10 +313,13 @@ public:
         final_frame = -1;
         last_issued = -2;
-        return isOpen();
+        data_ok = current_idx < basis.size();
+        return data_ok;
     }
-    bool isOpen() { return current_idx < basis.size() ; }
+    bool isOpen() {
+        return data_ok;
+    }
     void close()
     {
@@ -323,7 +330,8 @@ public:
 private:
     bool getNext(FrameData & output)
     {
-        if (!isOpen())
+        data_ok = current_idx < basis.size();
+        if (!data_ok)
             return false;
         output.data.append(basis[current_idx]);
@@ -332,6 +340,7 @@ private:
         output.sequenceNumber = next_sequence;
         next_sequence++;
+        output.data.last().file.set("FrameNumber", output.sequenceNumber);
         return true;
     }
@@ -595,10 +604,6 @@ public:
     FrameData * run(FrameData * input, bool & should_continue)
     {
-        if (input != NULL) {
-            dataSource.returnFrame(input);
-        }
-
         // Is there anything on our input buffer? If so we should start a thread with that.
         QWriteLocker lock(&statusLock);
         input = dataSource.tryGetFrame();
@@ -17,7 +17,7 @@
 #include <QTemporaryFile>
 #include <opencv2/core/core.hpp>
 #include <opencv2/ml/ml.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include <openbr/core/qtutils.h>
 namespace br
@@ -15,7 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 using namespace cv;
 #include <QCoreApplication>
 #include <QProcess>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
 #include "openbr/core/common.h"
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="openbr.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4241042"
+     inkscape:cx="255.99998"
+     inkscape:cy="224.54497"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1386"
+     inkscape:window-height="856"
+     inkscape:window-x="54"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-540.36218)">
+    <rect
+       style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect2985"
+       width="380.73685"
+       height="380.73685"
+       x="65.631577"
+       y="637.99377" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:3.92984693;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2991"
+       sodipodi:cx="350"
+       sodipodi:cy="393.79074"
+       sodipodi:rx="218.57143"
+       sodipodi:ry="218.57143"
+       d="m 568.57143,393.79074 a 218.57143,218.57143 0 1 1 -437.14286,0 218.57143,218.57143 0 1 1 437.14286,0 z"
+       transform="matrix(1.0178513,0,0,1.0178514,-100.24798,395.54173)" />
+    <g
+       transform="scale(1.1432502,0.87469915)"
+       style="font-size:602.20269775px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text3808">
+      <path
+         d="m 139.95187,956.87572 0,160.84218 83.97112,0 c 31.95257,0 68.68055,-6.5669 83.97112,-19.7009 15.48604,-13.3299 27.99007,-33.619 27.99037,-60.8672 -3e-4,-27.444 -12.50433,-47.63499 -27.99037,-60.57311 -15.29057,-13.13378 -52.01855,-19.70097 -83.97112,-19.70097 m -83.97112,-180.54319 0,132.31993 83.97112,0 c 29.01214,0 69.85673,-5.39055 83.97112,-16.17244 14.30987,-10.97737 27.99008,-27.63986 27.99037,-49.98753 -2.9e-4,-22.15099 -13.6805,-38.71546 -27.99037,-49.69348 -14.11439,-10.97727 -54.95898,-16.46609 -83.97112,-16.46648 m -139.951873,-48.81135 139.951873,0 c 45.28256,0 91.95076,9.40984 116.45474,28.22825 24.50335,18.81923 36.75519,45.57723 36.75554,80.27409 -3.5e-4,26.85635 -6.27329,48.22354 -18.81883,64.10165 -12.54621,15.87865 -30.97297,25.77813 -55.28033,29.69848 29.20809,6.27317 51.84948,19.40714 67.92423,39.40193 16.27009,19.79916 20.90689,51.96712 20.90689,77.59112 l 0,119.7126 -55.98075,0 0,-44.8424 c -17.69465,15.1339 -37.06615,24.3098 -56.82746,32.0601 -17.87739,7.0114 -36.46927,12.8733 -55.13403,12.7823 -21.46529,-0.1046 -45.63727,-9.5398 -63.32089,-15.318 l -20.44109,-13.0416 -0.20914,28.3596 -55.98075,0 0,-80.0275 -3e-6,-358.98062"
+         id="path3816"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsccccccscccccsccsccscccaacccccc" />
+    </g>
+  </g>
+</svg>