mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

restored the ordering of SURF constructor parameters (ticket #1704)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-28 13:07:44 +00:00
parent 8e3f1c09d2
commit f014fb0a0e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/nonfree/include/opencv2/nonfree/features2d.hpp
View File

@ -111,8 +111,8 @@ public:
SURF();
//! the full constructor taking all the necessary parameters
explicit SURF(double _hessianThreshold,
bool _extended=true, bool _upright=false,
int _nOctaves=4, int _nOctaveLayers=2);
int _nOctaves=4, int _nOctaveLayers=2,
bool _extended=true, bool _upright=false);
//! returns the descriptor size in float's (64 or 128)
int descriptorSize() const;

2
modules/nonfree/src/surf.cpp
View File

@ -819,7 +819,7 @@ SURF::SURF()
nOctaveLayers = 2;
}
SURF::SURF(double _threshold, bool _extended, bool _upright, int _nOctaves, int _nOctaveLayers)
SURF::SURF(double _threshold, int _nOctaves, int _nOctaveLayers, bool _extended, bool _upright)
{
hessianThreshold = _threshold;
extended = _extended;

2
modules/nonfree/test/test_detectors.cpp
View File

@ -297,7 +297,7 @@ void CV_DetectorsTest::run( int /*start_from*/ )
if (exp.empty())
return;
if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, true, false, 2)), exp))
if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp))
return;
LoadExpected(string(ts->get_data_path()) + "detectors/star.xml", exp);