Merge branch 'branch-6-2'

MapServer · Jul 31, 2012 · 003cbaf · 003cbaf
2 parents 95f13cd + ee72b2c
commit 003cbaf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/mapdraw.c b/mapdraw.c
@@ -1041,7 +1041,6 @@ int msDrawVectorLayer(mapObj *map, layerObj *layer, imageObj *image)
     if (cache) {
       styleObj *pStyle = layer->class[shape.classindex]->styles[0];
       colorObj tmp;
-      drawmode |= MS_DRAWMODE_SINGLESTYLE;
       if (pStyle->outlinewidth > 0) {
         /*
          * RFC 49 implementation

diff --git a/maptile.c b/maptile.c
@@ -185,7 +185,7 @@ static imageObj* msTileExtractSubTile(const mapservObj *msObj, const imageObj *i
     int i = 0;
     char j = 0;
 
-    if( strlen( msObj->TileCoords ) - params.metatile_level < 0 ) {
+    if( (int)strlen( msObj->TileCoords ) - params.metatile_level < 0 ) {
       return(NULL);
     }
 

diff --git a/mapwmslayer.c b/mapwmslayer.c
@@ -1377,7 +1377,7 @@ int msDrawWMSLayerLow(int nLayerId, httpRequestObj *pasReqInfo,
         size_t nSize;
 
         nSize = fread(szBuf, sizeof(char), MS_BUFFER_LENGTH-1, fp);
-        if (nSize >= 0 && nSize < MS_BUFFER_LENGTH)
+        if (nSize < MS_BUFFER_LENGTH)
           szBuf[nSize] = '\0';
         else {
           strlcpy(szBuf, "(!!!)", sizeof(szBuf)); /* This should never happen */