Fix incorrect data type for GDAL layers with gain/offset (fix #11573)

nyalldawson · nyalldawson · commit 326b4989f0b0 · 2015-03-10T22:56:43.000+11:00
Test was incorrectly checking for both offset and gain, when it
should have been testing for either.
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -2650,9 +2650,9 @@ void QgsGdalProvider::initBaseDataset()
     // define if the band has scale and offset to apply
     double myScale = bandScale( i );
     double myOffset = bandOffset( i );
-    if ( myScale != 1.0 && myOffset != 0.0 )
+    if ( !qgsDoubleNear( myScale, 1.0 ) || !qgsDoubleNear( myOffset, 0.0 ) )
     {
-      // if the band has scale and offset to apply change dataType
+      // if the band has scale or offset to apply change dataType
       switch ( myGdalDataType )
       {
         case GDT_Unknown:

Original file line number	Diff line number	Diff line change
`@@ -2650,9 +2650,9 @@ void QgsGdalProvider::initBaseDataset()`
`2650`	`2650`	`// define if the band has scale and offset to apply`
`2651`	`2651`	`double myScale = bandScale( i );`
`2652`	`2652`	`double myOffset = bandOffset( i );`
`2653`		`- if ( myScale != 1.0 && myOffset != 0.0 )`
	`2653`	`+ if ( !qgsDoubleNear( myScale, 1.0 ) \|\| !qgsDoubleNear( myOffset, 0.0 ) )`
`2654`	`2654`	`{`
`2655`		`- // if the band has scale and offset to apply change dataType`
	`2655`	`+ // if the band has scale or offset to apply change dataType`
`2656`	`2656`	`switch ( myGdalDataType )`
`2657`	`2657`	`{`
`2658`	`2658`	`case GDT_Unknown:`