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

Avoid duplicated variable declarations.

Browse Source
This commit is contained in:
Jose-Luis Blanco-Claraco 2013-10-21 15:57:11 +02:00
parent 52a904e17b
commit bec35eeddb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/src/orb.cpp
View File

@ -138,9 +138,9 @@ static void computeOrbDescriptor(const KeyPoint& kpt,
const uchar* center = &img.at<uchar>(cvRound(kpt.pt.y), cvRound(kpt.pt.x)); const uchar* center = &img.at<uchar>(cvRound(kpt.pt.y), cvRound(kpt.pt.x));
int step = (int)img.step; int step = (int)img.step;
#if 1
float x, y; float x, y;
int ix, iy; int ix, iy;
#if 1
#define GET_VALUE(idx) \ #define GET_VALUE(idx) \
(x = pattern[idx].x*a - pattern[idx].y*b, \ (x = pattern[idx].x*a - pattern[idx].y*b, \
y = pattern[idx].x*b + pattern[idx].y*a, \ y = pattern[idx].x*b + pattern[idx].y*a, \
@ -148,8 +148,6 @@ static void computeOrbDescriptor(const KeyPoint& kpt,
iy = cvRound(y), \ iy = cvRound(y), \
*(center + iy*step + ix) ) *(center + iy*step + ix) )
#else #else
float x, y;
int ix, iy;
#define GET_VALUE(idx) \ #define GET_VALUE(idx) \
(x = pattern[idx].x*a - pattern[idx].y*b, \ (x = pattern[idx].x*a - pattern[idx].y*b, \
y = pattern[idx].x*b + pattern[idx].y*a, \ y = pattern[idx].x*b + pattern[idx].y*a, \