From 354be115f2ffda491f16e80eacb2dc5f0bd95f67 Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Fri, 26 Nov 2010 10:57:01 +0000 Subject: [PATCH] made MaskPredicate safer (#419) --- modules/features2d/src/detectors.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/features2d/src/detectors.cpp b/modules/features2d/src/detectors.cpp index 3b5f1196b2..96dd1f1e46 100644 --- a/modules/features2d/src/detectors.cpp +++ b/modules/features2d/src/detectors.cpp @@ -48,17 +48,16 @@ namespace cv /* * FeatureDetector */ -struct MaskPredicate +class MaskPredicate { - MaskPredicate( const Mat& _mask ) : mask(_mask) - {} - MaskPredicate& operator=(const MaskPredicate&) { return *this; } +public: + MaskPredicate( const Mat& _mask ) : mask(_mask) {} bool operator() (const KeyPoint& key_pt) const { return mask.at( (int)(key_pt.pt.y + 0.5f), (int)(key_pt.pt.x + 0.5f) ) == 0; } - - const Mat& mask; +private: + const Mat mask; }; FeatureDetector::~FeatureDetector()