Merge pull request opencv#9286 from alalek:rect_size_empty

alalek · alalek · commit d8c70e2e73b3 · 2017-08-02T20:20:16.000Z
diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp
@@ -301,6 +301,8 @@ template<typename _Tp> class Size_
     Size_& operator = (const Size_& sz);
     //! the area (width*height)
     _Tp area() const;
+    //! true if empty
+    bool empty() const;
 
     //! conversion of another data type.
     template<typename _Tp2> operator Size_<_Tp2>() const;
@@ -400,6 +402,8 @@ template<typename _Tp> class Rect_
     Size_<_Tp> size() const;
     //! area (width*height) of the rectangle
     _Tp area() const;
+    //! true if empty
+    bool empty() const;
 
     //! conversion to another data type
     template<typename _Tp2> operator Rect_<_Tp2>() const;
@@ -1599,6 +1603,13 @@ _Tp Size_<_Tp>::area() const
     return result;
 }
 
+template<typename _Tp> inline
+bool Size_<_Tp>::empty() const
+{
+    return width <= 0 || height <= 0;
+}
+
+
 template<typename _Tp> static inline
 Size_<_Tp>& operator *= (Size_<_Tp>& a, _Tp b)
 {
@@ -1741,6 +1752,12 @@ _Tp Rect_<_Tp>::area() const
     return result;
 }
 
+template<typename _Tp> inline
+bool Rect_<_Tp>::empty() const
+{
+    return width <= 0 || height <= 0;
+}
+
 template<typename _Tp> template<typename _Tp2> inline
 Rect_<_Tp>::operator Rect_<_Tp2>() const
 {
@@ -1803,10 +1820,10 @@ Rect_<_Tp>& operator &= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
 template<typename _Tp> static inline
 Rect_<_Tp>& operator |= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
 {
-    if (!a.area()) {
+    if (a.empty()) {
         a = b;
     }
-    else if (b.area()) {
+    else if (!b.empty()) {
         _Tp x1 = std::min(a.x, b.x);
         _Tp y1 = std::min(a.y, b.y);
         a.width = std::max(a.x + a.width, b.x + b.width) - x1;
diff --git a/modules/core/misc/java/src/java/core+Rect.java b/modules/core/misc/java/src/java/core+Rect.java
@@ -65,6 +65,10 @@ public double area() {
         return width * height;
     }
 
+    public boolean empty() {
+        return width <= 0 || height <= 0;
+    }
+
     public boolean contains(Point p) {
         return x <= p.x && p.x < x + width && y <= p.y && p.y < y + height;
     }
diff --git a/modules/core/misc/java/src/java/core+Rect2d.java b/modules/core/misc/java/src/java/core+Rect2d.java
@@ -65,6 +65,10 @@ public double area() {
         return width * height;
     }
 
+    public boolean empty() {
+        return width <= 0 || height <= 0;
+    }
+
     public boolean contains(Point p) {
         return x <= p.x && p.x < x + width && y <= p.y && p.y < y + height;
     }
diff --git a/modules/core/misc/java/src/java/core+Size.java b/modules/core/misc/java/src/java/core+Size.java
@@ -37,6 +37,10 @@ public double area() {
         return width * height;
     }
 
+    public boolean empty() {
+        return width <= 0 || height <= 0;
+    }
+
     public Size clone() {
         return new Size(width, height);
     }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public double area() {`
`65`	`65`	`return width * height;`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public boolean empty() {`
	`69`	`+ return width <= 0 \|\| height <= 0;`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`public boolean contains(Point p) {`
`69`	`73`	`return x <= p.x && p.x < x + width && y <= p.y && p.y < y + height;`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ public double area() {`
`37`	`37`	`return width * height;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public boolean empty() {`
	`41`	`+ return width <= 0 \|\| height <= 0;`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`public Size clone() {`
`41`	`45`	`return new Size(width, height);`
`42`	`46`	`}`