[Raster] Do not crash when displaying a raster with complex datatype (f…

…ixes #16405) That said, complex datatypes are not handled, so QGIS cannot do anything useful with such datasets.
qgis · Nov 14, 2017 · b861db4 · b861db4
1 parent 020972c
commit b861db4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/raster/qgscontrastenhancement.cpp b/src/core/raster/qgscontrastenhancement.cpp
@@ -175,7 +175,10 @@ int QgsContrastEnhancement::enhanceContrast( double value )
 
   if ( mLookupTable && NoEnhancement != mContrastEnhancementAlgorithm )
   {
-    return mLookupTable[static_cast <int>( value + mLookupTableOffset )];
+    double shiftedValue = value + mLookupTableOffset;
+    if ( shiftedValue >= 0 && shiftedValue < mRasterDataTypeRange + 1 )
+      return mLookupTable[static_cast <int>( shiftedValue )];
+    return 0;
   }
   else
   {

diff --git a/src/core/raster/qgscontrastenhancementfunction.cpp b/src/core/raster/qgscontrastenhancementfunction.cpp
@@ -50,7 +50,8 @@ int QgsContrastEnhancementFunction::enhance( double value )
 bool QgsContrastEnhancementFunction::isValueInDisplayableRange( double value )
 {
   //A default check is to see if the provided value is with the range for the data type
-  return !( value < QgsContrastEnhancement::minimumValuePossible( mQgsRasterDataType ) || value > QgsContrastEnhancement::maximumValuePossible( mQgsRasterDataType ) );
+  // Write the test as ( v >= min && v <= max ) so that v = NaN returns false
+  return value >= QgsContrastEnhancement::minimumValuePossible( mQgsRasterDataType ) && value <= QgsContrastEnhancement::maximumValuePossible( mQgsRasterDataType );
 }
 
 void QgsContrastEnhancementFunction::setMaximumValue( double value )