Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverting pass-by-value changes to arithmetic operators.

Browse Source
pull/3127/head
Marc Rollins 11 years ago
parent 8fc1848918
commit 703921e2fd
1 changed files with 16 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      modules/core/include/opencv2/core/types.hpp

28
modules/core/include/opencv2/core/types.hpp
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save