From 6b05ca589d689e13c431f60d98e6a4abd5d6c7ff Mon Sep 17 00:00:00 2001 From: Adil Ibragimov Date: Thu, 7 Aug 2014 17:06:22 +0400 Subject: [PATCH] fixing Mac build --- modules/core/include/opencv2/core/mat.inl.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp index e44ed2f..6923146 100644 --- a/modules/core/include/opencv2/core/mat.inl.hpp +++ b/modules/core/include/opencv2/core/mat.inl.hpp @@ -504,7 +504,7 @@ Mat::Mat(const Point3_<_Tp>& pt, bool copyData) if( !copyData ) { step[0] = step[1] = sizeof(_Tp); - data = datastart = (uchar*)&pt.x; + datastart = data = (uchar*)&pt.x; datalimit = dataend = datastart + rows * step[0]; } else @@ -1044,7 +1044,7 @@ void Mat::push_back(const _Tp& elem) } CV_Assert(DataType<_Tp>::type == type() && cols == 1 /* && dims == 2 (cols == 1 implies dims == 2) */); - uchar* tmp = dataend + step[0]; + const uchar* tmp = dataend + step[0]; if( !isSubmatrix() && isContinuous() && tmp <= datalimit ) { *(_Tp*)(data + (size.p[0]++) * step.p[0]) = elem; -- 2.7.4