From a5242265d74776d51f2d6dde7f46ecf33d7849f3 Mon Sep 17 00:00:00 2001 From: Dikay900 Date: Mon, 18 May 2015 00:31:39 +0200 Subject: [PATCH] cleanup after last PR --- modules/objdetect/src/cascadedetect.cpp | 4 ---- modules/objdetect/src/cascadedetect.hpp | 1 - 2 files changed, 5 deletions(-) diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp index cf2d6ca..63edd0d 100644 --- a/modules/objdetect/src/cascadedetect.cpp +++ b/modules/objdetect/src/cascadedetect.cpp @@ -679,10 +679,6 @@ void HaarEvaluator::computeOptFeatures() copyVectorToUMat(*optfeatures_lbuf, ufbuf); } -bool HaarEvaluator::setImage(InputArray _image, const std::vector& _scales){ - return FeatureEvaluator::setImage(_image, _scales); -} - bool HaarEvaluator::setWindow( Point pt, int scaleIdx ) { const ScaleData& s = getScaleData(scaleIdx); diff --git a/modules/objdetect/src/cascadedetect.hpp b/modules/objdetect/src/cascadedetect.hpp index 156f046..4cbf3e9 100644 --- a/modules/objdetect/src/cascadedetect.hpp +++ b/modules/objdetect/src/cascadedetect.hpp @@ -347,7 +347,6 @@ public: virtual Ptr clone() const; virtual int getFeatureType() const { return FeatureEvaluator::HAAR; } - virtual bool setImage(InputArray _image, const std::vector& _scales); virtual bool setWindow(Point p, int scaleIdx); Rect getNormRect() const; int getSquaresOffset() const; -- 2.7.4