Fix incorrect calculation of raster layer units per pixel x/y

nyalldawson · nyalldawson · commit cd052d3ba3c6 · 2018-04-03T09:50:16.000+10:00
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -540,7 +540,7 @@ double QgsRasterLayer::rasterUnitsPerPixelX() const
 // We can only use one of the mGeoTransform[], so go with the
 // horisontal one.
 
-  if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && mDataProvider->xSize() > 0 )
+  if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && !qgsDoubleNear( mDataProvider->xSize(), 0.0 ) )
   {
     return mDataProvider->extent().width() / mDataProvider->xSize();
   }
@@ -549,7 +549,7 @@ double QgsRasterLayer::rasterUnitsPerPixelX() const
 
 double QgsRasterLayer::rasterUnitsPerPixelY() const
 {
-  if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && mDataProvider->xSize() > 0 )
+  if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && !qgsDoubleNear( mDataProvider->ySize(), 0.0 ) )
   {
     return mDataProvider->extent().height() / mDataProvider->ySize();
   }

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ double QgsRasterLayer::rasterUnitsPerPixelX() const`
`540`	`540`	`// We can only use one of the mGeoTransform[], so go with the`
`541`	`541`	`// horisontal one.`
`542`	`542`
`543`		`- if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && mDataProvider->xSize() > 0 )`
	`543`	`+ if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && !qgsDoubleNear( mDataProvider->xSize(), 0.0 ) )`
`544`	`544`	`{`
`545`	`545`	`return mDataProvider->extent().width() / mDataProvider->xSize();`
`546`	`546`	`}`
`@@ -549,7 +549,7 @@ double QgsRasterLayer::rasterUnitsPerPixelX() const`
`549`	`549`
`550`	`550`	`double QgsRasterLayer::rasterUnitsPerPixelY() const`
`551`	`551`	`{`
`552`		`- if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && mDataProvider->xSize() > 0 )`
	`552`	`+ if ( mDataProvider->capabilities() & QgsRasterDataProvider::Size && !qgsDoubleNear( mDataProvider->ySize(), 0.0 ) )`
`553`	`553`	`{`
`554`	`554`	`return mDataProvider->extent().height() / mDataProvider->ySize();`
`555`	`555`	`}`