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

fixed linker error undo mingw (#657)

Browse Source
This commit is contained in:
Maria Dimashova 2010-11-16 15:42:31 +00:00
parent 0ad9edfbd5
commit 0af4d09aa9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/features2d/include/opencv2/features2d/features2d.hpp
View File

@ -266,7 +266,7 @@ CV_EXPORTS void read(const FileNode& node, CV_OUT vector<KeyPoint>& keypoints);
class CV_EXPORTS SIFT class CV_EXPORTS SIFT
{ {
public: public:
struct CommonParams struct CV_EXPORTS CommonParams
{ {
static const int DEFAULT_NOCTAVES = 4; static const int DEFAULT_NOCTAVES = 4;
static const int DEFAULT_NOCTAVE_LAYERS = 3; static const int DEFAULT_NOCTAVE_LAYERS = 3;
@ -279,7 +279,7 @@ public:
int angleMode; int angleMode;
}; };
struct DetectorParams struct CV_EXPORTS DetectorParams
{ {
static double GET_DEFAULT_THRESHOLD() { return 0.04 / SIFT::CommonParams::DEFAULT_NOCTAVE_LAYERS / 2.0; } static double GET_DEFAULT_THRESHOLD() { return 0.04 / SIFT::CommonParams::DEFAULT_NOCTAVE_LAYERS / 2.0; }
static double GET_DEFAULT_EDGE_THRESHOLD() { return 10.0; } static double GET_DEFAULT_EDGE_THRESHOLD() { return 10.0; }
@ -289,7 +289,7 @@ public:
double threshold, edgeThreshold; double threshold, edgeThreshold;
}; };
struct DescriptorParams struct CV_EXPORTS DescriptorParams
{ {
static double GET_DEFAULT_MAGNIFICATION() { return 3.0; } static double GET_DEFAULT_MAGNIFICATION() { return 3.0; }
static const bool DEFAULT_IS_NORMALIZE = true; static const bool DEFAULT_IS_NORMALIZE = true;
@ -2143,7 +2143,7 @@ CV_EXPORTS Ptr<DescriptorMatcher> createDescriptorMatcher( const string& descrip
* GenericDescriptorMatcher * * GenericDescriptorMatcher *
\****************************************************************************************/ \****************************************************************************************/
/* /*
* Abstract interface for a keypoint descriptor * Abstract interface for a keypoint descriptor and matcher
*/ */
class GenericDescriptorMatcher; class GenericDescriptorMatcher;
typedef GenericDescriptorMatcher GenericDescriptorMatch; typedef GenericDescriptorMatcher GenericDescriptorMatch;