use qIsNaN to test for NaNs

jef-n · jef-n · commit b399c1e1d1fd · 2014-01-25T13:33:35.000+01:00
diff --git a/src/core/raster/qgsrastertransparency.cpp b/src/core/raster/qgsrastertransparency.cpp
@@ -104,7 +104,7 @@ void QgsRasterTransparency::setTransparentThreeValuePixelList( QList<QgsRasterTr
 int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparency ) const
 {
   //if NaN return 0, transparent
-  if ( theValue != theValue )
+  if ( qIsNaN(theValue) )
   {
     return 0;
   }
@@ -144,7 +144,7 @@ int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparenc
 int QgsRasterTransparency::alphaValue( double theRedValue, double theGreenValue, double theBlueValue, int theGlobalTransparency ) const
 {
   //if NaN return 0, transparent
-  if ( theRedValue != theRedValue || theGreenValue != theGreenValue || theBlueValue != theBlueValue )
+  if ( qIsNaN(theRedValue) || qIsNaN(theGreenValue) || qIsNaN(theBlueValue) )
   {
     return 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void QgsRasterTransparency::setTransparentThreeValuePixelList( QList<QgsRasterTr`
`104`	`104`	`int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparency ) const`
`105`	`105`	`{`
`106`	`106`	`//if NaN return 0, transparent`
`107`		`- if ( theValue != theValue )`
	`107`	`+ if ( qIsNaN(theValue) )`
`108`	`108`	`{`
`109`	`109`	`return 0;`
`110`	`110`	`}`
`@@ -144,7 +144,7 @@ int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparenc`
`144`	`144`	`int QgsRasterTransparency::alphaValue( double theRedValue, double theGreenValue, double theBlueValue, int theGlobalTransparency ) const`
`145`	`145`	`{`
`146`	`146`	`//if NaN return 0, transparent`
`147`		`- if ( theRedValue != theRedValue \|\| theGreenValue != theGreenValue \|\| theBlueValue != theBlueValue )`
	`147`	`+ if ( qIsNaN(theRedValue) \|\| qIsNaN(theGreenValue) \|\| qIsNaN(theBlueValue) )`
`148`	`148`	`{`
`149`	`149`	`return 0;`
`150`	`150`	`}`