Fixed compile bug in store and update windowSize to be more elegant

Jordan Cheney
1 parent 98ce6592
Showing 8 changed files with 38 additions and 22 deletions
openbr/core/boost.cpp
openbr/core/cascade.cpp
openbr/openbr_plugin.h
openbr/plugins/classification/boostedforest.cpp
openbr/plugins/classification/cascade.cpp
openbr/plugins/imgproc/slidingwindow.cpp
openbr/plugins/representation/haar.cpp
openbr/plugins/representation/mblbp.cpp
@@ -142,7 +142,10 @@ static CvMat* cvPreprocessIndexArray( const CvMat* idx_arr, int data_arr_size, b
 void FeatureEvaluator::init(Representation *_representation, int _maxSampleCount)
 {
     representation = _representation;
-    data.create((int)_maxSampleCount, representation->postWindowSize().area(), CV_32SC1);
+
+    int dx, dy;
+    Size windowSize = representation->windowSize(dx, dy);
+    data.create((int)_maxSampleCount, Size(windowSize.width + dx, windowSize.height + dy).area(), CV_32SC1);
     cls.create( (int)_maxSampleCount, 1, CV_32FC1 );
 }
  
@@ -150,7 +153,9 @@ void FeatureEvaluator::setImage(const Mat &amp;img, uchar clsLabel, int idx)
 {
     cls.ptr<float>(idx)[0] = clsLabel;
  
-    Mat integralImg(representation->postWindowSize(), data.type(), data.ptr<int>(idx));
+    int dx, dy;
+    Size windowSize = representation->windowSize(dx, dy);
+    Mat integralImg(Size(windowSize.width + dx, windowSize.height + dy), data.type(), data.ptr<int>(idx));
     representation->preprocess(img, integralImg);
 }
  
@@ -231,7 +231,8 @@ void _CascadeClassifier::detectMultiScale(const Mat&amp; image, vector&lt;Rect&gt;&amp; object
     Mat imageBuffer(image.rows + 1, image.cols + 1, CV_8U);
  
     for (double factor = 1; ; factor *= scaleFactor) {
-        Size originalWindowSize = representation->preWindowSize();
+        int dx, dy;
+        Size originalWindowSize = representation->windowSize(dx, dy);
  
         Size windowSize(cvRound(originalWindowSize.width*factor), cvRound(originalWindowSize.height*factor) );
         Size scaledImageSize(cvRound(image.cols/factor ), cvRound(image.rows/factor));
@@ -253,7 +254,7 @@ void _CascadeClassifier::detectMultiScale(const Mat&amp; image, vector&lt;Rect&gt;&amp; object
         int yStep = factor > 2. ? 1 : 2;
         for (int y = 0; y < processingRectSize.height; y += yStep) {
             for (int x = 0; x < processingRectSize.width; x += yStep) {
-                Mat window = repImage(Rect(Point(x, y), representation->postWindowSize())).clone();
+                Mat window = repImage(Rect(Point(x, y), Size(originalWindowSize.width + dx, originalWindowSize.height + dy))).clone();
  
                 double gypWeight;
                 int result = predict(window, gypWeight);
@@ -1407,8 +1407,7 @@ public:
     // and returned.
     virtual cv::Mat evaluate(const cv::Mat &image, const QList<int> &indices = QList<int>()) const = 0;
  
-    virtual cv::Size preWindowSize() const = 0; // window size before preprocessing
-    virtual cv::Size postWindowSize() const = 0; // window size after preprocessing
+    virtual cv::Size windowSize(int &dx, int &dy) const = 0; // dx and dy should indicate the change to the original window size after preprocessing
     virtual int numFeatures() const = 0;
     virtual int maxCatCount() const = 0;
 };
@@ -1427,7 +1426,7 @@ public:
  
     // Slots for representation
     virtual cv::Mat preprocess(const cv::Mat &image) const = 0;
-    virtual cv::Size windowSize() const = 0;
+    virtual cv::Size windowSize(int &dx, int &dy) const = 0;
  
     // OpenCV compatibility
     virtual int numFeatures() const = 0;
@@ -167,9 +167,9 @@ class BoostedForestClassifier : public Classifier
         return dst;
     }
  
-    Size windowSize() const
+    Size windowSize(int &dx, int &dy) const
     {
-        return representation->preWindowSize();
+        return representation->windowSize(dx, dy);
     }
  
     void read(const FileNode &node)
@@ -186,9 +186,9 @@ class CascadeClassifier : public Classifier
         return stages.first()->preprocess(image);
     }
  
-    Size windowSize() const
+    Size windowSize(int &dx, int &dy) const
     {
-        return stages.first()->windowSize();
+        return stages.first()->windowSize(dx, dy);
     }
  
     void read(const FileNode &node)
@@ -99,7 +99,8 @@ class SlidingWindowTransform : public MetaTransform
                 Mat imageBuffer(m.rows + 1, m.cols + 1, CV_8U);
  
                 for (double factor = 1; ; factor *= scaleFactor) {
-                    Size originalWindowSize(24, 24);
+                    int dx, dy;
+                    Size originalWindowSize = classifier->windowSize(dx, dy);
  
                     Size windowSize(cvRound(originalWindowSize.width*factor), cvRound(originalWindowSize.height*factor) );
                     Size scaledImageSize(cvRound(m.cols/factor ), cvRound(m.rows/factor));
@@ -120,7 +121,7 @@ class SlidingWindowTransform : public MetaTransform
                     int step = factor > 2. ? 1 : 2;
                     for (int y = 0; y < processingRectSize.height; y += step) {
                         for (int x = 0; x < processingRectSize.width; x += step) {
-                            Mat window = repImage(Rect(Point(x, y), Size(25,25))).clone();
+                            Mat window = repImage(Rect(Point(x, y), Size(originalWindowSize.width + dx, originalWindowSize.height + dy))).clone();
  
                             float gypWeight;
                             int result = classifier->classify(window, gypWeight);
@@ -173,7 +174,7 @@ class SlidingWindowTransform : public MetaTransform
     {
         (void) stream;
  
-        QString path = Globals->sdkPath + "/share/openbr/models/openbrcascades/" + cascadeDir;
+        QString path = Globals->sdkPath + "/share/openbr/models/openbrcascades/" + model;
         QtUtils::touchDir(QDir(path));
  
         QString filename = path + "/cascade.xml";
@@ -89,8 +89,7 @@ class HaarRepresentation : public Representation
     }
  
     int numFeatures() const { return features.size(); }
-    Size preWindowSize() const { return Size(winWidth, winHeight); }
-    Size postWindowSize() const { return Size(winWidth + 1, winHeight + 1); }
+    Size windowSize(int &dx, int &dy) const { dx = dy = 1; return Size(winWidth, winHeight); }
     int maxCatCount() const { return 0; }
  
     struct Feature
@@ -58,9 +58,8 @@ class MBLBPRepresentation : public Representation
         return result;
     }
  
+    Size windowSize(int &dx, int &dy) const { dx = dy = 1; return Size(winWidth, winHeight); }
     int numFeatures() const { return features.size(); }
-    Size preWindowSize() const { return Size(winWidth, winHeight); }
-    Size postWindowSize() const { return Size(winWidth + 1, winHeight + 1); }
     int maxCatCount() const { return 256; }
  
     struct Feature
@@ -77,16 +76,28 @@ class MBLBPRepresentation : public Representation
  
 BR_REGISTER(Representation, MBLBPRepresentation)
  
+static inline void calcOffset(int &p0, int &p1, int &p2, int &p3, Rect rect, int offset)
+{
+    /* (x, y) */
+    p0 = rect.x + offset * rect.y;
+    /* (x + w, y) */
+    p1 = rect.x + rect.width + offset * rect.y;
+    /* (x + w, y) */
+    p2 = rect.x + offset * (rect.y + rect.height);
+    /* (x + w, y + h) */
+    p3 = rect.x + rect.width + offset * (rect.y + rect.height);
+}
+
 MBLBPRepresentation::Feature::Feature( int offset, int x, int y, int _blockWidth, int _blockHeight )
 {
     Rect tr = rect = cvRect(x, y, _blockWidth, _blockHeight);
-    CV_SUM_OFFSETS( p[0], p[1], p[4], p[5], tr, offset )
+    calcOffset(p[0], p[1], p[4], p[5], tr, offset);
     tr.x += 2*rect.width;
-    CV_SUM_OFFSETS( p[2], p[3], p[6], p[7], tr, offset )
+    calcOffset(p[2], p[3], p[6], p[7], tr, offset);
     tr.y +=2*rect.height;
-    CV_SUM_OFFSETS( p[10], p[11], p[14], p[15], tr, offset )
+    calcOffset(p[10], p[11], p[14], p[15], tr, offset);
     tr.x -= 2*rect.width;
-    CV_SUM_OFFSETS( p[8], p[9], p[12], p[13], tr, offset )
+    calcOffset(p[8], p[9], p[12], p[13], tr, offset);
 }
  
 inline uchar MBLBPRepresentation::Feature::calc(const Mat &img) const