opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00
Code Issues Releases Wiki Activity

Fixing GCC 4.9 warning

Browse Source
This commit is contained in:
Maksim Shabunin
2015-07-22 16:00:38 +03:00
parent 865346fdbe
commit aafda8fa66
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/xfeatures2d/src/stardetector.cpp
View File

@@ -144,8 +144,9 @@ StarDetectorComputeResponses( const Mat& img, Mat& responses, Mat& sizes,
{ {
const int MAX_PATTERN = 17; const int MAX_PATTERN = 17;
static const int sizes0[] = {1, 2, 3, 4, 6, 8, 11, 12, 16, 22, 23, 32, 45, 46, 64, 90, 128, -1}; static const int sizes0[] = {1, 2, 3, 4, 6, 8, 11, 12, 16, 22, 23, 32, 45, 46, 64, 90, 128, -1};
static const int pairs[][2] = {{1, 0}, {3, 1}, {4, 2}, {5, 3}, {7, 4}, {8, 5}, {9, 6}, static const int pairs[12][2] = {{1, 0}, {3, 1}, {4, 2}, {5, 3}, {7, 4}, {8, 5}, {9, 6},
{11, 8}, {13, 10}, {14, 11}, {15, 12}, {16, 14}, {-1, -1}}; {11, 8}, {13, 10}, {14, 11}, {15, 12}, {16, 14}};
const int MAX_PAIR = sizeof(pairs)/sizeof(pairs[0]);
float invSizes[MAX_PATTERN][2]; float invSizes[MAX_PATTERN][2];
int sizes1[MAX_PATTERN]; int sizes1[MAX_PATTERN];
@@ -172,14 +173,15 @@ StarDetectorComputeResponses( const Mat& img, Mat& responses, Mat& sizes,
responses.create( img.size(), CV_32F ); responses.create( img.size(), CV_32F );
sizes.create( img.size(), CV_16S ); sizes.create( img.size(), CV_16S );
while( pairs[npatterns][0] >= 0 && ! while( npatterns < MAX_PAIR && !
( sizes0[pairs[npatterns][0]] >= maxSize ( sizes0[pairs[npatterns][0]] >= maxSize
|| sizes0[pairs[npatterns+1][0]] + sizes0[pairs[npatterns+1][0]]/2 >= std::min(rows, cols) ) ) || sizes0[pairs[npatterns+1][0]] + sizes0[pairs[npatterns+1][0]]/2 >= std::min(rows, cols) ) )
{ {
++npatterns; ++npatterns;
} }
npatterns += (pairs[npatterns-1][0] >= 0); if (npatterns-1 < MAX_PAIR)
++npatterns;
maxIdx = pairs[npatterns-1][0]; maxIdx = pairs[npatterns-1][0];
// Create the integral image appropriate for our type & usage // Create the integral image appropriate for our type & usage