From ca551ab9ae8ca9f76f2a4ec5ab75e96518c03eec Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Tue, 7 Jun 2011 07:41:59 +0000 Subject: [PATCH] added one more SIFT::CommonParams constructor --- modules/features2d/include/opencv2/features2d/features2d.hpp | 1 + modules/features2d/src/sift.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp index 38ee3cb..949d2cb 100644 --- a/modules/features2d/include/opencv2/features2d/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d/features2d.hpp @@ -312,6 +312,7 @@ public: CommonParams(); CommonParams( int _nOctaves, int _nOctaveLayers, int /*_firstOctave*/, int /*_angleMode*/ ); + CommonParams( int _nOctaves, int _nOctaveLayers ); int nOctaves, nOctaveLayers; int firstOctave; // it is not used now (firstOctave == 0 always) int angleMode; // it is not used now diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp index 303f9af..b1eead8 100644 --- a/modules/features2d/src/sift.cpp +++ b/modules/features2d/src/sift.cpp @@ -1380,6 +1380,10 @@ SIFT::CommonParams::CommonParams( int _nOctaves, int _nOctaveLayers, int /*_firs firstOctave(-1/*_firstOctave*/), angleMode(FIRST_ANGLE/*_angleMode*/) {} +SIFT::CommonParams::CommonParams( int _nOctaves, int _nOctaveLayers ) : + nOctaves(_nOctaves), nOctaveLayers(_nOctaveLayers), firstOctave(-1), angleMode(FIRST_ANGLE) +{} + SIFT::DetectorParams::DetectorParams() : threshold(GET_DEFAULT_THRESHOLD()), edgeThreshold(GET_DEFAULT_EDGE_THRESHOLD()) {} -- 2.7.4