Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
fb9d59ab
Commit
fb9d59ab
authored
Nov 18, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15937 from clunietp:3.4-fix-13577
parents
f4d55d51
2185bce4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
test_umat.cpp
modules/core/test/test_umat.cpp
+12
-0
resize.cpp
modules/imgproc/src/resize.cpp
+5
-0
No files found.
modules/core/test/test_umat.cpp
View file @
fb9d59ab
...
...
@@ -1383,4 +1383,16 @@ TEST(UMat, testTempObjects_Mat_issue_8693)
EXPECT_EQ
(
0
,
cvtest
::
norm
(
srcUMat
.
getMat
(
ACCESS_READ
),
srcMat
,
NORM_INF
));
}
TEST
(
UMat
,
resize_Mat_issue_13577
)
{
// save the current state
bool
useOCL
=
cv
::
ocl
::
useOpenCL
();
cv
::
ocl
::
setUseOpenCL
(
false
);
UMat
foo
(
10
,
10
,
CV_32FC1
);
cv
::
resize
(
foo
,
foo
,
cv
::
Size
(),
.5
,
.5
);
cv
::
ocl
::
setUseOpenCL
(
useOCL
);
// restore state
}
}
}
// namespace opencv_test::ocl
modules/imgproc/src/resize.cpp
View file @
fb9d59ab
...
...
@@ -3738,6 +3738,11 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
CV_OCL_RUN
(
_src
.
dims
()
<=
2
&&
_dst
.
isUMat
()
&&
_src
.
cols
()
>
10
&&
_src
.
rows
()
>
10
,
ocl_resize
(
_src
,
_dst
,
dsize
,
inv_scale_x
,
inv_scale_y
,
interpolation
))
// Fake reference to source. Resolves issue 13577 in case of src == dst.
UMat
srcUMat
;
if
(
_src
.
isUMat
())
srcUMat
=
_src
.
getUMat
();
Mat
src
=
_src
.
getMat
();
_dst
.
create
(
dsize
,
src
.
type
());
Mat
dst
=
_dst
.
getMat
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment