refactor integral channels

2012-11-05 23:28:37 +04:00
parent 65543c53f6
commit 6a3a723938
3 changed files with 39 additions and 39 deletions
--- a/modules/objdetect/src/softcascade.cpp
+++ b/modules/objdetect/src/softcascade.cpp
@@ -223,14 +223,15 @@ struct ChannelStorage
    ChannelStorage(const cv::Mat& colored, int shr) : shrinkage(shr)
    {
        hog.clear();
-        cv::IntegralChannels ints(shr);
+        hog.reserve(10);
+        cv::SCascade::Channels ints(shr);

        // convert to grey
        cv::Mat grey;
        cv::cvtColor(colored, grey, CV_BGR2GRAY);

-        ints.createHogBins(grey, hog, 6);
-        ints.createLuvBins(colored, hog);
+        ints.appendHogBins(grey, hog, 6);
+        ints.appendLuvBins(colored, hog);

        step = hog[0].cols;
    }