Fix equality test for QgsRasterRange when min/max is nan

qgis · Jun 13, 2018 · efb44ad · efb44ad
1 parent e14862e
commit efb44ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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__':