Skip to content

O
opencv
Commit 703921e2 authored by Marc Rollins's avatar Marc Rollins
Browse files
Options

Reverting pass-by-value changes to arithmetic operators.

parent 8fc18489
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
modules/core/include/opencv2/core/types.hpp
View file @ 703921e2
......@@ -1320,10 +1320,11 @@ Size_<_Tp>& operator *= (Size_<_Tp>& a, _Tp b)
}
template<typename _Tp> static inline
Size_<_Tp> operator * (Size_<_Tp> a, _Tp b)
Size_<_Tp> operator * (const Size_<_Tp>& a, _Tp b)
{
a *= b;
return a;
Size_<_Tp> tmp;
tmp *= b;
return tmp;
}
template<typename _Tp> static inline
......@@ -1335,10 +1336,11 @@ Size_<_Tp>& operator /= (Size_<_Tp>& a, _Tp b)
}
template<typename _Tp> static inline
Size_<_Tp> operator / (Size_<_Tp> a, _Tp b)
Size_<_Tp> operator / (const Size_<_Tp>& a, _Tp b)
{
a /= b;
return a;
Size_<_Tp> tmp;
tmp /= b;
return tmp;
}
template<typename _Tp> static inline
......@@ -1350,10 +1352,11 @@ Size_<_Tp>& operator += (Size_<_Tp>& a, const Size_<_Tp>& b)
}
template<typename _Tp> static inline
Size_<_Tp> operator + (Size_<_Tp> a, const Size_<_Tp>& b)
Size_<_Tp> operator + (const Size_<_Tp>& a, const Size_<_Tp>& b)
{
a += b;
return a;
Size_<_Tp> tmp;
tmp += b;
return tmp;
}
template<typename _Tp> static inline
......@@ -1365,10 +1368,11 @@ Size_<_Tp>& operator -= (Size_<_Tp>& a, const Size_<_Tp>& b)
}
template<typename _Tp> static inline
Size_<_Tp> operator - (Size_<_Tp> a, const Size_<_Tp>& b)
Size_<_Tp> operator - (const Size_<_Tp>& a, const Size_<_Tp>& b)
{
a -= b;
return a;
Size_<_Tp> tmp;
tmp -= b;
return tmp;
}
template<typename _Tp> static inline
......
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