mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2388 from alalek:coverity_bug_fix

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-02-24 16:54:44 +04:00 committed by OpenCV Buildbot
commit 3845b96f6c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/mat.inl.hpp
View File

@ -3140,7 +3140,7 @@ UMat::UMat(const UMat& m)
template<typename _Tp> inline template<typename _Tp> inline
UMat::UMat(const std::vector<_Tp>& vec, bool copyData) UMat::UMat(const std::vector<_Tp>& vec, bool copyData)
: flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()), : flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()),
cols(1), allocator(0), u(0), offset(0), size(&rows) cols(1), allocator(0), usageFlags(USAGE_DEFAULT), u(0), offset(0), size(&rows)
{ {
if(vec.empty()) if(vec.empty())
return; return;

6
modules/core/src/umatrix.cpp
View File

@ -305,7 +305,7 @@ void UMat::deallocate()
UMat::UMat(const UMat& m, const Range& _rowRange, const Range& _colRange) UMat::UMat(const UMat& m, const Range& _rowRange, const Range& _colRange)
: flags(MAGIC_VAL), dims(0), rows(0), cols(0), allocator(0), u(0), offset(0), size(&rows) : flags(MAGIC_VAL), dims(0), rows(0), cols(0), allocator(0), usageFlags(USAGE_DEFAULT), u(0), offset(0), size(&rows)
{ {
CV_Assert( m.dims >= 2 ); CV_Assert( m.dims >= 2 );
if( m.dims > 2 ) if( m.dims > 2 )
@ -350,7 +350,7 @@ UMat::UMat(const UMat& m, const Range& _rowRange, const Range& _colRange)
UMat::UMat(const UMat& m, const Rect& roi) UMat::UMat(const UMat& m, const Rect& roi)
: flags(m.flags), dims(2), rows(roi.height), cols(roi.width), : flags(m.flags), dims(2), rows(roi.height), cols(roi.width),
allocator(m.allocator), u(m.u), offset(m.offset + roi.y*m.step[0]), size(&rows) allocator(m.allocator), usageFlags(m.usageFlags), u(m.u), offset(m.offset + roi.y*m.step[0]), size(&rows)
{ {
CV_Assert( m.dims <= 2 ); CV_Assert( m.dims <= 2 );
flags &= roi.width < m.cols ? ~CONTINUOUS_FLAG : -1; flags &= roi.width < m.cols ? ~CONTINUOUS_FLAG : -1;
@ -376,7 +376,7 @@ UMat::UMat(const UMat& m, const Rect& roi)
UMat::UMat(const UMat& m, const Range* ranges) UMat::UMat(const UMat& m, const Range* ranges)
: flags(MAGIC_VAL), dims(0), rows(0), cols(0), allocator(0), u(0), offset(0), size(&rows) : flags(MAGIC_VAL), dims(0), rows(0), cols(0), allocator(0), usageFlags(USAGE_DEFAULT), u(0), offset(0), size(&rows)
{ {
int i, d = m.dims; int i, d = m.dims;