fix lying assertation and hard-coded shrinkage

diff --git a/modules/softcascade/include/opencv2/softcascade/softcascade.hpp b/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
index a84aaa044fe3b63f74a183c9e6ebf212bd74c475..673f093d5b10d29c99195f54cc1dfa05d374d3a0 100644 (file)
--- a/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
+++ b/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
@@ -126,7 +126,7 @@ public:
     virtual ~ChannelFeatureBuilder();
 
     // apply channels to source frame
-    CV_WRAP_AS(compute) virtual void operator()(InputArray src, CV_OUT OutputArray channels) const = 0;
+    CV_WRAP_AS(compute) virtual void operator()(InputArray src, CV_OUT OutputArray channels, cv::Size channelsSize = cv::Size()) const = 0;
 
     CV_WRAP static cv::Ptr<ChannelFeatureBuilder> create();
 };

diff --git a/modules/softcascade/src/integral_channel_builder.cpp b/modules/softcascade/src/integral_channel_builder.cpp
index ae18e54d5c89b8cda617eed1e904434516bd1eed..7f99d6efcf293ff5b974b54b863fb32744701263 100644 (file)
--- a/modules/softcascade/src/integral_channel_builder.cpp
+++ b/modules/softcascade/src/integral_channel_builder.cpp
@@ -51,14 +51,20 @@ class ICFBuilder : public ChannelFeatureBuilder
     virtual ~ICFBuilder() {}
     virtual cv::AlgorithmInfo* info() const;
 
-    virtual void operator()(cv::InputArray _frame, CV_OUT cv::OutputArray _integrals) const
+    virtual void operator()(cv::InputArray _frame, CV_OUT cv::OutputArray _integrals, cv::Size channelsSize) const
     {
         CV_Assert(_frame.type() == CV_8UC3);
 
         cv::Mat frame      = _frame.getMat();
         int h = frame.rows;
         int w = frame.cols;
-        _integrals.create(h / 4 * 10 + 1, w / 4 + 1, CV_32SC1);
+
+        if (channelsSize != cv::Size())
+            _integrals.create(channelsSize.height * 10 + 1, channelsSize.width + 1, CV_32SC1);
+
+        if(_integrals.empty())
+            _integrals.create(frame.rows * 10 + 1, frame.cols + 1, CV_32SC1);
+
         cv::Mat& integrals = _integrals.getMatRef();
 
         cv::Mat channels, gray;
@@ -98,12 +104,7 @@ class ICFBuilder : public ChannelFeatureBuilder
         for (int i = 0; i < 3; ++i)
             splited.push_back(channels(cv::Rect(0, h * (7 + i), w, h)));
         split(luv, splited);
-
-        float shrinkage = static_cast<float>(integrals.cols - 1) / channels.cols;
-
-        CV_Assert(shrinkage == 0.25);
-
-        cv::resize(channels, shrunk, cv::Size(), shrinkage, shrinkage, CV_INTER_AREA);
+        cv::resize(channels, shrunk, cv::Size(integrals.cols - 1, integrals.rows - 1), -1 , -1, CV_INTER_AREA);
         cv::integral(shrunk, integrals, cv::noArray(), CV_32S);
     }
 };

diff --git a/modules/softcascade/src/softcascade.cpp b/modules/softcascade/src/softcascade.cpp
index 58a61547a2adca3e7fe2a16e16098bd4141b79d6..295eb0335ddfe4b2fd0a3a9f0289fa5e59b2cd59 100644 (file)
--- a/modules/softcascade/src/softcascade.cpp
+++ b/modules/softcascade/src/softcascade.cpp
@@ -189,11 +189,12 @@ struct ChannelStorage
 
     ChannelStorage(const cv::Mat& colored, int shr) : shrinkage(shr)
     {
+        model_height = cvRound(colored.rows / (float)shrinkage);
+
         builder = ChannelFeatureBuilder::create();
-        (*builder)(colored, hog);
+        (*builder)(colored, hog, cv::Size(cvRound(colored.cols / (float)shrinkage), model_height));
 
         step = hog.step1();
-        model_height = colored.rows / shrinkage;
     }
 
     float get(const int channel, const cv::Rect& area) const