Skip to content

O
opencv
Commit 6b05ca58 authored by Adil Ibragimov's avatar Adil Ibragimov
Browse files
Options

fixing Mac build

parent 98d5731a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/include/opencv2/core/mat.inl.hpp
View file @ 6b05ca58
...@@ -504,7 +504,7 @@ Mat::Mat(const Point3_<_Tp>& pt, bool copyData) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment