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

fixing Mac build

Browse Source
This commit is contained in:
Adil Ibragimov 2014-08-07 17:06:22 +04:00
parent 98d5731ad8
commit 6b05ca589d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,7 @@ Mat::Mat(const Point3_<_Tp>& pt, bool copyData)
if( !copyData ) if( !copyData )
{ {
step[0] = step[1] = sizeof(_Tp); step[0] = step[1] = sizeof(_Tp);
data = datastart = (uchar*)&pt.x; datastart = data = (uchar*)&pt.x;
datalimit = dataend = datastart + rows * step[0]; datalimit = dataend = datastart + rows * step[0];
} }
else else
@ -1044,7 +1044,7 @@ void Mat::push_back(const _Tp& elem)
} }
CV_Assert(DataType<_Tp>::type == type() && cols == 1 CV_Assert(DataType<_Tp>::type == type() && cols == 1
/* && dims == 2 (cols == 1 implies dims == 2) */); /* && dims == 2 (cols == 1 implies dims == 2) */);
uchar* tmp = dataend + step[0]; const uchar* tmp = dataend + step[0];
if( !isSubmatrix() && isContinuous() && tmp <= datalimit ) if( !isSubmatrix() && isContinuous() && tmp <= datalimit )
{ {
*(_Tp*)(data + (size.p[0]++) * step.p[0]) = elem; *(_Tp*)(data + (size.p[0]++) * step.p[0]) = elem;