do not consider layer extents containing 'inf' or 'nan' for wms bounding box calculation

mhugent · mhugent · commit 433b0ab59dbb · 2006-07-10T13:32:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5583 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1941,6 +1941,13 @@ bool QgsWmsProvider::calculateExtent()
 	continue; //ignore extents of layers which cannot be transformed info the required CRS
       }
 
+    //make sure extent does not contain 'inf' or 'nan'
+    if(!isfinite(extent.xMin()) || !isfinite((int)extent.yMin()) || !isfinite(extent.xMax()) || \
+!isfinite((int)extent.yMax()))
+      {
+	continue;
+      }
+
     // add to the combined extent of all the active sublayers
     if (firstLayer)
     {

Original file line number	Diff line number	Diff line change
`@@ -1941,6 +1941,13 @@ bool QgsWmsProvider::calculateExtent()`
`1941`	`1941`	`continue; //ignore extents of layers which cannot be transformed info the required CRS`
`1942`	`1942`	`}`
`1943`	`1943`
	`1944`	`+ //make sure extent does not contain 'inf' or 'nan'`
	`1945`	`+ if(!isfinite(extent.xMin()) \|\| !isfinite((int)extent.yMin()) \|\| !isfinite(extent.xMax()) \|\| \`
	`1946`	`+!isfinite((int)extent.yMax()))`
	`1947`	`+ {`
	`1948`	`+ continue;`
	`1949`	`+ }`
	`1950`	`+`
`1944`	`1951`	`// add to the combined extent of all the active sublayers`
`1945`	`1952`	`if (firstLayer)`
`1946`	`1953`	`{`