merged ICFPreprocessor and Channels -> ChannelFeatureBuilder

apps/sft/fpool.cpp

@@ -51,11 +51,12 @@ sft::ICFFeaturePool::ICFFeaturePool(cv::Size m, int n) : FeaturePool(), model(m)
 {
     CV_Assert(m != cv::Size() && n > 0);
     fill(nfeatures);
+    builder = cv::ChannelFeatureBuilder::create();
 }
 
 void sft::ICFFeaturePool::preprocess(cv::InputArray frame, cv::OutputArray integrals) const
 {
-    preprocessor.apply(frame, integrals);
+    (*builder)(frame, integrals);
 }
 
 float sft::ICFFeaturePool::apply(int fi, int si, const Mat& integrals) const

apps/sft/include/sft/fpool.hpp

@@ -119,7 +119,7 @@ private:
 
     static const unsigned int seed = 0;
 
-    cv::ICFPreprocessor preprocessor;
+    cv::Ptr<cv::ChannelFeatureBuilder> builder;
 
     enum { N_CHANNELS = 10 };
 };