Merge pull request #39 from biometrics/distribute_update

Give Distribute better support for handling timevarying transforms

Merge pull request #39 from biometrics/distribute_update
Give Distribute better support for handling timevarying transforms
jklontz
2 parents b48eeb8b 8ff480b0
Showing 55 changed files with 313 additions and 205 deletions
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
openbr/plugins/hash.cpp
@@ -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
 {
@@ -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"
@@ -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"
@@ -4,7 +4,7 @@
 #include <QWaitCondition>
 #include <QMutex>
 #include <opencv2/imgproc/imgproc.hpp>
-#include <openbr/openbr_plugin.h>
+#include "openbr_internal.h"
  
 using namespace cv;
  
@@ -15,8 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <QCryptographicHash>
-#include <openbr/openbr_plugin.h>
-
+#include "openbr_internal.h"
 #include "openbr/core/qtutils.h"
  
 namespace br
@@ -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"
  
-#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;
@@ -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
@@ -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"
@@ -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,7 +5,7 @@
 #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"
@@ -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"