projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2079d6
)
added check if src.size() == dst.size() to gpu::resize
author
Vladislav Vinogradov
<no@email>
Mon, 12 Sep 2011 10:23:20 +0000
(10:23 +0000)
committer
Vladislav Vinogradov
<no@email>
Mon, 12 Sep 2011 10:23:20 +0000
(10:23 +0000)
modules/gpu/src/imgproc.cpp
patch
|
blob
|
history
diff --git
a/modules/gpu/src/imgproc.cpp
b/modules/gpu/src/imgproc.cpp
index
b9d3607
..
6eda811
100644
(file)
--- a/
modules/gpu/src/imgproc.cpp
+++ b/
modules/gpu/src/imgproc.cpp
@@
-308,6
+308,15
@@
void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx, doub
\r
dst.create(dsize, src.type());
\r
\r
+ if (dsize == src.size())
\r
+ {
\r
+ if (s)
\r
+ s.enqueueCopy(src, dst);
\r
+ else
\r
+ src.copyTo(dst);
\r
+ return;
\r
+ }
\r
+
\r
cudaStream_t stream = StreamAccessor::getStream(s);
\r
\r
if ((src.type() == CV_8UC1 || src.type() == CV_8UC4) && (interpolation == INTER_NEAREST || interpolation == INTER_LINEAR))
\r