Followup 914ecc, also fix calculation of srcDataType

nyalldawson · nyalldawson · commit 44377073c4a5 · 2015-03-10T22:54:13.000+11:00
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -1091,9 +1091,9 @@ QGis::DataType QgsGdalProvider::srcDataType( int bandNo ) const
   // define if the band has scale and offset to apply
   double myScale = bandScale( bandNo );
   double myOffset = bandOffset( bandNo );
-  if ( myScale != 1.0 && myOffset != 0.0 )
+  if ( myScale != 1.0 || 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 ( myDataType )
     {
       case QGis::UnknownDataType:

Original file line number	Diff line number	Diff line change
`@@ -1091,9 +1091,9 @@ QGis::DataType QgsGdalProvider::srcDataType( int bandNo ) const`
`1091`	`1091`	`// define if the band has scale and offset to apply`
`1092`	`1092`	`double myScale = bandScale( bandNo );`
`1093`	`1093`	`double myOffset = bandOffset( bandNo );`
`1094`		`- if ( myScale != 1.0 && myOffset != 0.0 )`
	`1094`	`+ if ( myScale != 1.0 \|\| myOffset != 0.0 )`
`1095`	`1095`	`{`
`1096`		`- // if the band has scale and offset to apply change dataType`
	`1096`	`+ // if the band has scale or offset to apply change dataType`
`1097`	`1097`	`switch ( myDataType )`
`1098`	`1098`	`{`
`1099`	`1099`	`case QGis::UnknownDataType:`