Skip to content

xfeatures2d: fix MSVS2019 build #2687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2020
Merged

xfeatures2d: fix MSVS2019 build #2687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/xfeatures2d/src/stardetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,12 @@ StarDetectorComputeResponses( const Mat& img, Mat& responses, Mat& sizes,
for(int i = 0; i < npatterns; i++ )
{
int innerArea = f[pairs[i][1]].area;
#if 0 // workaround MSVS2019 bug: error C2109: subscript requires array or pointer type
int outerArea = f[pairs[i][0]].area - innerArea;
#else
int outerArea = f[pairs[i][0]].area;
outerArea -= innerArea;
#endif
invSizes[i][0] = 1.f/outerArea;
invSizes[i][1] = 1.f/innerArea;
}
Expand Down Expand Up @@ -283,7 +288,7 @@ StarDetectorComputeResponses( const Mat& img, Mat& responses, Mat& sizes,

for(int i = 0; i <= maxIdx; i++ )
{
const iiMatType** p = (const iiMatType**)&f[i].p[0];
const iiMatType** p = (const iiMatType**)f[i].p;
__m128i r0 = _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(p[0]+ofs)),
_mm_loadu_si128((const __m128i*)(p[1]+ofs)));
__m128i r1 = _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(p[3]+ofs)),
Expand Down Expand Up @@ -325,7 +330,7 @@ StarDetectorComputeResponses( const Mat& img, Mat& responses, Mat& sizes,

for(int i = 0; i <= maxIdx; i++ )
{
const iiMatType** p = (const iiMatType**)&f[i].p[0];
const iiMatType** p = (const iiMatType**)f[i].p;
vals[i] = (int)(p[0][ofs] - p[1][ofs] - p[2][ofs] + p[3][ofs] +
p[4][ofs] - p[5][ofs] - p[6][ofs] + p[7][ofs]);
}
Expand Down