fix WMS blank for classified raster with NaN, #5289

MapServer · Jun 27, 2016 · c3a5759 · c3a5759
1 parent 65bb7ec
commit c3a5759
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/mapdrawgdal.c b/mapdrawgdal.c
@@ -1270,6 +1270,9 @@ LoadGDALImages( GDALDatasetH hDS, int band_numbers[4], int band_count,
         if( bGotNoData && pafRawData[i] == fNoDataValue )
           continue;
 
+        if( CPLIsNan(pafRawData[i]) )
+          continue;
+
         if( !bMinMaxSet ) {
           dfScaleMin = dfScaleMax = pafRawData[i];
           bMinMaxSet = TRUE;
@@ -1764,6 +1767,9 @@ msDrawRasterLayerGDAL_16BitClassification(
     if( bGotNoData && pafRawData[i] == fNoDataValue )
       continue;
 
+    if( CPLIsNan(pafRawData[i]) )
+      continue;
+
     if( !bGotFirstValue ) {
       fDataMin = fDataMax = pafRawData[i];
       bGotFirstValue = TRUE;
@@ -1915,6 +1921,9 @@ msDrawRasterLayerGDAL_16BitClassification(
         continue;
       }
 
+      if( CPLIsNan(fRawValue) )
+        continue;
+
       if(SKIP_MASK(j,i))
         continue;