Merge branch 'pr/156'

Josh Klontz
2 parents 6f85ca66 79ac19cc
Showing 25 changed files with 46 additions and 15 deletions
.gitignore
README.md
app/CMakeLists.txt
openbr/core/cluster.cpp
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
openbr/gui/tail.cpp
openbr/gui/utility.cpp
openbr/openbr.cpp
openbr/openbr_plugin.h
openbr/plugins/cascade.cpp
openbr/plugins/cvt.cpp
openbr/plugins/distance.cpp
openbr/plugins/draw.cpp
openbr/plugins/eyes.cpp
openbr/plugins/format.cpp
openbr/plugins/gui.cpp
openbr/plugins/hist.cpp
openbr/plugins/integral.cpp
openbr/plugins/lbp.cpp
@@ -42,3 +42,7 @@ data/INRIAPerson/sigset
 data/KTH/sigset
 data/CaltechPedestrians/annotations
  
+### Sublime ###
+*.check_cache
+*.sublime-project
+*.sublime-workspace
@@ -14,4 +14,3 @@ To optionally check out a particular [tagged release](https://github.com/biometr
  
  
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/biometrics/openbr/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
@@ -5,4 +5,6 @@ add_subdirectory(br)
 add_subdirectory(examples)
  
 # Build OpenBR GUI application
-add_subdirectory(br-gui)
+if(NOT ${BR_EMBEDDED})
+  add_subdirectory(br-gui)
+endif()
@@ -21,6 +21,7 @@
 #include <QSet>
 #include <limits>
 #include <openbr/openbr_plugin.h>
+#include <assert.h>
  
 #include "openbr/core/bee.h"
 #include "openbr/core/cluster.h"
@@ -15,7 +15,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui/highgui_c.h>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include <openbr/openbr_plugin.h>
  
 #include "opencvutils.h"
@@ -22,6 +22,7 @@
 #include <QString>
 #include <QStringList>
 #include <opencv2/core/core.hpp>
+#include <assert.h>
  
 namespace OpenCVUtils
 {
 #include <QtConcurrentRun>
  
 #include "tail.h"
+#include <assert.h>
  
 using namespace br;
  
 #include <limits>
 #include <vector>
+#include <assert.h>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "utility.h"
  
 using namespace cv;
@@ -24,6 +24,7 @@
 #include "core/qtutils.h"
 #include "plugins/openbr_internal.h"
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui/highgui_c.h>
  
 using namespace br;
  
@@ -41,6 +41,7 @@
 #include <QVector>
 #include <opencv2/core/core.hpp>
 #include <openbr/openbr.h>
+#include <assert.h>
  
 /*!
  * \defgroup cpp_plugin_sdk C++ Plugin SDK
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/objdetect/objdetect.hpp>
+//#include <opencv2/objdetect/objdetect_c.h>
 #include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 #include "openbr/core/resource.h"
@@ -86,11 +87,11 @@ class CascadeTransform : public UntrainableMetaTransform
  
             for (int i=0; i<t.size(); i++) {
                 const Mat &m = t[i];
-                vector<Rect> rects;
-                vector<int> rejectLevels;
-                vector<double> levelWeights;
-                if (ROCMode) cascade->detectMultiScale(m, rects, rejectLevels, levelWeights, 1.2, 5, (enrollAll ? 0 : CV_HAAR_FIND_BIGGEST_OBJECT) | CV_HAAR_SCALE_IMAGE, Size(minSize, minSize), Size(), true);
-                else         cascade->detectMultiScale(m, rects, 1.2, 5, enrollAll ? 0 : CV_HAAR_FIND_BIGGEST_OBJECT, Size(minSize, minSize));
+                std::vector<Rect> rects;
+                std::vector<int> rejectLevels;
+                std::vector<double> levelWeights;
+                if (ROCMode) cascade->detectMultiScale(m, rects, rejectLevels, levelWeights, 1.2, 5, (enrollAll ? 0 : CASCADE_FIND_BIGGEST_OBJECT) | CASCADE_SCALE_IMAGE, Size(minSize, minSize), Size(), true);
+                else         cascade->detectMultiScale(m, rects, 1.2, 5, enrollAll ? 0 : CASCADE_FIND_BIGGEST_OBJECT, Size(minSize, minSize));
  
                 if (!enrollAll && rects.empty())
                     rects.push_back(Rect(0, 0, m.cols, m.rows));
@@ -14,6 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
+#include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/imgproc/imgproc.hpp>
 #include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
@@ -18,6 +18,7 @@
 #include <QtConcurrentRun>
 #include <numeric>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "openbr_internal.h"
  
 #include "openbr/core/distance_sse.h"
@@ -61,6 +62,7 @@ private:
             (a.m().type() != b.m().type()))
                 return -std::numeric_limits<float>::max();
  
+// TODO: this max value is never returned based on the switch / default 
         float result = std::numeric_limits<float>::max();
         switch (metric) {
           case Correlation:
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui/highgui_c.h>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <vector>
 #include "openbr_internal.h"
@@ -34,6 +34,7 @@
 */
  
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
  
@@ -20,6 +20,7 @@
 #include <QtXml>
 #endif // BR_EMBEDDED
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui/highgui_c.h>
 #include "openbr_internal.h"
  
 #include "openbr/core/bee.h"
@@ -12,6 +12,7 @@
 #include <QLineEdit>
  
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "openbr_internal.h"
 #include "openbr/gui/utility.h"
  
@@ -94,7 +94,7 @@ class BinTransform : public UntrainableTransform
         } else if (channels == 2) {
             // If there are two channels, the first is channel is assumed to be a weight vector
             // and the second channel contains the vectors we would like to bin.
-            vector<Mat> mv;
+            std::vector<Mat> mv;
             cv::split(src, mv);
             weights = mv[0];
             weights.convertTo(weights, CV_32F);
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include <Eigen/Core>
 #include "openbr_internal.h"
  
@@ -293,7 +294,7 @@ private:
         Sobel(src, dx, CV_32F, 1, 0, CV_SCHARR);
         Sobel(src, dy, CV_32F, 0, 1, CV_SCHARR);
         cartToPolar(dx, dy, magnitude, angle, true);
-        vector<Mat> mv;
+        std::vector<Mat> mv;
         if ((channel == Magnitude) || (channel == MagnitudeAndAngle)) {
             const float theoreticalMaxMagnitude = sqrt(2*pow(float(2*(3+10+3)*255), 2.f));
             mv.push_back(magnitude / theoreticalMaxMagnitude);
@@ -15,7 +15,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui/highgui_c.h>
 #include <limits>
 #include "openbr_internal.h"
  
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include <limits>
 #include "openbr_internal.h"
  
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
 #include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "openbr_internal.h"
  
 using namespace cv;
@@ -164,7 +165,7 @@ class LargestConvexAreaTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         std::vector< std::vector<Point> > contours;
-        findContours(src.clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);
+        findContours(src.m().clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);
         double maxArea = 0;
         foreach (const std::vector<Point> &contour, contours) {
             std::vector<Point> hull;
@@ -62,7 +62,8 @@ class SubtractBackgroundTransform : public TimeVaryingTransform
 {
     Q_OBJECT
  
-    BackgroundSubtractorMOG2 mog;
+    // TODO: This is broken.
+    // BackgroundSubtractorMOG2 mog;
  
 public:
     SubtractBackgroundTransform() : TimeVaryingTransform(false, false) {}
@@ -72,7 +73,8 @@ private:
     {
         dst = src;
         Mat mask;
-        mog(src, mask);
+        // TODO: broken
+        // mog(src, mask);
         erode(mask, mask, Mat());
         dilate(mask, mask, Mat());
         dst.file.set("Mask", QVariant::fromValue(mask));
@@ -86,7 +88,8 @@ private:
     void finalize(TemplateList &output)
     {
         (void) output;
-        mog = BackgroundSubtractorMOG2();
+        // TODO: Broken
+        // mog = BackgroundSubtractorMOG2();
     }
 };
  
@@ -137,7 +137,7 @@ private:
         const QList<int> labels = data.indexProperty(inputVariable);
         const int dims = m.cols;
  
-        vector<Mat> mv, av, bv;
+        std::vector<Mat> mv, av, bv;
         split(m, mv);
         for (size_t c = 0; c < mv.size(); c++) {
             av.push_back(Mat(1, dims, CV_64FC1));
@@ -7,6 +7,7 @@
 #include <QQueue>
 #include <QtConcurrent>
 #include <opencv/highgui.h>
+#include <opencv2/highgui/highgui.hpp>
 #include "openbr_internal.h"
 #include "openbr/core/common.h"
 #include "openbr/core/opencvutils.h"
@@ -736,7 +737,6 @@ protected:
                         frameSource = new VideoReader();
                 }
             }
-
             open_res = frameSource->open(curr);
             if (!open_res)
             {
@@ -1420,6 +1420,7 @@ public:
     {
         // Delete all the stages
         for (int i = 0; i < processingStages.size(); i++) {
+// TODO: Are we releasing memory which is already freed?
             delete processingStages[i];
         }
         processingStages.clear();