From bec35eeddb185ce9480ba2f413bd63c5cc5e90d7 Mon Sep 17 00:00:00 2001 From: Jose-Luis Blanco-Claraco Date: Mon, 21 Oct 2013 15:57:11 +0200 Subject: [PATCH] Avoid duplicated variable declarations. --- modules/features2d/src/orb.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/features2d/src/orb.cpp b/modules/features2d/src/orb.cpp index 5790faf..8d12060 100644 --- a/modules/features2d/src/orb.cpp +++ b/modules/features2d/src/orb.cpp @@ -138,9 +138,9 @@ static void computeOrbDescriptor(const KeyPoint& kpt, const uchar* center = &img.at(cvRound(kpt.pt.y), cvRound(kpt.pt.x)); int step = (int)img.step; -#if 1 float x, y; int ix, iy; +#if 1 #define GET_VALUE(idx) \ (x = pattern[idx].x*a - pattern[idx].y*b, \ y = pattern[idx].x*b + pattern[idx].y*a, \ @@ -148,8 +148,6 @@ static void computeOrbDescriptor(const KeyPoint& kpt, iy = cvRound(y), \ *(center + iy*step + ix) ) #else - float x, y; - int ix, iy; #define GET_VALUE(idx) \ (x = pattern[idx].x*a - pattern[idx].y*b, \ y = pattern[idx].x*b + pattern[idx].y*a, \ -- 2.7.4