CascadeClassifier::setImage() gets back.

git-svn-id: https://code.ros.org/svn/opencv/trunk@2018 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cv.hpp b/opencv/include/opencv/cv.hpp
index f6370b425091deb037f97aaa0d6dd8eeba8db4e1..078a950e0c15a4cf1a56739e4186a8bd77fabec8 100644 (file)
--- a/opencv/include/opencv/cv.hpp
+++ b/opencv/include/opencv/cv.hpp
@@ -688,7 +688,7 @@ public:
                            int minNeighbors=3, int flags=0,
                            Size minSize=Size());
  
-    //bool setImage( const Mat& image );
+    bool setImage( const Mat& image );
     int runAt( Point pt );
 
     int stageType;

diff --git a/opencv/src/cv/cvcascadedetect.cpp b/opencv/src/cv/cvcascadedetect.cpp
index c3cf621c5a7ca55acfd7182139060996afbad6b0..bbffa16212edc21ceb844d414117358061bc83ca 100755 (executable)
--- a/opencv/src/cv/cvcascadedetect.cpp
+++ b/opencv/src/cv/cvcascadedetect.cpp
@@ -639,22 +639,20 @@ int CascadeClassifier::runAt(Point pt)
 }
 
     
-//bool CascadeClassifier::setImage(const Mat& image)
-//{
-//    if( !oldCascade.empty() )
-//    {
-//        Mat sum(image.rows+1, image.cols+1, CV_32S);
-//        Mat tilted(image.rows+1, image.cols+1, CV_32S);
-//        Mat sqsum(image.rows+1, image.cols+1, CV_64F);
-//        integral(image, sum, sqsum, tilted);
-//        CvMat _sum = sum, _sqsum = sqsum, _tilted = tilted;
-//        cvSetImagesForHaarClassifierCascade( oldCascade, &_sum, &_sqsum, &_tilted, 1. );
-//        return true;
-//    }
-//    if( empty() )
-//        return false;
-//    return feval->setImage(image, origWinSize);
-//}
+bool CascadeClassifier::setImage(const Mat& image)
+{
+    /*if( !oldCascade.empty() )
+    {
+        Mat sum(image.rows+1, image.cols+1, CV_32S);
+        Mat tilted(image.rows+1, image.cols+1, CV_32S);
+        Mat sqsum(image.rows+1, image.cols+1, CV_64F);
+        integral(image, sum, sqsum, tilted);
+        CvMat _sum = sum, _sqsum = sqsum, _tilted = tilted;
+        cvSetImagesForHaarClassifierCascade( oldCascade, &_sum, &_sqsum, &_tilted, 1. );
+        return true;
+    }*/
+    return empty() ? false : feval->setImage(image, origWinSize);
+}
     
     
 struct getRect { Rect operator ()(const CvAvgComp& e) const { return e.rect; } };