If QgsRectangle is empty when combined, replace

It makes no sense to use an empty rectangle to combine with
qgis · Aug 29, 2016 · 280203e · 280203e
1 parent 9253228
commit 280203e
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
@@ -196,24 +196,31 @@ bool QgsRectangle::contains( const QgsPoint &p ) const
 
 void QgsRectangle::combineExtentWith( const QgsRectangle &rect )
 {
+  if ( isNull() )
+    *this = rect;
+  else
+  {
+    xmin = (( xmin < rect.xMinimum() ) ? xmin : rect.xMinimum() );
+    xmax = (( xmax > rect.xMaximum() ) ? xmax : rect.xMaximum() );
 
-  xmin = (( xmin < rect.xMinimum() ) ? xmin : rect.xMinimum() );
-  xmax = (( xmax > rect.xMaximum() ) ? xmax : rect.xMaximum() );
-
-  ymin = (( ymin < rect.yMinimum() ) ? ymin : rect.yMinimum() );
-  ymax = (( ymax > rect.yMaximum() ) ? ymax : rect.yMaximum() );
+    ymin = (( ymin < rect.yMinimum() ) ? ymin : rect.yMinimum() );
+    ymax = (( ymax > rect.yMaximum() ) ? ymax : rect.yMaximum() );
+  }
 
 }
 
 void QgsRectangle::combineExtentWith( double x, double y )
 {
+  if ( isNull() )
+    *this = QgsRectangle( x, y, x, y );
+  else
+  {
+    xmin = (( xmin < x ) ? xmin : x );
+    xmax = (( xmax > x ) ? xmax : x );
 
-  xmin = (( xmin < x ) ? xmin : x );
-  xmax = (( xmax > x ) ? xmax : x );
-
-  ymin = (( ymin < y ) ? ymin : y );
-  ymax = (( ymax > y ) ? ymax : y );
-
+    ymin = (( ymin < y ) ? ymin : y );
+    ymax = (( ymax > y ) ? ymax : y );
+  }
 }
 
 bool QgsRectangle::isEmpty() const