Skip to content

Merge 3.4 #2688

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 5 commits into from
Sep 28, 2020
Merged

Merge 3.4 #2688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46dba0f
[moved from opencv] brush up by following the comments
tomoaki0705 Sep 25, 2020
5bef5c5
xfeatures2d: fix MSVS2019 build
alalek Sep 25, 2020
b8eca41
Merge pull request #2687 from alalek:fix_build_msvs2019
alalek Sep 28, 2020
b0a73f6
Merge moved code from opencv/3.4
alalek Sep 28, 2020
d643991
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Sep 28, 2020
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
6 changes: 4 additions & 2 deletions modules/cudaarithm/src/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,12 @@ void cv::cuda::flip(InputArray _src, OutputArray _dst, int flipCode, Stream& str

_dst.create(src.size(), src.type());
GpuMat dst = getOutputMat(_dst, src.size(), src.type(), stream);
if (src.data == dst.data && ((src.cols & 1) == 1 || (src.rows & 1) == 1))
bool isInplace = (src.data == dst.data) || (src.refcount == dst.refcount);
bool isSizeOdd = (src.cols & 1) == 1 || (src.rows & 1) == 1;
if (isInplace && isSizeOdd)
CV_Error(Error::BadROISize, "In-place version of flip only accepts even width/height");

if (src.data != dst.data)
if (isInplace == false)
funcs[src.depth()][src.channels() - 1](src, dst, flipCode, StreamAccessor::getStream(stream));
else // in-place
ifuncs[src.depth()][src.channels() - 1](src, flipCode, StreamAccessor::getStream(stream));
Expand Down
9 changes: 6 additions & 3 deletions modules/cudaarithm/test/test_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,14 @@ CUDA_TEST_P(Flip, Accuracy)

CUDA_TEST_P(Flip, AccuracyInplace)
{
size.width = (size.width >> 1) << 1; // in-place version only accepts even number
size.height = (size.height >> 1) << 1; // in-place version only accepts even number
cv::Mat src = randomMat(size, type);

bool isSizeOdd = ((size.width & 1) == 1) || ((size.height & 1) == 1);
cv::cuda::GpuMat srcDst = loadMat(src, useRoi);
if(isSizeOdd)
{
EXPECT_THROW(cv::cuda::flip(srcDst, srcDst, flip_code), cv::Exception);
return;
}
cv::cuda::flip(srcDst, srcDst, flip_code);

cv::Mat dst_gold;
Expand Down
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