Merge pull request opencv#3127 from GravityJack:size-math-ops

flyskybingo · Aug 22, 2014 · 0eb1c7e · 0eb1c7e
2 parents b56933d + 17e8d51
commit 0eb1c7e
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp
@@ -1311,23 +1311,36 @@ _Tp Size_<_Tp>::area() const
     return width * height;
 }
 
+template<typename _Tp> static inline
+Size_<_Tp>& operator *= (Size_<_Tp>& a, _Tp b)
+{
+    a.width *= b;
+    a.height *= b;
+    return a;
+}
 
 template<typename _Tp> static inline
 Size_<_Tp> operator * (const Size_<_Tp>& a, _Tp b)
 {
-    return Size_<_Tp>(a.width * b, a.height * b);
+    Size_<_Tp> tmp(a);
+    tmp *= b;
+    return tmp;
 }
 
 template<typename _Tp> static inline
-Size_<_Tp> operator + (const Size_<_Tp>& a, const Size_<_Tp>& b)
+Size_<_Tp>& operator /= (Size_<_Tp>& a, _Tp b)
 {
-    return Size_<_Tp>(a.width + b.width, a.height + b.height);
+    a.width /= b;
+    a.height /= b;
+    return a;
 }
 
 template<typename _Tp> static inline
-Size_<_Tp> operator - (const Size_<_Tp>& a, const Size_<_Tp>& b)
+Size_<_Tp> operator / (const Size_<_Tp>& a, _Tp b)
 {
-    return Size_<_Tp>(a.width - b.width, a.height - b.height);
+    Size_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
 }
 
 template<typename _Tp> static inline
@@ -1338,6 +1351,14 @@ Size_<_Tp>& operator += (Size_<_Tp>& a, const Size_<_Tp>& b)
     return a;
 }
 
+template<typename _Tp> static inline
+Size_<_Tp> operator + (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    Size_<_Tp> tmp(a);
+    tmp += b;
+    return tmp;
+}
+
 template<typename _Tp> static inline
 Size_<_Tp>& operator -= (Size_<_Tp>& a, const Size_<_Tp>& b)
 {
@@ -1346,6 +1367,14 @@ Size_<_Tp>& operator -= (Size_<_Tp>& a, const Size_<_Tp>& b)
     return a;
 }
 
+template<typename _Tp> static inline
+Size_<_Tp> operator - (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    Size_<_Tp> tmp(a);
+    tmp -= b;
+    return tmp;
+}
+
 template<typename _Tp> static inline
 bool operator == (const Size_<_Tp>& a, const Size_<_Tp>& b)
 {
@@ -1355,7 +1384,7 @@ bool operator == (const Size_<_Tp>& a, const Size_<_Tp>& b)
 template<typename _Tp> static inline
 bool operator != (const Size_<_Tp>& a, const Size_<_Tp>& b)
 {
-    return a.width != b.width || a.height != b.height;
+    return !(a == b);
 }