Fix equality test for QgsRasterRange when min/max is nan

nyalldawson · nyalldawson · commit efb44ad8e652 · 2018-06-13T14:54:40.000+10:00
diff --git a/src/core/raster/qgsrasterrange.h b/src/core/raster/qgsrasterrange.h
@@ -72,7 +72,8 @@ class CORE_EXPORT QgsRasterRange
 
     inline bool operator==( QgsRasterRange o ) const
     {
-      return qgsDoubleNear( mMin, o.mMin ) && qgsDoubleNear( mMax, o.mMax );
+      return ( ( std::isnan( mMin ) && std::isnan( o.mMin ) ) || qgsDoubleNear( mMin, o.mMin ) )
+             && ( ( std::isnan( mMax ) && std::isnan( o.mMax ) ) || qgsDoubleNear( mMax, o.mMax ) );
     }
 
     /**
diff --git a/tests/src/python/test_qgsrasterrange.py b/tests/src/python/test_qgsrasterrange.py
@@ -44,6 +44,16 @@ def testEquality(self):
         range = QgsRasterRange()
         range2 = QgsRasterRange()
         self.assertEqual(range, range2)
+        range.setMin(1)
+        self.assertNotEqual(range, range2)
+        range2.setMin(1)
+        self.assertEqual(range, range2)
+        range = QgsRasterRange()
+        range2 = QgsRasterRange()
+        range.setMax(5)
+        self.assertNotEqual(range, range2)
+        range2.setMax(5)
+        self.assertEqual(range, range2)
 
 
 if __name__ == '__main__':

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ class CORE_EXPORT QgsRasterRange`
`72`	`72`
`73`	`73`	`inline bool operator==( QgsRasterRange o ) const`
`74`	`74`	`{`
`75`		`- return qgsDoubleNear( mMin, o.mMin ) && qgsDoubleNear( mMax, o.mMax );`
	`75`	`+ return ( ( std::isnan( mMin ) && std::isnan( o.mMin ) ) \|\| qgsDoubleNear( mMin, o.mMin ) )`
	`76`	`+ && ( ( std::isnan( mMax ) && std::isnan( o.mMax ) ) \|\| qgsDoubleNear( mMax, o.mMax ) );`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`/**`