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:
ee97a5e
)
Removed an unnecessary workaround for matrix-to-vector copyTo.
author
Roman Donchenko
<roman.donchenko@itseez.com>
Fri, 17 Jan 2014 10:16:22 +0000
(14:16 +0400)
committer
Roman Donchenko
<roman.donchenko@itseez.com>
Fri, 17 Jan 2014 10:16:22 +0000
(14:16 +0400)
modules/core/src/copy.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/copy.cpp
b/modules/core/src/copy.cpp
index
b87d080
..
b8d87fc
100644
(file)
--- a/
modules/core/src/copy.cpp
+++ b/
modules/core/src/copy.cpp
@@
-232,10
+232,7
@@
void Mat::copyTo( OutputArray _dst ) const
const uchar* sptr = data;
uchar* dptr = dst.data;
- // to handle the copying 1xn matrix => nx1 std vector.
- Size sz = size() == dst.size() ?
- getContinuousSize(*this, dst) :
- getContinuousSize(*this);
+ Size sz = getContinuousSize(*this, dst);
size_t len = sz.width*elemSize();
for( ; sz.height--; sptr += step, dptr += dst.step )