Reverting pass-by-value changes to arithmetic operators.

703921e2 · Marc Rollins · 8fc18489 · 703921e2
Commit 703921e2 authored Aug 21, 2014 by Marc Rollins
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 12 deletions

types.hpp modules/core/include/opencv2/core/types.hpp +16 -12

No files found.
--- a/modules/core/include/opencv2/core/types.hpp
+++ b/modules/core/include/opencv2/core/types.hpp
@@ -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;
+    Size_<_Tp> tmp;
-    return a;
+    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;
+    Size_<_Tp> tmp;
-    return a;
+    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;
+    Size_<_Tp> tmp;
-    return a;
+    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;
+    Size_<_Tp> tmp;
-    return a;
+    tmp -= b;
+    return tmp;
 }
 template<typename _Tp> static inline