From 65bb7ecc7870b3ccd2776880706e72c651088e23 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 23 Jun 2016 15:34:30 +0200
Subject: [PATCH 1/3] Credits for implementation of expression conversion to
 Spatialite SQL.

Commits 3cf682d17003521213868f1e727d7be7a3263c7e, 0e20de083d7186298fbebbfd764ba721134ce3a0
and 1f99a9f29fefebb7c0e5f39878061763506f94f1 that implement MapServer expression
conversion to Spatialite SQL in OGR provider is a work funded by
Tuscany Region (Italy) - SITA (CIG: 6002233F59) and commissioned to Gis3W s.a.s
---
 mapogr.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mapogr.cpp b/mapogr.cpp
index 6648b215e9..2855483dfe 100644
--- a/mapogr.cpp
+++ b/mapogr.cpp
@@ -4260,4 +4260,3 @@ char *msOGRShapeToWKT(shapeObj *shape)
   return NULL;
 #endif
 }
-

From c3a5759dae997c8cfb370b7d1b7cdbb10b1d84de Mon Sep 17 00:00:00 2001
From: Radim Blazek <radim.blazek@gmail.com>
Date: Mon, 27 Jun 2016 16:29:01 +0200
Subject: [PATCH 2/3] fix WMS blank for classified raster with NaN, #5289

---
 mapdrawgdal.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mapdrawgdal.c b/mapdrawgdal.c
index f90f2acbd6..eb4ca15a5b 100644
--- 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;
 

From b007fdb06871dc95e5b2577c0bd83d16b31459bd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 2 Jul 2016 01:14:50 +0200
Subject: [PATCH 3/3] msOGRFileWhichShapes(): fix case where there is no items

---
 mapogr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mapogr.cpp b/mapogr.cpp
index 2855483dfe..542afde9ba 100644
--- 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, "\"");