generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed crash in I/O tests on Windows by making sure std::vector is non-empty before taking pointer to its elements

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-05 20:23:53 +00:00
parent 32d72047d5
commit cdc5bbc0bc
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/include/opencv2/core/operations.hpp
View File

@@ -2277,7 +2277,7 @@ public:
{ set((_Tp*)&vec.val[0], n, true); }
Vector(const std::vector<_Tp>& vec, bool _copyData=false)
{ set((_Tp*)&vec[0], vec.size(), _copyData); }
{ set(!vec.empty() ? (_Tp*)&vec[0] : 0, vec.size(), _copyData); }
Vector(const Vector& d) { *this = d; }
@@ -2445,6 +2445,8 @@ dot(const Vector<_Tp>& v1, const Vector<_Tp>& v2)
assert(v1.size() == v2.size());
_Tw s = 0;
if( n > 0 )
{
const _Tp *ptr1 = &v1[0], *ptr2 = &v2[0];
#if CV_ENABLE_UNROLLED
for(; i <= n - 4; i += 4 )
@@ -2453,6 +2455,7 @@ dot(const Vector<_Tp>& v1, const Vector<_Tp>& v2)
#endif
for( ; i < n; i++ )
s += (_Tw)ptr1[i]*ptr2[i];
}
return s;
}
@@ -3012,7 +3015,7 @@ public:
size_t remaining1 = remaining/cn;
count = count < remaining1 ? count : remaining1;
vec.resize(count);
it->readRaw( string(fmt), (uchar*)&vec[0], count*sizeof(_Tp) );
it->readRaw( string(fmt), !vec.empty() ? (uchar*)&vec[0] : 0, count*sizeof(_Tp) );
}
FileNodeIterator* it;
};