Fix for nan extents when using the 'zoom out' tool and height or width of window is 0

mhugent · mhugent · commit a72005e603ea · 2006-11-10T08:22:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6068 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
@@ -91,13 +91,20 @@ void QgsMapToolZoom::canvasReleaseEvent(QMouseEvent * e)
       double sf;
       if (mZoomRect.width() > mZoomRect.height())
       {
+	if(r.width() == 0)//prevent nan map extent
+	  {
+	    return;
+	  }
         sf = extent.width() / r.width();
       }
       else
       {
+	if(r.height() == 0)//prevent nan map extent
+	  {
+	    return;
+	  }
         sf = extent.height() / r.height();
       }
-              
       r.expand(sf);
             
   #ifdef QGISDEBUG

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,20 @@ void QgsMapToolZoom::canvasReleaseEvent(QMouseEvent * e)`
`91`	`91`	`double sf;`
`92`	`92`	`if (mZoomRect.width() > mZoomRect.height())`
`93`	`93`	`{`
	`94`	`+ if(r.width() == 0)//prevent nan map extent`
	`95`	`+ {`
	`96`	`+ return;`
	`97`	`+ }`
`94`	`98`	`sf = extent.width() / r.width();`
`95`	`99`	`}`
`96`	`100`	`else`
`97`	`101`	`{`
	`102`	`+ if(r.height() == 0)//prevent nan map extent`
	`103`	`+ {`
	`104`	`+ return;`
	`105`	`+ }`
`98`	`106`	`sf = extent.height() / r.height();`
`99`	`107`	`}`
`100`		`-`
`101`	`108`	`r.expand(sf);`
`102`	`109`
`103`	`110`	`#ifdef QGISDEBUG`