generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switched to non-constant references in Algorithm::addParam, which is more safe.

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-03-17 09:50:47 +00:00
parent 846e37ded5
commit d60623279c
11 changed files with 94 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/nonfree/src/sift.cpp
View File

@@ -683,11 +683,12 @@ AlgorithmInfo* SIFT::info() const
static volatile bool initialized = false;
if( !initialized )
{
sift_info.addParam(this, "nFeatures", nfeatures);
sift_info.addParam(this, "nOctaveLayers", nOctaveLayers);
sift_info.addParam(this, "contrastThreshold", contrastThreshold);
sift_info.addParam(this, "edgeThreshold", edgeThreshold);
sift_info.addParam(this, "sigma", sigma);
SIFT obj;
sift_info.addParam(obj, "nFeatures", obj.nfeatures);
sift_info.addParam(obj, "nOctaveLayers", obj.nOctaveLayers);
sift_info.addParam(obj, "contrastThreshold", obj.contrastThreshold);
sift_info.addParam(obj, "edgeThreshold", obj.edgeThreshold);
sift_info.addParam(obj, "sigma", obj.sigma);
initialized = true;
}

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

@@ -930,11 +930,12 @@ AlgorithmInfo* SURF::info() const
static volatile bool initialized = false;
if( !initialized )
{
surf_info.addParam(this, "hessianThreshold", hessianThreshold);
surf_info.addParam(this, "nOctaves", nOctaves);
surf_info.addParam(this, "nOctaveLayers", nOctaveLayers);
surf_info.addParam(this, "extended", extended);
surf_info.addParam(this, "upright", upright);
SURF obj;
surf_info.addParam(obj, "hessianThreshold", obj.hessianThreshold);
surf_info.addParam(obj, "nOctaves", obj.nOctaves);
surf_info.addParam(obj, "nOctaveLayers", obj.nOctaveLayers);
surf_info.addParam(obj, "extended", obj.extended);
surf_info.addParam(obj, "upright", obj.upright);
initialized = true;
}