Merge branch 'branch-7-0'

MapServer · Jul 1, 2016 · 0e41112 · 0e41112
2 parents 003f17a + b007fdb
commit 0e41112
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/mapdrawgdal.c b/mapdrawgdal.c
@@ -1475,6 +1475,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;
@@ -1980,6 +1983,9 @@ msDrawRasterLayerGDAL_16BitClassification(
     if( bGotNoData && pafRawData[i] == fNoDataValue )
       continue;
 
+    if( CPLIsNan(pafRawData[i]) )
+      continue;
+
     if( !bGotFirstValue ) {
       fDataMin = fDataMax = pafRawData[i];
       bGotFirstValue = TRUE;
@@ -2132,6 +2138,9 @@ msDrawRasterLayerGDAL_16BitClassification(
         continue;
       }
 
+      if( CPLIsNan(fRawValue) )
+        continue;
+
       if(SKIP_MASK(j,i))
         continue;
 

diff --git a/mapogr.cpp b/mapogr.cpp
@@ -1676,8 +1676,8 @@ static int msOGRFileWhichShapes(layerObj *layer, rectObj rect, msOGRFileInfo *ps
                 select = msStringConcatenate(select, layer->items[i]);
                 select = msStringConcatenate(select, "\"");
             }
-
-            select = msStringConcatenate(select, ", ");
+            if( layer->numitems > 0 )
+                select = msStringConcatenate(select, ", ");
             pszGeometryColumn = OGR_L_GetGeometryColumn(psInfo->hLayer);
             if( pszGeometryColumn != NULL && pszGeometryColumn[0] != '\0' ) {
                 select = msStringConcatenate(select, "\"");
@@ -4261,4 +4261,3 @@ char *msOGRShapeToWKT(shapeObj *shape)
   return NULL;
 #endif
 }
-