Always consider two null rectangles as equal

qgis · Oct 6, 2023 · bcf3722 · bcf3722
1 parent f93e1a9
commit bcf3722
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
@@ -522,10 +522,12 @@ class CORE_EXPORT QgsRectangle
      */
     bool operator==( const QgsRectangle &r1 ) const
     {
-      return qgsDoubleNear( r1.xMaximum(), xMaximum() ) &&
-             qgsDoubleNear( r1.xMinimum(), xMinimum() ) &&
-             qgsDoubleNear( r1.yMaximum(), yMaximum() ) &&
-             qgsDoubleNear( r1.yMinimum(), yMinimum() );
+      return isNull() == r1.isNull() || (
+               qgsDoubleNear( r1.xMaximum(), xMaximum() ) &&
+               qgsDoubleNear( r1.xMinimum(), xMinimum() ) &&
+               qgsDoubleNear( r1.yMaximum(), yMaximum() ) &&
+               qgsDoubleNear( r1.yMinimum(), yMinimum() )
+             );
     }
 
     /**