From ac471fadd619b6eb7d548176db9a6ec6fe8b2c62 Mon Sep 17 00:00:00 2001
From: "marina.kolpakova" <marina.kolpakova@itseez.com>
Date: Sat, 2 Mar 2013 13:06:29 +0400
Subject: [PATCH] remove unused parameter from softcascade::Octave constructor

---
 apps/sft/sft.cpp                                         | 2 +-
 .../include/opencv2/softcascade/softcascade.hpp          | 2 +-
 modules/softcascade/src/soft_cascade_octave.cpp          | 9 ++++-----
 modules/softcascade/test/test_training.cpp               | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/sft/sft.cpp b/apps/sft/sft.cpp
index ba66ace7d..7b5138763 100644
--- a/apps/sft/sft.cpp
+++ b/apps/sft/sft.cpp
@@ -137,7 +137,7 @@ int main(int argc, char** argv)
 
         cv::Ptr<cv::ChannelFeatureBuilder> builder = cv::ChannelFeatureBuilder::create(cfg.featureType);
         std::cout << "Channel builder " << builder->info()->name() << std::endl;
-        cv::Ptr<Octave> boost = Octave::create(boundingBox, npositives, nnegatives, *it, shrinkage, nfeatures, builder);
+        cv::Ptr<Octave> boost = Octave::create(boundingBox, npositives, nnegatives, *it, shrinkage, builder);
 
         std::string path = cfg.trainPath;
         sft::ScaledDataset dataset(path, *it);
diff --git a/modules/softcascade/include/opencv2/softcascade/softcascade.hpp b/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
index fc987afa3..945b61f01 100644
--- a/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
+++ b/modules/softcascade/include/opencv2/softcascade/softcascade.hpp
@@ -202,7 +202,7 @@ public:
 
     virtual ~Octave();
     static cv::Ptr<Octave> create(cv::Rect boundingBox, int npositives, int nnegatives,
-        int logScale, int shrinkage, int poolSize, cv::Ptr<ChannelFeatureBuilder> builder);
+        int logScale, int shrinkage, cv::Ptr<ChannelFeatureBuilder> builder);
 
     virtual bool train(const Dataset* dataset, const FeaturePool* pool, int weaks, int treeDepth) = 0;
     virtual void setRejectThresholds(OutputArray thresholds) = 0;
diff --git a/modules/softcascade/src/soft_cascade_octave.cpp b/modules/softcascade/src/soft_cascade_octave.cpp
index b2733e78b..5e37a2964 100644
--- a/modules/softcascade/src/soft_cascade_octave.cpp
+++ b/modules/softcascade/src/soft_cascade_octave.cpp
@@ -63,8 +63,7 @@ class BoostedSoftCascadeOctave : public cv::Boost, public Octave
 public:
 
     BoostedSoftCascadeOctave(cv::Rect boundingBox = cv::Rect(), int npositives = 0, int nnegatives = 0, int logScale = 0,
-        int shrinkage = 1, int poolSize = 0,
-        cv::Ptr<ChannelFeatureBuilder> builder = ChannelFeatureBuilder::create("HOG6MagLuv"));
+        int shrinkage = 1, cv::Ptr<ChannelFeatureBuilder> builder = ChannelFeatureBuilder::create("HOG6MagLuv"));
     virtual ~BoostedSoftCascadeOctave();
     virtual cv::AlgorithmInfo* info() const;
     virtual bool train(const Dataset* dataset, const FeaturePool* pool, int weaks, int treeDepth);
@@ -102,7 +101,7 @@ private:
     cv::Ptr<ChannelFeatureBuilder> builder;
 };
 
-BoostedSoftCascadeOctave::BoostedSoftCascadeOctave(cv::Rect bb, int np, int nn, int ls, int shr, int poolSize,
+BoostedSoftCascadeOctave::BoostedSoftCascadeOctave(cv::Rect bb, int np, int nn, int ls, int shr,
     cv::Ptr<ChannelFeatureBuilder> _builder)
 : logScale(ls), boundingBox(bb), npositives(np), nnegatives(nn), shrinkage(shr)
 {
@@ -449,9 +448,9 @@ CV_INIT_ALGORITHM(BoostedSoftCascadeOctave, "Octave.BoostedSoftCascadeOctave", )
 Octave::~Octave(){}
 
 cv::Ptr<Octave> Octave::create(cv::Rect boundingBox, int npositives, int nnegatives,
-        int logScale, int shrinkage, int poolSize, cv::Ptr<ChannelFeatureBuilder> builder)
+        int logScale, int shrinkage, cv::Ptr<ChannelFeatureBuilder> builder)
 {
     cv::Ptr<Octave> octave(
-        new BoostedSoftCascadeOctave(boundingBox, npositives, nnegatives, logScale, shrinkage, poolSize, builder));
+        new BoostedSoftCascadeOctave(boundingBox, npositives, nnegatives, logScale, shrinkage, builder));
     return octave;
 }
diff --git a/modules/softcascade/test/test_training.cpp b/modules/softcascade/test/test_training.cpp
index 94d774754..a03ab8abd 100644
--- a/modules/softcascade/test/test_training.cpp
+++ b/modules/softcascade/test/test_training.cpp
@@ -221,7 +221,7 @@ TEST(DISABLED_SoftCascade, training)
                                          cvRound(64 * octave), cvRound(128 * octave));
 
         cv::Ptr<ChannelFeatureBuilder> builder = ChannelFeatureBuilder::create("HOG6MagLuv");
-        cv::Ptr<Octave> boost = Octave::create(boundingBox, npositives, nnegatives, *it, shrinkage, nfeatures, builder);
+        cv::Ptr<Octave> boost = Octave::create(boundingBox, npositives, nnegatives, *it, shrinkage, builder);
 
         std::string path = cvtest::TS::ptr()->get_data_path() + "softcascade/sample_training_set";
         ScaledDataset dataset(path, *it);