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

cosmetic changes

Browse Source
This commit is contained in:
Vladimir Dudnik 2010-12-23 23:01:18 +00:00
parent c9d20500ce
commit e92d0e4bc2
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,10 +55,12 @@ extern "C" {
typedef struct CvSURFPoint typedef struct CvSURFPoint
{ {
CvPoint2D32f pt; CvPoint2D32f pt;
int laplacian;
int size; int laplacian;
float dir; int size;
float hessian; float dir;
float hessian;
} CvSURFPoint; } CvSURFPoint;
CV_INLINE CvSURFPoint cvSURFPoint( CvPoint2D32f pt, int laplacian, CV_INLINE CvSURFPoint cvSURFPoint( CvPoint2D32f pt, int laplacian,
@ -66,21 +68,24 @@ CV_INLINE CvSURFPoint cvSURFPoint( CvPoint2D32f pt, int laplacian,
float hessian CV_DEFAULT(0)) float hessian CV_DEFAULT(0))
{ {
CvSURFPoint kp; CvSURFPoint kp;
kp.pt = pt;
kp.pt = pt;
kp.laplacian = laplacian; kp.laplacian = laplacian;
kp.size = size; kp.size = size;
kp.dir = dir; kp.dir = dir;
kp.hessian = hessian; kp.hessian = hessian;
return kp; return kp;
} }
typedef struct CvSURFParams typedef struct CvSURFParams
{ {
int extended; int extended;
double hessianThreshold; double hessianThreshold;
int nOctaves; int nOctaves;
int nOctaveLayers; int nOctaveLayers;
} CvSURFParams; } CvSURFParams;
CVAPI(CvSURFParams) cvSURFParams( double hessianThreshold, int extended CV_DEFAULT(0) ); CVAPI(CvSURFParams) cvSURFParams( double hessianThreshold, int extended CV_DEFAULT(0) );
@ -271,7 +276,7 @@ public:
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;
static const int DEFAULT_FIRST_OCTAVE = -1; static const int DEFAULT_FIRST_OCTAVE = -1;
enum{ FIRST_ANGLE = 0, AVERAGE_ANGLE = 1 }; enum { FIRST_ANGLE = 0, AVERAGE_ANGLE = 1 };
CommonParams(); CommonParams();
CommonParams( int _nOctaves, int _nOctaveLayers, int _firstOctave, int _angleMode ); CommonParams( int _nOctaves, int _nOctaveLayers, int _firstOctave, int _angleMode );