[mapserver] 01/01: Imported Upstream version 6.2.2

Bas Couwenberg sebastic at xs4all.nl
Fri Feb 28 22:56:36 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to annotated tag upstream/6.2.2
in repository mapserver.

commit 1bf0a15966732ac86973c53fbd8d4f61d628e5b8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 8 21:33:11 2014 +0100

    Imported Upstream version 6.2.2
---
 .travis.yml                                   |    5 +-
 HISTORY.TXT                                   |    5 +
 Makefile.in                                   |    2 +-
 mapchart.c                                    |   17 +
 mapdraw.c                                     |    2 +-
 mapfile.c                                     |   14 +-
 mapimageio.c                                  |   54 +
 mapio.c                                       |    7 +-
 maplabel.c                                    |   89 +-
 maplegend.c                                   |   23 +-
 mapogcsld.c                                   |   10 +-
 mapows.c                                      |    3 +-
 mappostgis.c                                  |    5 +
 maprasterquery.c                              |   21 +-
 maprendering.c                                |    4 +-
 mapscript/csharp/DBFFieldType.cs              |    2 +-
 mapscript/csharp/DBFInfo.cs                   |    2 +-
 mapscript/csharp/MS_ALIGN_VALUE.cs            |    2 +-
 mapscript/csharp/MS_BITMAP_FONT_SIZES.cs      |    2 +-
 mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs |    2 +-
 mapscript/csharp/MS_CONNECTION_TYPE.cs        |    2 +-
 mapscript/csharp/MS_FILE_TYPE.cs              |    2 +-
 mapscript/csharp/MS_FONT_TYPE.cs              |    2 +-
 mapscript/csharp/MS_GEOS_OPERATOR.cs          |    2 +-
 mapscript/csharp/MS_IMAGEMODE.cs              |    2 +-
 mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs   |    2 +-
 mapscript/csharp/MS_JOIN_TYPE.cs              |    2 +-
 mapscript/csharp/MS_LABEL_BINDING_ENUM.cs     |    2 +-
 mapscript/csharp/MS_LAYER_TYPE.cs             |    2 +-
 mapscript/csharp/MS_PARSE_TYPE_ENUM.cs        |    2 +-
 mapscript/csharp/MS_POSITIONS_ENUM.cs         |    2 +-
 mapscript/csharp/MS_QUERYMAP_STYLES.cs        |    2 +-
 mapscript/csharp/MS_QUERY_MODE.cs             |    2 +-
 mapscript/csharp/MS_QUERY_TYPE.cs             |    2 +-
 mapscript/csharp/MS_REQUEST_TYPE.cs           |    2 +-
 mapscript/csharp/MS_RETURN_VALUE.cs           |    2 +-
 mapscript/csharp/MS_SHAPE_TYPE.cs             |    2 +-
 mapscript/csharp/MS_STYLE_BINDING_ENUM.cs     |    2 +-
 mapscript/csharp/MS_SYMBOL_TYPE.cs            |    2 +-
 mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs     |    2 +-
 mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs  |    2 +-
 mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs    |    2 +-
 mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs     |    2 +-
 mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs     |    2 +-
 mapscript/csharp/MS_TRANSFORM_MODE.cs         |    2 +-
 mapscript/csharp/MS_UNITS.cs                  |    2 +-
 mapscript/csharp/OWSRequest.cs                |    2 +-
 mapscript/csharp/SWIGTYPE_p_double.cs         |    2 +-
 mapscript/csharp/SWIGTYPE_p_int.cs            |    2 +-
 mapscript/csharp/SWIGTYPE_p_p_char.cs         |    2 +-
 mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs   |    2 +-
 mapscript/csharp/SWIGTYPE_p_uint32_t.cs       |    2 +-
 mapscript/csharp/classObj.cs                  |    2 +-
 mapscript/csharp/clusterObj.cs                |    2 +-
 mapscript/csharp/colorObj.cs                  |    2 +-
 mapscript/csharp/debugLevel.cs                |    2 +-
 mapscript/csharp/errorObj.cs                  |    2 +-
 mapscript/csharp/fontSetObj.cs                |    2 +-
 mapscript/csharp/hashTableObj.cs              |    2 +-
 mapscript/csharp/imageObj.cs                  |    2 +-
 mapscript/csharp/intarray.cs                  |    2 +-
 mapscript/csharp/labelCacheMemberObj.cs       |    2 +-
 mapscript/csharp/labelCacheObj.cs             |    2 +-
 mapscript/csharp/labelCacheSlotObj.cs         |    2 +-
 mapscript/csharp/labelLeaderObj.cs            |    2 +-
 mapscript/csharp/labelObj.cs                  |    2 +-
 mapscript/csharp/labelStyleObj.cs             |    2 +-
 mapscript/csharp/layerObj.cs                  |    2 +-
 mapscript/csharp/legendObj.cs                 |    2 +-
 mapscript/csharp/lineObj.cs                   |    2 +-
 mapscript/csharp/mapObj.cs                    |   29 +-
 mapscript/csharp/mapscript.cs                 |    2 +-
 mapscript/csharp/mapscriptPINVOKE.cs          |    6 +-
 mapscript/csharp/mapscript_wrap.c             | 1952 +++++++-------
 mapscript/csharp/markerCacheMemberObj.cs      |    2 +-
 mapscript/csharp/outputFormatObj.cs           |    2 +-
 mapscript/csharp/pointObj.cs                  |    2 +-
 mapscript/csharp/projectionObj.cs             |    2 +-
 mapscript/csharp/queryMapObj.cs               |    2 +-
 mapscript/csharp/rectObj.cs                   |    2 +-
 mapscript/csharp/referenceMapObj.cs           |    2 +-
 mapscript/csharp/resultCacheObj.cs            |    2 +-
 mapscript/csharp/resultObj.cs                 |    2 +-
 mapscript/csharp/scalebarObj.cs               |    2 +-
 mapscript/csharp/shapeObj.cs                  |    2 +-
 mapscript/csharp/shapefileObj.cs              |    2 +-
 mapscript/csharp/strokeStyleObj.cs            |    2 +-
 mapscript/csharp/styleObj.cs                  |    2 +-
 mapscript/csharp/symbolObj.cs                 |    2 +-
 mapscript/csharp/symbolSetObj.cs              |    2 +-
 mapscript/csharp/symbolStyleObj.cs            |    2 +-
 mapscript/csharp/tileCacheObj.cs              |    2 +-
 mapscript/csharp/webObj.cs                    |    2 +-
 mapscript/perl/mapscript.pm                   |    2 +-
 mapscript/perl/mapscript_wrap.c               | 3244 +++++++++++------------
 mapscript/php/php_mapscript.c                 |    2 +-
 mapscript/python/mapscript.py                 |   20 +-
 mapscript/python/mapscript_wrap.c             | 3504 ++++++++++++++-----------
 mapserver.h                                   |    5 +-
 mapshape.c                                    |   17 +-
 maptemplate.c                                 |    2 +-
 maptree.c                                     |    4 +
 mapuvraster.c                                 |   97 +-
 mapwcs.c                                      |   12 +-
 mapwcs20.c                                    |  131 +-
 mapwms.c                                      |    2 +-
 mapxbase.c                                    |   15 +-
 tile4ms.c                                     |    1 +
 xmlmapfile/mapfile.xsd                        |    5 +-
 xmlmapfile/mapfile.xsl                        |    5 +
 xmlmapfile/tests/layerset.xml                 |    1 +
 111 files changed, 5023 insertions(+), 4444 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8243455..0ac495c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,7 @@ before_install:
   - git submodule update --init --recursive
   - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
   - sudo apt-get update -qq
-  - sudo apt-get install -qq php-pear colordiff postgis libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-noxpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev
-  - sudo pear config-set auto_discover 1 && sudo pear install --alldeps channel://pear.phpunit.de/PHPUnit-3.6.12
-  - echo "extension=php_mapscript.so" | sudo tee -a /etc/php5/cli/php.ini
+  - sudo apt-get install -qq colordiff postgis postgresql-9.1-postgis-2.0-scripts libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-noxpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev php5-dev
   - cd msautotest
   - ./create_postgis_test_data.sh
   - cd ..
@@ -22,7 +20,6 @@ install:
 
 script:
   - make -j3 test
-  - cd msautotest/php && ./run_test.py
 
 notifications:
   email:
diff --git a/HISTORY.TXT b/HISTORY.TXT
index b07d8ab..714ba37 100644
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -12,6 +12,11 @@ the top of the list.)
 
 For a complete change history, please see the Git log comments.
 
+Current Version
+---------------
+
+Changes are tracked trough commit comments, not this file.
+
 Version 6.2.1 (2013-04-19):
 ---------------------------
 
diff --git a/Makefile.in b/Makefile.in
index 18956af..1359c80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -530,4 +530,4 @@ print-test-results:
 test: shp2img mapserv autotest-install $(PHP_MAPSCRIPT) $(PYTHON_MAPSCRIPT)
 	@$(MAKE) $(MFLAGS)	wxs-testcase renderers-testcase misc-testcase gdal-testcase query-testcase
 	@$(MAKE) print-test-results
-	@$(MAKE) php-testcase
+	#@$(MAKE) php-testcase
diff --git a/mapchart.c b/mapchart.c
index bcbf257..e5832e4 100644
--- a/mapchart.c
+++ b/mapchart.c
@@ -322,6 +322,16 @@ int pieLayerProcessDynamicDiameter(layerObj *layer)
 
 }
 
+/* clean up the class added temporarily */
+int pieLayerCleanupDynamicDiameter(layerObj *layer)
+{
+  if( layer->numclasses > 0 && EQUALN(layer->class[layer->numclasses - 1]->name, "__MS_SIZE_ATTRIBUTE_", 20) ) {
+    classObj *c=msRemoveClass(layer, layer->numclasses - 1);
+    freeClass(c);
+    msFree(c);
+  }
+}
+
 
 int msDrawPieChartLayer(mapObj *map, layerObj *layer, imageObj *image)
 {
@@ -614,9 +624,13 @@ int msDrawChartLayer(mapObj *map, layerObj *layer, imageObj *image)
     status = msLayerWhichShapes(layer, searchrect, MS_FALSE);
     if(status == MS_DONE) { /* no overlap */
       msLayerClose(layer);
+      if(chartType == MS_CHART_TYPE_PIE)
+        pieLayerCleanupDynamicDiameter(layer);
       return MS_SUCCESS;
     } else if(status != MS_SUCCESS) {
       msLayerClose(layer);
+      if(chartType == MS_CHART_TYPE_PIE)
+        pieLayerCleanupDynamicDiameter(layer);
       return MS_FAILURE;
     }
     switch(chartType) {
@@ -634,6 +648,9 @@ int msDrawChartLayer(mapObj *map, layerObj *layer, imageObj *image)
     }
 
     msLayerClose(layer);
+
+    if(chartType == MS_CHART_TYPE_PIE)
+      pieLayerCleanupDynamicDiameter(layer);
   }
   return status;
 }
diff --git a/mapdraw.c b/mapdraw.c
index 3937fb4..92a9caa 100644
--- a/mapdraw.c
+++ b/mapdraw.c
@@ -2243,7 +2243,7 @@ int msDrawPoint(mapObj *map, layerObj *layer, pointObj *point, imageObj *image,
         if(msScaleInBounds(map->scaledenom, theclass->styles[s]->minscaledenom, theclass->styles[s]->maxscaledenom))
           msDrawMarkerSymbol(&map->symbolset, image, point, theclass->styles[s], layer->scalefactor);
       }
-      if(labeltext && (strlen(labeltext)>0)) {
+      if(labeltext) {
         if(layer->labelcache) {
           if(msAddLabel(map, label, layer->index, classindex, NULL, point, NULL, -1) != MS_SUCCESS) return(MS_FAILURE);
         } else
diff --git a/mapfile.c b/mapfile.c
index 181f151..2f01a52 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -650,7 +650,17 @@ static void writeColor(FILE *stream, int indent, const char *name, colorObj *def
 #if ALPHACOLOR_ENABLED
   fprintf(stream, "%s %d %d %d\n", name, color->red, color->green, color->blue, color->alpha);
 #else
-  fprintf(stream, "%s %d %d %d\n", name, color->red, color->green, color->blue);
+  if(color->alpha != 255) {
+    char buffer[9];
+    sprintf(buffer, "%02x", color->red);
+    sprintf(buffer+2, "%02x", color->green);
+    sprintf(buffer+4, "%02x", color->blue);
+    sprintf(buffer+6, "%02x", color->alpha);
+    *(buffer+8) = 0;
+    fprintf(stream, "%s \"#%s\"\n", name, buffer);
+  } else {
+    fprintf(stream, "%s %d %d %d\n", name, color->red, color->green, color->blue);
+  }
 #endif
 }
 
@@ -2129,7 +2139,7 @@ static void writeLabel(FILE *stream, int indent, labelObj *label)
     else writeNumber(stream, indent, "SIZE", -1, label->size);
   }
 
-  writeKeyword(stream, indent, "ALIGN", label->align, MS_ALIGN_CENTER, "CENTER", MS_ALIGN_RIGHT, "RIGHT");
+  writeKeyword(stream, indent, "ALIGN", label->align, 2, MS_ALIGN_CENTER, "CENTER", MS_ALIGN_RIGHT, "RIGHT");
   writeNumber(stream, indent, "BUFFER", 0, label->buffer);
 
   if(label->numbindings > 0 && label->bindings[MS_LABEL_BINDING_COLOR].item)
diff --git a/mapimageio.c b/mapimageio.c
index 8fcba05..08b4d6f 100644
--- a/mapimageio.c
+++ b/mapimageio.c
@@ -993,12 +993,19 @@ int msSaveRasterBufferToBuffer(rasterBufferObj *data, bufferObj *buffer,
     return MS_FAILURE;
   }
 }
+
 #ifdef USE_GIF
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+static char const *gif_error_msg(int code)
+#else
 static char const *gif_error_msg()
+#endif
 {
   static char msg[80];
 
+#if (!defined GIFLIB_MAJOR) || (GIFLIB_MAJOR < 5)
   int code = GifLastError();
+#endif
   switch (code) {
     case E_GIF_ERR_OPEN_FAILED: /* should not see this */
       return "Failed to open given file";
@@ -1090,14 +1097,25 @@ int readGIF(char *path, rasterBufferObj *rb)
   ColorMapObject *cmap;
   int interlacedOffsets[] = {0,4,2,1};
   int interlacedJumps[] = {8,8,4,2};
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+  int errcode;
+#endif
 
 
   rb->type = MS_BUFFER_BYTE_RGBA;
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+  image =  DGifOpenFileName(path, &errcode);
+  if (image == NULL) {
+    msSetError(MS_MISCERR,"failed to load gif image: %s","readGIF()", gif_error_msg(errcode));
+    return MS_FAILURE;
+  }
+#else
   image =  DGifOpenFileName(path);
   if (image == NULL) {
     msSetError(MS_MISCERR,"failed to load gif image: %s","readGIF()", gif_error_msg());
     return MS_FAILURE;
   }
+#endif
   rb->width = image->SWidth;
   rb->height = image->SHeight;
   rb->data.rgba.row_step = rb->width * 4;
@@ -1122,7 +1140,11 @@ int readGIF(char *path, rasterBufferObj *rb)
 
   do {
     if (DGifGetRecordType(image, &recordType) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+      msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
       msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
       return MS_FAILURE;
     }
 
@@ -1132,7 +1154,11 @@ int readGIF(char *path, rasterBufferObj *rb)
         break;
       case IMAGE_DESC_RECORD_TYPE:
         if (DGifGetImageDesc(image) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+          msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
           msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
           return MS_FAILURE;
         }
         if (!firstImageRead) {
@@ -1159,7 +1185,11 @@ int readGIF(char *path, rasterBufferObj *rb)
                 g = rb->data.rgba.g + offset;
                 b = rb->data.rgba.b + offset;
                 if (DGifGetLine(image, line, width) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+                  msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()",gif_error_msg(image->Error));
+#else
                   msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()",gif_error_msg());
+#endif
                   return MS_FAILURE;
                 }
 
@@ -1188,7 +1218,11 @@ int readGIF(char *path, rasterBufferObj *rb)
               g = rb->data.rgba.g + offset;
               b = rb->data.rgba.b + offset;
               if (DGifGetLine(image, line, width) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+                msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()",gif_error_msg(image->Error));
+#else
                 msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()",gif_error_msg());
+#endif
                 return MS_FAILURE;
               }
               for(j=0; j<width; j++) {
@@ -1213,12 +1247,20 @@ int readGIF(char *path, rasterBufferObj *rb)
         } else {
           /* Skip all next images */
           if (DGifGetCode(image, &codeSize, &codeBlock) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+            msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
             msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
             return MS_FAILURE;
           }
           while (codeBlock != NULL) {
             if (DGifGetCodeNext(image, &codeBlock) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+              msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
               msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
               return MS_FAILURE;
             }
           }
@@ -1227,14 +1269,22 @@ int readGIF(char *path, rasterBufferObj *rb)
       case EXTENSION_RECORD_TYPE:
         /* skip all extension blocks */
         if (DGifGetExtension(image, &extCode, &extension) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+          msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
           msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
           return MS_FAILURE;
         }
         if(extCode == 249 && (extension[1] & 1))
           transIdx = extension[4];
         for (;;) {
           if (DGifGetExtensionNext(image, &extension) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+            msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg(image->Error));
+#else
             msSetError(MS_MISCERR,"corrupted gif image?: %s","readGIF()", gif_error_msg());
+#endif
             return MS_FAILURE;
           }
           if (extension == NULL)
@@ -1254,7 +1304,11 @@ int readGIF(char *path, rasterBufferObj *rb)
   } while (recordType != TERMINATE_RECORD_TYPE);
 
   if (DGifCloseFile(image) == GIF_ERROR) {
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+    msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
+#else
     msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg());
+#endif
     return MS_FAILURE;
   }
 
diff --git a/mapio.c b/mapio.c
index ac8cc5b..0861213 100644
--- a/mapio.c
+++ b/mapio.c
@@ -809,10 +809,13 @@ char *msIO_stripStdoutBufferContentType()
   }
 
   /* -------------------------------------------------------------------- */
-  /*      Copy out content type.                                          */
+  /*      Copy out content type. Note we go against the coding guidelines */
+  /*      here and use strncpy() instead of strlcpy() as the source       */
+  /*      buffer may not be NULL terminated - strlcpy() requires NULL     */
+  /*      terminated sources (see issue #4672).                           */
   /* -------------------------------------------------------------------- */
   content_type = (char *) malloc(end_of_ct-14+2);
-  strlcpy( content_type, (const char *) buf->data + 14, end_of_ct - 14 + 2);
+  strncpy( content_type, (const char *) buf->data + 14, end_of_ct - 14 + 2);
   content_type[end_of_ct-14+1] = '\0';
 
   /* -------------------------------------------------------------------- */
diff --git a/maplabel.c b/maplabel.c
index cf97176..dbda6d6 100644
--- a/maplabel.c
+++ b/maplabel.c
@@ -351,25 +351,28 @@ int msAddLabelGroup(mapObj *map, int layerindex, int classindex, shapeObj *shape
       MS_IMAGE_RENDERER(maskLayer->maskimage)->getRasterBufferHandle(maskLayer->maskimage,&rb);
       x = MS_NINT(point->x);
       y = MS_NINT(point->y);
+      /* Using label repeatdistance, we might have a point with x/y below 0. See #4764 */
+      if (x >= 0 && x < rb.width && y >= 0 && y < rb.height) {
 #ifdef USE_GD
-      if(rb.type == MS_BUFFER_BYTE_RGBA) {
+        if(rb.type == MS_BUFFER_BYTE_RGBA) {
+          alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
+          if(!*alphapixptr) {
+            /* label point does not intersect mask */
+            return MS_SUCCESS;
+          }
+        } else {
+          if(!gdImageGetPixel(rb.data.gd_img,x,y))
+            return MS_SUCCESS;
+        }
+#else
+        assert(rb.type == MS_BUFFER_BYTE_RGBA);
         alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
         if(!*alphapixptr) {
           /* label point does not intersect mask */
           return MS_SUCCESS;
         }
-      } else {
-        if(!gdImageGetPixel(rb.data.gd_img,x,y))
-          return MS_SUCCESS;
-      }
-#else
-      assert(rb.type == MS_BUFFER_BYTE_RGBA);
-      alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
-      if(!*alphapixptr) {
-        /* label point does not intersect mask */
-        return MS_SUCCESS;
-      }
 #endif
+      }
     } else {
       msSetError(MS_MISCERR, "Layer (%s) references references a mask layer, but the selected renderer does not support them", "msAddLabelGroup()", layerPtr->name);
       return (MS_FAILURE);
@@ -543,54 +546,60 @@ int msAddLabel(mapObj *map, labelObj *label, int layerindex, int classindex, sha
       if (point) {
         int x = MS_NINT(point->x);
         int y = MS_NINT(point->y);
+        /* Using label repeatdistance, we might have a point with x/y below 0. See #4764 */
+        if (x >= 0 && x < rb.width && y >= 0 && y < rb.height) {
 #ifdef USE_GD
-        if(rb.type == MS_BUFFER_BYTE_RGBA) {
+          if(rb.type == MS_BUFFER_BYTE_RGBA) {
+            alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
+            if(!*alphapixptr) {
+              /* label point does not intersect mask */
+              return MS_SUCCESS;
+            }
+          } else {
+            if(!gdImageGetPixel(rb.data.gd_img,x,y)) {
+              return MS_SUCCESS;
+            }
+          }
+#else
+          assert(rb.type == MS_BUFFER_BYTE_RGBA);
           alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
           if(!*alphapixptr) {
             /* label point does not intersect mask */
             return MS_SUCCESS;
           }
-        } else {
-          if(!gdImageGetPixel(rb.data.gd_img,x,y)) {
-            return MS_SUCCESS;
-          }
-        }
-#else
-        assert(rb.type == MS_BUFFER_BYTE_RGBA);
-        alphapixptr = rb.data.rgba.a+rb.data.rgba.row_step*y + rb.data.rgba.pixel_step*x;
-        if(!*alphapixptr) {
-          /* label point does not intersect mask */
-          return MS_SUCCESS;
-        }
 #endif
+        }
       } else if (labelpath) {
         int i = 0;
         for (i = 0; i < labelpath->path.numpoints; i++) {
           int x = MS_NINT(labelpath->path.point[i].x);
           int y = MS_NINT(labelpath->path.point[i].y);
+          /* Using label repeatdistance, we might have a point with x/y below 0. See #4764 */
+          if (x >= 0 && x < rb.width && y >= 0 && y < rb.height) {
 #ifdef USE_GD
-          if (rb.type == MS_BUFFER_BYTE_RGBA) {
+            if (rb.type == MS_BUFFER_BYTE_RGBA) {
+              alphapixptr = rb.data.rgba.a + rb.data.rgba.row_step * y + rb.data.rgba.pixel_step*x;
+              if (!*alphapixptr) {
+                /* label point does not intersect mask */
+                msFreeLabelPathObj(labelpath);
+                return MS_SUCCESS;
+              }
+            } else {
+              if (!gdImageGetPixel(rb.data.gd_img, x, y)) {
+                msFreeLabelPathObj(labelpath);
+                return MS_SUCCESS;
+              }
+            }
+#else
+            assert(rb.type == MS_BUFFER_BYTE_RGBA);
             alphapixptr = rb.data.rgba.a + rb.data.rgba.row_step * y + rb.data.rgba.pixel_step*x;
             if (!*alphapixptr) {
               /* label point does not intersect mask */
               msFreeLabelPathObj(labelpath);
               return MS_SUCCESS;
             }
-          } else {
-            if (!gdImageGetPixel(rb.data.gd_img, x, y)) {
-              msFreeLabelPathObj(labelpath);
-              return MS_SUCCESS;
-            }
-          }
-#else
-          assert(rb.type == MS_BUFFER_BYTE_RGBA);
-          alphapixptr = rb.data.rgba.a + rb.data.rgba.row_step * y + rb.data.rgba.pixel_step*x;
-          if (!*alphapixptr) {
-            /* label point does not intersect mask */
-            msFreeLabelPathObj(labelpath);
-            return MS_SUCCESS;
-          }
 #endif
+          }
         }
       }
     } else {
diff --git a/maplegend.c b/maplegend.c
index 0edb2ec..0359208 100644
--- a/maplegend.c
+++ b/maplegend.c
@@ -156,12 +156,14 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
         int lpos = label->position;
         int loffsetx = label->offsetx;
         int loffsety = label->offsety;
+        int lstatus = label->status;
 
         label->offsetx = 0;
         label->offsety = 0;
         label->angle = 0;
         label->position = MS_CC;
         if (label->type == MS_TRUETYPE) label->size = height;
+        label->status = MS_ON;
         msDrawLabel(map, image_draw, marker, (char*)"Az", label,1.0);
 
         label->size = lsize;
@@ -169,6 +171,7 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
         label->angle = langle;
         label->offsetx = loffsetx;
         label->offsety = loffsety;
+        label->status = lstatus;
       }
       break;
     case MS_LAYER_POINT:
@@ -228,8 +231,16 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
       zigzag.line[0].point[3].x = dstX + width - offset;
       zigzag.line[0].point[3].y = dstY + offset;
 
-      for(i=0; i<theclass->numstyles; i++)
-        msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
+      for(i=0; i<theclass->numstyles; i++) {
+        if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOINT ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOLY)
+          msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
+          
+        else
+          msDrawTransformedShape(map, &map->symbolset, image_draw, &zigzag, 
+                                        theclass->styles[i], lp->scalefactor);
+      }
 
       free(zigzag.line[0].point);
       free(zigzag.line);
@@ -239,7 +250,13 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
     case MS_LAYER_CHART:
     case MS_LAYER_POLYGON:
       for(i=0; i<theclass->numstyles; i++)
-        msDrawShadeSymbol(&map->symbolset, image_draw, &box, theclass->styles[i], lp->scalefactor);
+        if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOINT ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOLY)
+          msDrawShadeSymbol(&map->symbolset, image_draw, &box, theclass->styles[i], lp->scalefactor);
+        else
+          msDrawTransformedShape(map, &map->symbolset, image_draw, &box,
+                                 theclass->styles[i], lp->scalefactor);
       break;
     default:
       return MS_FAILURE;
diff --git a/mapogcsld.c b/mapogcsld.c
index 654175c..1c6d5ba 100644
--- a/mapogcsld.c
+++ b/mapogcsld.c
@@ -613,20 +613,20 @@ layerObj  *msSLDParseSLD(mapObj *map, char *psSLDXML, int *pnLayers)
 }
 
 
-int _msSLDParseSizeParameter(CPLXMLNode *psSize)
+double _msSLDParseSizeParameter(CPLXMLNode *psSize)
 {
-  int nSize = 0;
+  double dSize = 0;
   CPLXMLNode *psLiteral = NULL;
 
   if (psSize) {
     psLiteral = CPLGetXMLNode(psSize, "Literal");
     if (psLiteral && psLiteral->psChild && psLiteral->psChild->pszValue)
-      nSize = atof(psLiteral->psChild->pszValue);
+      dSize = atof(psLiteral->psChild->pszValue);
     else if (psSize->psChild && psSize->psChild->pszValue)
-      nSize = atof(psSize->psChild->pszValue);
+      dSize = atof(psSize->psChild->pszValue);
   }
 
-  return nSize;
+  return dSize;
 }
 
 /************************************************************************/
diff --git a/mapows.c b/mapows.c
index cd30d9c..ce412ee 100644
--- a/mapows.c
+++ b/mapows.c
@@ -95,7 +95,8 @@ static int msOWSPreParseRequest(cgiRequestObj *request,
                                 owsRequestObj *ows_request)
 {
   /* decide if KVP or XML */
-  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST && strcmp(request->contenttype, "application/x-www-form-urlencoded")==0)) {
+  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST 
+    && request->contenttype && strncmp(request->contenttype, "application/x-www-form-urlencoded", strlen("application/x-www-form-urlencoded")) == 0)) {
     int i;
     /* parse KVP parameters service, version and request */
     for (i = 0; i < request->NumParams; ++i) {
diff --git a/mappostgis.c b/mappostgis.c
index 1f4c64e..f24d969 100644
--- a/mappostgis.c
+++ b/mappostgis.c
@@ -3212,6 +3212,11 @@ int msPostGISLayerSetTimeFilter(layerObj *lp, const char *timestring, const char
   if (!lp || !timestring || !timefield)
     return MS_FALSE;
 
+  if( strchr(timestring,'\'') || strchr(timestring, '\\') ) {
+     msSetError(MS_MISCERR, "Invalid time filter.", "msPostGISLayerSetTimeFilter()");
+     return MS_FALSE;
+  }
+
   /* discrete time */
   if (strstr(timestring, ",") == NULL &&
       strstr(timestring, "/") == NULL) { /* discrete time */
diff --git a/maprasterquery.c b/maprasterquery.c
index 0e4a7a7..29dca78 100644
--- a/maprasterquery.c
+++ b/maprasterquery.c
@@ -666,7 +666,7 @@ int msRasterQueryByRect(mapObj *map, layerObj *layer, rectObj queryRect)
   int tileitemindex=-1, tilelayerindex=-1;
   shapeObj tshp;
   char tilename[MS_PATH_LENGTH];
-  int  done;
+  int  done, destroy_on_failure;
 
   char szPath[MS_MAXPATHLEN];
   rectObj searchrect;
@@ -677,7 +677,12 @@ int msRasterQueryByRect(mapObj *map, layerObj *layer, rectObj queryRect)
   /* -------------------------------------------------------------------- */
   /*      Get the layer info.                                             */
   /* -------------------------------------------------------------------- */
-  msRasterLayerInfoInitialize( layer );
+  if(!layer->layerinfo) {
+    msRasterLayerInfoInitialize( layer );
+    destroy_on_failure = 1;
+  } else {
+    destroy_on_failure = 0;
+  }
   rlinfo = (rasterLayerInfo *) layer->layerinfo;
 
   /* -------------------------------------------------------------------- */
@@ -956,12 +961,14 @@ cleanup:
   /*      On failure, or empty result set, cleanup the rlinfo since we    */
   /*      likely won't ever have it accessed or cleaned up later.         */
   /* -------------------------------------------------------------------- */
-  if( status == MS_FAILURE || rlinfo->query_results == 0 )
-    msRasterLayerInfoFree( layer );
-
-  /* populate the items/numitems layer-level values */
-  if( layer->layerinfo != NULL )
+  if( status == MS_FAILURE || rlinfo->query_results == 0 ) {
+    if(destroy_on_failure) {
+      msRasterLayerInfoFree( layer );
+    }
+  } else {
+    /* populate the items/numitems layer-level values */
     msRASTERLayerGetItems(layer);
+  }
 
   return status;
 #endif /* def USE_GDAL */
diff --git a/maprendering.c b/maprendering.c
index 64f2a5b..5a6169c 100644
--- a/maprendering.c
+++ b/maprendering.c
@@ -833,13 +833,15 @@ int msDrawMarkerSymbol(symbolSetObj *symbolset,imageObj *image, pointObj *p, sty
         break;
       }
 
-      s.style = style;
       computeSymbolStyle(&s,style,symbol,scalefactor,image->resolutionfactor);
       s.style = style;
       if (!s.color && !s.outlinecolor && symbol->type != MS_SYMBOL_PIXMAP &&
           symbol->type != MS_SYMBOL_SVG) {
         return MS_SUCCESS; // nothing to do if no color, except for pixmap symbols
       }
+      if(s.scale == 0) {
+        return MS_SUCCESS;
+      }
 
 
 
diff --git a/mapscript/csharp/DBFFieldType.cs b/mapscript/csharp/DBFFieldType.cs
index 43f50eb..4109888 100644
--- a/mapscript/csharp/DBFFieldType.cs
+++ b/mapscript/csharp/DBFFieldType.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/DBFInfo.cs b/mapscript/csharp/DBFInfo.cs
index d514900..68c7df7 100644
--- a/mapscript/csharp/DBFInfo.cs
+++ b/mapscript/csharp/DBFInfo.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_ALIGN_VALUE.cs b/mapscript/csharp/MS_ALIGN_VALUE.cs
index 421fa0f..9ae292f 100644
--- a/mapscript/csharp/MS_ALIGN_VALUE.cs
+++ b/mapscript/csharp/MS_ALIGN_VALUE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_BITMAP_FONT_SIZES.cs b/mapscript/csharp/MS_BITMAP_FONT_SIZES.cs
index 125ed8d..c77823c 100644
--- a/mapscript/csharp/MS_BITMAP_FONT_SIZES.cs
+++ b/mapscript/csharp/MS_BITMAP_FONT_SIZES.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs b/mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs
index bf31dfc..b69a530 100644
--- a/mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs
+++ b/mapscript/csharp/MS_CAPS_JOINS_AND_CORNERS.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_CONNECTION_TYPE.cs b/mapscript/csharp/MS_CONNECTION_TYPE.cs
index 75bd289..9007484 100644
--- a/mapscript/csharp/MS_CONNECTION_TYPE.cs
+++ b/mapscript/csharp/MS_CONNECTION_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_FILE_TYPE.cs b/mapscript/csharp/MS_FILE_TYPE.cs
index 4d62085..688dd2d 100644
--- a/mapscript/csharp/MS_FILE_TYPE.cs
+++ b/mapscript/csharp/MS_FILE_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_FONT_TYPE.cs b/mapscript/csharp/MS_FONT_TYPE.cs
index 82cc4bc..e9a9acd 100644
--- a/mapscript/csharp/MS_FONT_TYPE.cs
+++ b/mapscript/csharp/MS_FONT_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_GEOS_OPERATOR.cs b/mapscript/csharp/MS_GEOS_OPERATOR.cs
index 102e80b..04b5909 100644
--- a/mapscript/csharp/MS_GEOS_OPERATOR.cs
+++ b/mapscript/csharp/MS_GEOS_OPERATOR.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_IMAGEMODE.cs b/mapscript/csharp/MS_IMAGEMODE.cs
index 2609ac7..3871ebd 100644
--- a/mapscript/csharp/MS_IMAGEMODE.cs
+++ b/mapscript/csharp/MS_IMAGEMODE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs b/mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs
index fec65c2..4010942 100644
--- a/mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs
+++ b/mapscript/csharp/MS_JOIN_CONNECTION_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_JOIN_TYPE.cs b/mapscript/csharp/MS_JOIN_TYPE.cs
index 828677c..1705acc 100644
--- a/mapscript/csharp/MS_JOIN_TYPE.cs
+++ b/mapscript/csharp/MS_JOIN_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_LABEL_BINDING_ENUM.cs b/mapscript/csharp/MS_LABEL_BINDING_ENUM.cs
index b0cc5fa..9e7061c 100644
--- a/mapscript/csharp/MS_LABEL_BINDING_ENUM.cs
+++ b/mapscript/csharp/MS_LABEL_BINDING_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_LAYER_TYPE.cs b/mapscript/csharp/MS_LAYER_TYPE.cs
index 52fc717..13b4f66 100644
--- a/mapscript/csharp/MS_LAYER_TYPE.cs
+++ b/mapscript/csharp/MS_LAYER_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_PARSE_TYPE_ENUM.cs b/mapscript/csharp/MS_PARSE_TYPE_ENUM.cs
index 2dd5c03..68fc3df 100644
--- a/mapscript/csharp/MS_PARSE_TYPE_ENUM.cs
+++ b/mapscript/csharp/MS_PARSE_TYPE_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_POSITIONS_ENUM.cs b/mapscript/csharp/MS_POSITIONS_ENUM.cs
index 6d508db..8cd48d7 100644
--- a/mapscript/csharp/MS_POSITIONS_ENUM.cs
+++ b/mapscript/csharp/MS_POSITIONS_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_QUERYMAP_STYLES.cs b/mapscript/csharp/MS_QUERYMAP_STYLES.cs
index 85e315e..f3bfd8a 100644
--- a/mapscript/csharp/MS_QUERYMAP_STYLES.cs
+++ b/mapscript/csharp/MS_QUERYMAP_STYLES.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_QUERY_MODE.cs b/mapscript/csharp/MS_QUERY_MODE.cs
index 6176c81..beadeb8 100644
--- a/mapscript/csharp/MS_QUERY_MODE.cs
+++ b/mapscript/csharp/MS_QUERY_MODE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_QUERY_TYPE.cs b/mapscript/csharp/MS_QUERY_TYPE.cs
index b1e036f..ff11551 100644
--- a/mapscript/csharp/MS_QUERY_TYPE.cs
+++ b/mapscript/csharp/MS_QUERY_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_REQUEST_TYPE.cs b/mapscript/csharp/MS_REQUEST_TYPE.cs
index 47472d9..34a0fcf 100644
--- a/mapscript/csharp/MS_REQUEST_TYPE.cs
+++ b/mapscript/csharp/MS_REQUEST_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_RETURN_VALUE.cs b/mapscript/csharp/MS_RETURN_VALUE.cs
index de706f4..15399b8 100644
--- a/mapscript/csharp/MS_RETURN_VALUE.cs
+++ b/mapscript/csharp/MS_RETURN_VALUE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_SHAPE_TYPE.cs b/mapscript/csharp/MS_SHAPE_TYPE.cs
index f9b9bf7..593fc92 100644
--- a/mapscript/csharp/MS_SHAPE_TYPE.cs
+++ b/mapscript/csharp/MS_SHAPE_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_STYLE_BINDING_ENUM.cs b/mapscript/csharp/MS_STYLE_BINDING_ENUM.cs
index 665304d..8611b48 100644
--- a/mapscript/csharp/MS_STYLE_BINDING_ENUM.cs
+++ b/mapscript/csharp/MS_STYLE_BINDING_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_SYMBOL_TYPE.cs b/mapscript/csharp/MS_SYMBOL_TYPE.cs
index 421b7f3..2ed08bb 100644
--- a/mapscript/csharp/MS_SYMBOL_TYPE.cs
+++ b/mapscript/csharp/MS_SYMBOL_TYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs b/mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs
index 25bf6f0..0ccea29 100644
--- a/mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs
+++ b/mapscript/csharp/MS_TOKEN_BINDING_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs b/mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs
index d5ef96f..bf3d13a 100644
--- a/mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs
+++ b/mapscript/csharp/MS_TOKEN_COMPARISON_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs b/mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs
index d24a8ac..9ad3693 100644
--- a/mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs
+++ b/mapscript/csharp/MS_TOKEN_FUNCTION_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs b/mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs
index 812f0f3..0591c7c 100644
--- a/mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs
+++ b/mapscript/csharp/MS_TOKEN_LITERAL_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs b/mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs
index 0473f91..831fc05 100644
--- a/mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs
+++ b/mapscript/csharp/MS_TOKEN_LOGICAL_ENUM.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_TRANSFORM_MODE.cs b/mapscript/csharp/MS_TRANSFORM_MODE.cs
index 9bd48c3..4a66508 100644
--- a/mapscript/csharp/MS_TRANSFORM_MODE.cs
+++ b/mapscript/csharp/MS_TRANSFORM_MODE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/MS_UNITS.cs b/mapscript/csharp/MS_UNITS.cs
index 83be2fe..cde7210 100644
--- a/mapscript/csharp/MS_UNITS.cs
+++ b/mapscript/csharp/MS_UNITS.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/OWSRequest.cs b/mapscript/csharp/OWSRequest.cs
index 1586eff..08a32ff 100644
--- a/mapscript/csharp/OWSRequest.cs
+++ b/mapscript/csharp/OWSRequest.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/SWIGTYPE_p_double.cs b/mapscript/csharp/SWIGTYPE_p_double.cs
index 4e5fe05..86b2c51 100644
--- a/mapscript/csharp/SWIGTYPE_p_double.cs
+++ b/mapscript/csharp/SWIGTYPE_p_double.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/SWIGTYPE_p_int.cs b/mapscript/csharp/SWIGTYPE_p_int.cs
index cb49b54..cb84b6a 100644
--- a/mapscript/csharp/SWIGTYPE_p_int.cs
+++ b/mapscript/csharp/SWIGTYPE_p_int.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/SWIGTYPE_p_p_char.cs b/mapscript/csharp/SWIGTYPE_p_p_char.cs
index 8453c7d..70929e8 100644
--- a/mapscript/csharp/SWIGTYPE_p_p_char.cs
+++ b/mapscript/csharp/SWIGTYPE_p_p_char.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs b/mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs
index dd68bff..2af577f 100644
--- a/mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs
+++ b/mapscript/csharp/SWIGTYPE_p_tileCacheObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/SWIGTYPE_p_uint32_t.cs b/mapscript/csharp/SWIGTYPE_p_uint32_t.cs
index a864742..47e60b0 100644
--- a/mapscript/csharp/SWIGTYPE_p_uint32_t.cs
+++ b/mapscript/csharp/SWIGTYPE_p_uint32_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/classObj.cs b/mapscript/csharp/classObj.cs
index 2e60556..5c1f125 100644
--- a/mapscript/csharp/classObj.cs
+++ b/mapscript/csharp/classObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/clusterObj.cs b/mapscript/csharp/clusterObj.cs
index f9d28a6..ceec68f 100644
--- a/mapscript/csharp/clusterObj.cs
+++ b/mapscript/csharp/clusterObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/colorObj.cs b/mapscript/csharp/colorObj.cs
index f6b04a8..81c4e71 100644
--- a/mapscript/csharp/colorObj.cs
+++ b/mapscript/csharp/colorObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/debugLevel.cs b/mapscript/csharp/debugLevel.cs
index ff88d4d..69103d6 100644
--- a/mapscript/csharp/debugLevel.cs
+++ b/mapscript/csharp/debugLevel.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/errorObj.cs b/mapscript/csharp/errorObj.cs
index b00c025..2fb69b3 100644
--- a/mapscript/csharp/errorObj.cs
+++ b/mapscript/csharp/errorObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/fontSetObj.cs b/mapscript/csharp/fontSetObj.cs
index d9e34ce..fd4ac0f 100644
--- a/mapscript/csharp/fontSetObj.cs
+++ b/mapscript/csharp/fontSetObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/hashTableObj.cs b/mapscript/csharp/hashTableObj.cs
index c43470e..c3d7815 100644
--- a/mapscript/csharp/hashTableObj.cs
+++ b/mapscript/csharp/hashTableObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/imageObj.cs b/mapscript/csharp/imageObj.cs
index 7a97aae..dc2504e 100644
--- a/mapscript/csharp/imageObj.cs
+++ b/mapscript/csharp/imageObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/intarray.cs b/mapscript/csharp/intarray.cs
index 2356cf9..cbd1850 100644
--- a/mapscript/csharp/intarray.cs
+++ b/mapscript/csharp/intarray.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelCacheMemberObj.cs b/mapscript/csharp/labelCacheMemberObj.cs
index 69694c3..eef713a 100644
--- a/mapscript/csharp/labelCacheMemberObj.cs
+++ b/mapscript/csharp/labelCacheMemberObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelCacheObj.cs b/mapscript/csharp/labelCacheObj.cs
index a748c0b..223db21 100644
--- a/mapscript/csharp/labelCacheObj.cs
+++ b/mapscript/csharp/labelCacheObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelCacheSlotObj.cs b/mapscript/csharp/labelCacheSlotObj.cs
index f977c4c..9cd2d83 100644
--- a/mapscript/csharp/labelCacheSlotObj.cs
+++ b/mapscript/csharp/labelCacheSlotObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelLeaderObj.cs b/mapscript/csharp/labelLeaderObj.cs
index 034c7b6..de6d017 100644
--- a/mapscript/csharp/labelLeaderObj.cs
+++ b/mapscript/csharp/labelLeaderObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelObj.cs b/mapscript/csharp/labelObj.cs
index 5ff727e..f335357 100644
--- a/mapscript/csharp/labelObj.cs
+++ b/mapscript/csharp/labelObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/labelStyleObj.cs b/mapscript/csharp/labelStyleObj.cs
index 366c62a..c5ffedb 100644
--- a/mapscript/csharp/labelStyleObj.cs
+++ b/mapscript/csharp/labelStyleObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/layerObj.cs b/mapscript/csharp/layerObj.cs
index e08d7ff..b373ee0 100644
--- a/mapscript/csharp/layerObj.cs
+++ b/mapscript/csharp/layerObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/legendObj.cs b/mapscript/csharp/legendObj.cs
index 4351a40..73db181 100644
--- a/mapscript/csharp/legendObj.cs
+++ b/mapscript/csharp/legendObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/lineObj.cs b/mapscript/csharp/lineObj.cs
index 02fb64c..8524297 100644
--- a/mapscript/csharp/lineObj.cs
+++ b/mapscript/csharp/lineObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/mapObj.cs b/mapscript/csharp/mapObj.cs
index 3755602..a146149 100644
--- a/mapscript/csharp/mapObj.cs
+++ b/mapscript/csharp/mapObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -67,25 +67,16 @@ public class mapObj : IDisposable {
     }
   }
 
-  public string processTemplate(int bGenerateImages, string[] names, string[] values)
-  {
-	if (names.Length != values.Length)
-	    throw new ArgumentException("Invalid array length specified!");
-	return processTemplate(bGenerateImages, names, values, values.Length);
+  public override bool Equals(object obj) {
+    if (obj == null)
+        return false;
+    if (this.GetType() != obj.GetType())
+        return false;
+    return swigCPtr.Handle.Equals(mapObj.getCPtr((mapObj)obj).Handle);
   }
-  
-  public string processLegendTemplate(string[] names, string[] values)
-  {
-	if (names.Length != values.Length)
-	    throw new ArgumentException("Invalid array length specified!");
-	return processLegendTemplate(names, values, values.Length);
-  }
-  
-  public string processQueryTemplate(string[] names, string[] values)
-  {
-	if (names.Length != values.Length)
-	    throw new ArgumentException("Invalid array length specified!");
-	return processQueryTemplate(names, values, values.Length);
+
+  public override int GetHashCode() {
+    return swigCPtr.Handle.GetHashCode();
   }
 
   public string name {
diff --git a/mapscript/csharp/mapscript.cs b/mapscript/csharp/mapscript.cs
index 14e1781..be527db 100644
--- a/mapscript/csharp/mapscript.cs
+++ b/mapscript/csharp/mapscript.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/mapscriptPINVOKE.cs b/mapscript/csharp/mapscriptPINVOKE.cs
index 70f44c4..fe6e520 100644
--- a/mapscript/csharp/mapscriptPINVOKE.cs
+++ b/mapscript/csharp/mapscriptPINVOKE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -188,6 +188,10 @@ class mapscriptPINVOKE {
   }
 
 
+  static mapscriptPINVOKE() {
+  }
+
+
   [DllImport("mapscript", EntryPoint="CSharp_new_intarray")]
   public static extern IntPtr new_intarray(int jarg1);
 
diff --git a/mapscript/csharp/mapscript_wrap.c b/mapscript/csharp/mapscript_wrap.c
index 3f674e1..92b2e13 100644
--- a/mapscript/csharp/mapscript_wrap.c
+++ b/mapscript/csharp/mapscript_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -687,7 +687,7 @@ SWIGINTERN int labelObj_moveStyleUp(labelObj *self,int index){
 SWIGINTERN int labelObj_moveStyleDown(labelObj *self,int index){
        return msMoveLabelStyleDown(self, index);
     }
-SWIGINTERN classObj *new_classObj(layerObj *layer){
+SWIGINTERN struct classObj *new_classObj(layerObj *layer){
         classObj *new_class=NULL;
         
         if (!layer)
@@ -719,7 +719,7 @@ SWIGINTERN classObj *new_classObj(layerObj *layer){
 
         return NULL;
     }
-SWIGINTERN void delete_classObj(classObj *self){
+SWIGINTERN void delete_classObj(struct classObj *self){
         if (self)
         {
             if (freeClass(self)==MS_SUCCESS) {
@@ -728,10 +728,10 @@ SWIGINTERN void delete_classObj(classObj *self){
 	    }
         }
     }
-SWIGINTERN int classObj_updateFromString(classObj *self,char *snippet){
+SWIGINTERN int classObj_updateFromString(struct classObj *self,char *snippet){
         return msUpdateClassFromString(self, snippet, 0);
     }
-SWIGINTERN classObj *classObj_clone(classObj *self){
+SWIGINTERN classObj *classObj_clone(struct classObj *self){
         classObj *new_class;
 
         new_class = (classObj *) malloc(sizeof(classObj));
@@ -758,27 +758,27 @@ SWIGINTERN classObj *classObj_clone(classObj *self){
         
         return new_class;
     }
-SWIGINTERN int classObj_setExpression(classObj *self,char *expression){
+SWIGINTERN int classObj_setExpression(struct classObj *self,char *expression){
     if (!expression || strlen(expression) == 0) {
        freeExpression(&self->expression);
        return MS_SUCCESS;
     }
     else return msLoadExpressionString(&self->expression, expression);
   }
-SWIGINTERN char *classObj_getExpressionString(classObj *self){
+SWIGINTERN char *classObj_getExpressionString(struct classObj *self){
     return msGetExpressionString(&(self->expression));
   }
-SWIGINTERN int classObj_setText(classObj *self,char *text){
+SWIGINTERN int classObj_setText(struct classObj *self,char *text){
     if (!text || strlen(text) == 0) {
       freeExpression(&self->text);
       return MS_SUCCESS;
     }	
     else return msLoadExpressionString(&self->text, text);
   }
-SWIGINTERN char *classObj_getTextString(classObj *self){
+SWIGINTERN char *classObj_getTextString(struct classObj *self){
     return msGetExpressionString(&(self->text));
   }
-SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
+SWIGINTERN char *classObj_getMetaData(struct classObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -791,24 +791,24 @@ SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int classObj_setMetaData(classObj *self,char *name,char *value){
+SWIGINTERN int classObj_setMetaData(struct classObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN char *classObj_getFirstMetaDataKey(classObj *self){
+SWIGINTERN char *classObj_getFirstMetaDataKey(struct classObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->metadata));
   }
-SWIGINTERN char *classObj_getNextMetaDataKey(classObj *self,char *lastkey){
+SWIGINTERN char *classObj_getNextMetaDataKey(struct classObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
   }
-SWIGINTERN int classObj_drawLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
+SWIGINTERN int classObj_drawLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
     return msDrawLegendIcon(map, layer, self, width, height, dstImage, dstX, dstY);
   }
-SWIGINTERN imageObj *classObj_createLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height){
+SWIGINTERN imageObj *classObj_createLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height){
     return msCreateLegendIcon(map, layer, self, width, height);
   }
-SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
+SWIGINTERN labelObj *classObj_getLabel(struct classObj *self,int i){
     if (i >= 0 && i < self->numlabels) {
       MS_REFCNT_INCR(self->labels[i]);
       return self->labels[i];
@@ -817,15 +817,15 @@ SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_addLabel(classObj *self,labelObj *label){
+SWIGINTERN int classObj_addLabel(struct classObj *self,labelObj *label){
     return msAddLabelToClass(self, label);
   }
-SWIGINTERN labelObj *classObj_removeLabel(classObj *self,int index){
+SWIGINTERN labelObj *classObj_removeLabel(struct classObj *self,int index){
     labelObj* label = (labelObj *) msRemoveLabelFromClass(self, index);
     if (label) MS_REFCNT_INCR(label);
     return label;
   }
-SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
+SWIGINTERN styleObj *classObj_getStyle(struct classObj *self,int i){
     if (i >= 0 && i < self->numstyles) {
       MS_REFCNT_INCR(self->styles[i]);
       return self->styles[i];
@@ -834,18 +834,18 @@ SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_insertStyle(classObj *self,styleObj *style,int index){
+SWIGINTERN int classObj_insertStyle(struct classObj *self,styleObj *style,int index){
     return msInsertStyle(self, style, index);
   }
-SWIGINTERN styleObj *classObj_removeStyle(classObj *self,int index){
+SWIGINTERN styleObj *classObj_removeStyle(struct classObj *self,int index){
     styleObj* style = (styleObj *) msRemoveStyle(self, index);
     if (style) MS_REFCNT_INCR(style);
     return style;
   }
-SWIGINTERN int classObj_moveStyleUp(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleUp(struct classObj *self,int index){
     return msMoveStyleUp(self, index);
   }
-SWIGINTERN int classObj_moveStyleDown(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleDown(struct classObj *self,int index){
     return msMoveStyleDown(self, index);
   }
 SWIGINTERN void labelCacheObj_freeCache(labelCacheObj *self){
@@ -1017,7 +1017,7 @@ SWIGINTERN int imageObj_getSize(imageObj *self){
 	free(buffer.data);
         return size;
     }
-SWIGINTERN layerObj *new_layerObj(mapObj *map){
+SWIGINTERN struct layerObj *new_layerObj(mapObj *map){
         layerObj *layer;
         int result;
         
@@ -1054,7 +1054,7 @@ SWIGINTERN layerObj *new_layerObj(mapObj *map){
             return (map->layers[map->numlayers-1]);
         }
     }
-SWIGINTERN void delete_layerObj(layerObj *self){
+SWIGINTERN void delete_layerObj(struct layerObj *self){
         /*if (!self->map) {*/
         if (self) {
             if(freeLayer(self)==MS_SUCCESS) {
@@ -1062,7 +1062,7 @@ SWIGINTERN void delete_layerObj(layerObj *self){
 	    }
         }
     }
-SWIGINTERN layerObj *layerObj_clone(layerObj *self){
+SWIGINTERN layerObj *layerObj_clone(struct layerObj *self){
         layerObj *layer;
         int result;
 
@@ -1089,20 +1089,20 @@ SWIGINTERN layerObj *layerObj_clone(layerObj *self){
         
         return layer;
     }
-SWIGINTERN int layerObj_updateFromString(layerObj *self,char *snippet){
+SWIGINTERN int layerObj_updateFromString(struct layerObj *self,char *snippet){
         return msUpdateLayerFromString(self, snippet, 0);
     }
-SWIGINTERN int layerObj_insertClass(layerObj *self,classObj *classobj,int index){
+SWIGINTERN int layerObj_insertClass(struct layerObj *self,classObj *classobj,int index){
         return msInsertClass(self, classobj, index);
     }
-SWIGINTERN classObj *layerObj_removeClass(layerObj *self,int index){
+SWIGINTERN classObj *layerObj_removeClass(struct layerObj *self,int index){
         classObj* c = msRemoveClass(self, index);
 	if (c != NULL) {
 		MS_REFCNT_INCR(c);
 	}
 	return c;
     }
-SWIGINTERN int layerObj_open(layerObj *self){
+SWIGINTERN int layerObj_open(struct layerObj *self){
         int status;
         status =  msLayerOpen(self);
         if (status == MS_SUCCESS) {
@@ -1110,7 +1110,7 @@ SWIGINTERN int layerObj_open(layerObj *self){
         }
         return status;
     }
-SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
+SWIGINTERN int layerObj_whichShapes(struct layerObj *self,rectObj rect){
         int oldconnectiontype = self->connectiontype;
         self->connectiontype = MS_INLINE;
 
@@ -1122,7 +1122,7 @@ SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
 
         return msLayerWhichShapes(self, rect, 0);
     }
-SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
+SWIGINTERN shapeObj *layerObj_nextShape(struct layerObj *self){
        int status;
        shapeObj *shape;
 
@@ -1138,10 +1138,10 @@ SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
        } else
          return shape;
     }
-SWIGINTERN void layerObj_close(layerObj *self){
+SWIGINTERN void layerObj_close(struct layerObj *self){
         msLayerClose(self);
     }
-SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
+SWIGINTERN shapeObj *layerObj_getShape(struct layerObj *self,resultObj *record){
         int retval;
         shapeObj *shape;
 
@@ -1156,25 +1156,25 @@ SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
         retval = msLayerGetShape(self, shape, record);
         return shape;
     }
-SWIGINTERN int layerObj_getNumResults(layerObj *self){
+SWIGINTERN int layerObj_getNumResults(struct layerObj *self){
         if (!self->resultcache) return 0;
         return self->resultcache->numresults;
     }
-SWIGINTERN rectObj *layerObj_getResultsBounds(layerObj *self){
+SWIGINTERN rectObj *layerObj_getResultsBounds(struct layerObj *self){
         rectObj *bounds;
         if (!self->resultcache) return NULL;
         bounds = (rectObj *) malloc(sizeof(rectObj));
         MS_COPYRECT(bounds, &self->resultcache->bounds);
         return bounds;
     }
-SWIGINTERN resultObj *layerObj_getResult(layerObj *self,int i){
+SWIGINTERN resultObj *layerObj_getResult(struct layerObj *self,int i){
         if (!self->resultcache) return NULL;
         if (i >= 0 && i < self->resultcache->numresults)
             return &self->resultcache->results[i]; 
         else
             return NULL;
     }
-SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
+SWIGINTERN classObj *layerObj_getClass(struct layerObj *self,int i){
 	classObj *result=NULL;
         if (i >= 0 && i < self->numclasses) {
             result=self->class[i]; 
@@ -1182,23 +1182,23 @@ SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
 	}
 	return result;
     }
-SWIGINTERN char *layerObj_getItem(layerObj *self,int i){
+SWIGINTERN char *layerObj_getItem(struct layerObj *self,int i){
   
         if (i >= 0 && i < self->numitems)
             return (char *) (self->items[i]);
         else
             return NULL;
     }
-SWIGINTERN int layerObj_setItems(layerObj *self,char **items,int numitems){
+SWIGINTERN int layerObj_setItems(struct layerObj *self,char **items,int numitems){
         return msLayerSetItems(self, items, numitems);
     }
-SWIGINTERN int layerObj_draw(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_draw(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_drawQuery(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_drawQuery(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawQueryLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
+SWIGINTERN int layerObj_queryByFilter(struct layerObj *self,mapObj *map,char *string){
         int status;
         int retval;
 
@@ -1222,7 +1222,7 @@ SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
         self->status = status;
 	return retval;
     }
-SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
+SWIGINTERN int layerObj_queryByAttributes(struct layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
         int status;
         int retval;
 
@@ -1242,7 +1242,7 @@ SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
+SWIGINTERN int layerObj_queryByPoint(struct layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
         int status;
         int retval;
 
@@ -1261,7 +1261,7 @@ SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
+SWIGINTERN int layerObj_queryByRect(struct layerObj *self,mapObj *map,rectObj rect){
         int status;
         int retval;
 
@@ -1279,7 +1279,7 @@ SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
+SWIGINTERN int layerObj_queryByFeatures(struct layerObj *self,mapObj *map,int slayer){
         int status;
         int retval;
 
@@ -1292,7 +1292,7 @@ SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape){
+SWIGINTERN int layerObj_queryByShape(struct layerObj *self,mapObj *map,shapeObj *shape){
         int status;
         int retval;
         
@@ -1311,7 +1311,7 @@ SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape)
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
+SWIGINTERN int layerObj_queryByIndex(struct layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
         int status;
         int retval;
         
@@ -1330,31 +1330,31 @@ SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,in
         self->status = status;
         return retval;
     }
-SWIGINTERN resultCacheObj *layerObj_getResults(layerObj *self){
+SWIGINTERN resultCacheObj *layerObj_getResults(struct layerObj *self){
         return self->resultcache;
     }
-SWIGINTERN int layerObj_setFilter(layerObj *self,char *filter){
+SWIGINTERN int layerObj_setFilter(struct layerObj *self,char *filter){
         if (!filter || strlen(filter) == 0) {
             freeExpression(&self->filter);
             return MS_SUCCESS;
         }
         else return msLoadExpressionString(&self->filter, filter);
     }
-SWIGINTERN char *layerObj_getFilterString(layerObj *self){
+SWIGINTERN char *layerObj_getFilterString(struct layerObj *self){
         return msGetExpressionString(&(self->filter));
     }
-SWIGINTERN int layerObj_setWKTProjection(layerObj *self,char *wkt){
+SWIGINTERN int layerObj_setWKTProjection(struct layerObj *self,char *wkt){
         self->project = 1;
         return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
     }
-SWIGINTERN char *layerObj_getProjection(layerObj *self){    
+SWIGINTERN char *layerObj_getProjection(struct layerObj *self){    
         return (char *) msGetProjectionString(&(self->projection));
     }
-SWIGINTERN int layerObj_setProjection(layerObj *self,char *proj4){
+SWIGINTERN int layerObj_setProjection(struct layerObj *self,char *proj4){
         self->project = 1;
         return msLoadProjectionString(&(self->projection), proj4);
     }
-SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){    
+SWIGINTERN int layerObj_addFeature(struct layerObj *self,shapeObj *shape){    
         self->connectiontype = MS_INLINE;
         if(self->features != NULL && self->features->tailifhead != NULL) 
             shape->index = self->features->tailifhead->shape.index + 1;
@@ -1364,16 +1364,16 @@ SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_getNumFeatures(layerObj *self){
+SWIGINTERN int layerObj_getNumFeatures(struct layerObj *self){
         return msLayerGetNumFeatures(self);
     }
-SWIGINTERN rectObj *layerObj_getExtent(layerObj *self){
+SWIGINTERN rectObj *layerObj_getExtent(struct layerObj *self){
         rectObj *extent;
         extent = (rectObj *) malloc(sizeof(rectObj));
         msLayerGetExtent(self, extent);
         return extent;
     }
-SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double maxx,double maxy){
+SWIGINTERN int layerObj_setExtent(struct layerObj *self,double minx,double miny,double maxx,double maxy){
         if (minx > maxx || miny > maxy) {
             msSetError(34,
                 "{ 'minx': %f , 'miny': %f , 'maxx': %f , 'maxy': %f }",
@@ -1383,7 +1383,7 @@ SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double
 
         return msLayerSetExtent(self, minx, miny, maxx, maxy);
     }
-SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
+SWIGINTERN char *layerObj_getMetaData(struct layerObj *self,char *name){
         char *value = NULL;
         if (!name) {
             msSetError(16, "NULL key", "getMetaData");
@@ -1404,37 +1404,37 @@ SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
 
         return value;
     }
-SWIGINTERN int layerObj_setMetaData(layerObj *self,char *name,char *value){
+SWIGINTERN int layerObj_setMetaData(struct layerObj *self,char *name,char *value){
         if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_removeMetaData(layerObj *self,char *name){
+SWIGINTERN int layerObj_removeMetaData(struct layerObj *self,char *name){
         return(msRemoveHashTable(&(self->metadata), name));
     }
-SWIGINTERN char *layerObj_getFirstMetaDataKey(layerObj *self){
+SWIGINTERN char *layerObj_getFirstMetaDataKey(struct layerObj *self){
         return (char *) msFirstKeyFromHashTable(&(self->metadata));
     }
-SWIGINTERN char *layerObj_getNextMetaDataKey(layerObj *self,char *lastkey){
+SWIGINTERN char *layerObj_getNextMetaDataKey(struct layerObj *self,char *lastkey){
         return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
     }
-SWIGINTERN char *layerObj_getWMSFeatureInfoURL(layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
+SWIGINTERN char *layerObj_getWMSFeatureInfoURL(struct layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
         return (char *) msWMSGetFeatureInfoURL(map, self, click_x, click_y,
                feature_count, info_format);
     }
-SWIGINTERN char *layerObj_executeWFSGetFeature(layerObj *self,layerObj *layer){
+SWIGINTERN char *layerObj_executeWFSGetFeature(struct layerObj *self,layerObj *layer){
         return (char *) msWFSExecuteGetFeature(layer);
     }
-SWIGINTERN int layerObj_applySLD(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLD(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLD(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN int layerObj_applySLDURL(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLDURL(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLDURL(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN char *layerObj_generateSLD(layerObj *self){
+SWIGINTERN char *layerObj_generateSLD(struct layerObj *self){
         return (char *) msSLDGenerateSLD(self->map, self->index, NULL);
     }
-SWIGINTERN int layerObj_isVisible(layerObj *self){
+SWIGINTERN int layerObj_isVisible(struct layerObj *self){
         if (!self->map)
         {
             msSetError(12,
@@ -1444,31 +1444,31 @@ SWIGINTERN int layerObj_isVisible(layerObj *self){
         }
         return msLayerIsVisible(self->map, self);
     }
-SWIGINTERN int layerObj_moveClassUp(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassUp(struct layerObj *self,int index){
         return msMoveClassUp(self, index);
     }
-SWIGINTERN int layerObj_moveClassDown(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassDown(struct layerObj *self,int index){
         return msMoveClassDown(self, index);
     }
-SWIGINTERN void layerObj_setProcessingKey(layerObj *self,char const *key,char const *value){
+SWIGINTERN void layerObj_setProcessingKey(struct layerObj *self,char const *key,char const *value){
 	   msLayerSetProcessingKey( self, key, value );
     }
-SWIGINTERN void layerObj_setProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_setProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN void layerObj_addProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_addProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN char *layerObj_getProcessing(layerObj *self,int index){
+SWIGINTERN char *layerObj_getProcessing(struct layerObj *self,int index){
         return (char *) msLayerGetProcessing(self, index);
     }
-SWIGINTERN char *layerObj_getProcessingKey(layerObj *self,char const *key){
+SWIGINTERN char *layerObj_getProcessingKey(struct layerObj *self,char const *key){
       return (char *) msLayerGetProcessingKey(self, key);
     }
-SWIGINTERN int layerObj_clearProcessing(layerObj *self){
+SWIGINTERN int layerObj_clearProcessing(struct layerObj *self){
         return msLayerClearProcessing(self);
     }
-SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char const *library_str){    
+SWIGINTERN int layerObj_setConnectionType(struct layerObj *self,int connectiontype,char const *library_str){    
         /* Caller is responsible to close previous layer correctly before
          * calling msConnectLayer() 
          */
@@ -1476,20 +1476,20 @@ SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char
           msLayerClose(self);
         return msConnectLayer(self, connectiontype, library_str);
     }
-SWIGINTERN int layerObj_getClassIndex(layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
+SWIGINTERN int layerObj_getClassIndex(struct layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
         return msShapeGetClass(self, map, shape, classgroup, numclasses);
     }
-SWIGINTERN mapObj *new_mapObj(char *filename){
+SWIGINTERN struct mapObj *new_mapObj(char *filename){
         if (filename && strlen(filename))
             return msLoadMap(filename, NULL);
         else { /* create an empty map, no layers etc... */
             return msNewMapObj();
         }      
     }
-SWIGINTERN void delete_mapObj(mapObj *self){
+SWIGINTERN void delete_mapObj(struct mapObj *self){
         msFreeMap(self);
     }
-SWIGINTERN mapObj *mapObj_clone(mapObj *self){
+SWIGINTERN mapObj *mapObj_clone(struct mapObj *self){
         mapObj *dstMap;
         dstMap = msNewMapObj();
         if (msCopyMap(dstMap, self) != MS_SUCCESS) {
@@ -1498,33 +1498,33 @@ SWIGINTERN mapObj *mapObj_clone(mapObj *self){
         }
         return dstMap;
     }
-SWIGINTERN int mapObj_insertLayer(mapObj *self,layerObj *layer,int index){
+SWIGINTERN int mapObj_insertLayer(struct mapObj *self,layerObj *layer,int index){
         return msInsertLayer(self, layer, index);  
     }
-SWIGINTERN layerObj *mapObj_removeLayer(mapObj *self,int index){
+SWIGINTERN layerObj *mapObj_removeLayer(struct mapObj *self,int index){
     	layerObj *layer=msRemoveLayer(self, index);
 	MS_REFCNT_INCR(layer);
         return layer;
     }
-SWIGINTERN int mapObj_setExtent(mapObj *self,double minx,double miny,double maxx,double maxy){	
+SWIGINTERN int mapObj_setExtent(struct mapObj *self,double minx,double miny,double maxx,double maxy){	
 	return msMapSetExtent( self, minx, miny, maxx, maxy );
     }
-SWIGINTERN int mapObj_offsetExtent(mapObj *self,double x,double y){	
+SWIGINTERN int mapObj_offsetExtent(struct mapObj *self,double x,double y){	
 	return msMapOffsetExtent( self, x, y );
     }
-SWIGINTERN int mapObj_scaleExtent(mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
+SWIGINTERN int mapObj_scaleExtent(struct mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
 	return msMapScaleExtent( self, zoomfactor, minscaledenom, maxscaledenom );
     }
-SWIGINTERN int mapObj_setCenter(mapObj *self,pointObj *center){	
+SWIGINTERN int mapObj_setCenter(struct mapObj *self,pointObj *center){	
 	return msMapSetCenter( self, center );
     }
-SWIGINTERN int mapObj_setSize(mapObj *self,int width,int height){
+SWIGINTERN int mapObj_setSize(struct mapObj *self,int width,int height){
         return msMapSetSize(self, width, height);
     }
-SWIGINTERN int mapObj_setRotation(mapObj *self,double rotation_angle){
+SWIGINTERN int mapObj_setRotation(struct mapObj *self,double rotation_angle){
         return msMapSetRotation( self, rotation_angle );
     }
-SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
+SWIGINTERN layerObj *mapObj_getLayer(struct mapObj *self,int i){
     if(i >= 0 && i < self->numlayers) {
     	MS_REFCNT_INCR(self->layers[i]);
       	return (self->layers[i]); /* returns an EXISTING layer */
@@ -1532,7 +1532,7 @@ SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
+SWIGINTERN layerObj *mapObj_getLayerByName(struct mapObj *self,char *name){
     int i;
 
     i = msGetLayerIndex(self, name);
@@ -1544,19 +1544,19 @@ SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
     else
       return NULL;
   }
-SWIGINTERN int mapObj_getSymbolByName(mapObj *self,char *name){
+SWIGINTERN int mapObj_getSymbolByName(struct mapObj *self,char *name){
     return msGetSymbolIndex(&self->symbolset, name, 1);
   }
-SWIGINTERN void mapObj_prepareQuery(mapObj *self){
+SWIGINTERN void mapObj_prepareQuery(struct mapObj *self){
     int status;
 
     status = msCalculateScale(self->extent, self->units, self->width, self->height, self->resolution, &self->scaledenom);
     if(status != MS_SUCCESS) self->scaledenom = -1;
   }
-SWIGINTERN imageObj *mapObj_prepareImage(mapObj *self){
+SWIGINTERN imageObj *mapObj_prepareImage(struct mapObj *self){
     return msPrepareImage(self, 0);
   }
-SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_setImageType(struct mapObj *self,char *imagetype){
       outputFormatObj *format;
 
       format = msSelectOutputFormat( self, imagetype );
@@ -1571,7 +1571,7 @@ SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
                                -1111, -1111 );
       }
   }
-SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_selectOutputFormat(struct mapObj *self,char *imagetype){
         outputFormatObj *format;
 
         format = msSelectOutputFormat( self, imagetype );
@@ -1586,38 +1586,38 @@ SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
                                  -1111, -1111 );
         }
     }
-SWIGINTERN void mapObj_setOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN void mapObj_setOutputFormat(struct mapObj *self,outputFormatObj *format){
       msApplyOutputFormat( &(self->outputformat), format, -1111, 
                            -1111, -1111 );
   }
-SWIGINTERN imageObj *mapObj_draw(mapObj *self){
+SWIGINTERN imageObj *mapObj_draw(struct mapObj *self){
     return msDrawMap(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawQuery(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawQuery(struct mapObj *self){
     return msDrawMap(self, 1);
   }
-SWIGINTERN imageObj *mapObj_drawLegend(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawLegend(struct mapObj *self){
     return msDrawLegend(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawScalebar(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawScalebar(struct mapObj *self){
     return msDrawScalebar(self);
   }
-SWIGINTERN imageObj *mapObj_drawReferenceMap(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawReferenceMap(struct mapObj *self){
     return msDrawReferenceMap(self);
   }
-SWIGINTERN int mapObj_embedScalebar(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedScalebar(struct mapObj *self,imageObj *image){	
     return msEmbedScalebar(self, image);
   }
-SWIGINTERN int mapObj_embedLegend(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedLegend(struct mapObj *self,imageObj *image){	
     return msEmbedLegend(self, image);
   }
-SWIGINTERN int mapObj_drawLabelCache(mapObj *self,imageObj *image){
+SWIGINTERN int mapObj_drawLabelCache(struct mapObj *self,imageObj *image){
     return msDrawLabelCache(image, self);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_getLabel(mapObj *self,int i){
+SWIGINTERN labelCacheMemberObj *mapObj_getLabel(struct mapObj *self,int i){
     return msGetLabelCacheMember(&(self->labelcache), i);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
+SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(struct mapObj *self){
     static int i=0;
 
     if(i<self->labelcache.numlabels)
@@ -1625,7 +1625,7 @@ SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
     else
       return NULL;	
   }
-SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
+SWIGINTERN int mapObj_queryByFilter(struct mapObj *self,char *string){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_FILTER;
@@ -1641,7 +1641,7 @@ SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
 
     return msQueryByFilter(self);
   }
-SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double buffer){
+SWIGINTERN int mapObj_queryByPoint(struct mapObj *self,pointObj *point,int mode,double buffer){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_POINT;
@@ -1651,7 +1651,7 @@ SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double
 
     return msQueryByPoint(self);
   }
-SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
+SWIGINTERN int mapObj_queryByRect(struct mapObj *self,rectObj rect){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_RECT;
@@ -1660,11 +1660,11 @@ SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
 
     return msQueryByRect(self);
   }
-SWIGINTERN int mapObj_queryByFeatures(mapObj *self,int slayer){
+SWIGINTERN int mapObj_queryByFeatures(struct mapObj *self,int slayer){
     self->query.slayer = slayer;
     return msQueryByFeatures(self);
   }
-SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
+SWIGINTERN int mapObj_queryByShape(struct mapObj *self,shapeObj *shape){
     msInitQuery(&(self->query));
     
     self->query.type = MS_QUERY_BY_SHAPE;
@@ -1675,31 +1675,31 @@ SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
 
     return msQueryByShape(self);
   }
-SWIGINTERN int mapObj_setWKTProjection(mapObj *self,char *wkt){
+SWIGINTERN int mapObj_setWKTProjection(struct mapObj *self,char *wkt){
     return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
   }
-SWIGINTERN char *mapObj_getProjection(mapObj *self){
+SWIGINTERN char *mapObj_getProjection(struct mapObj *self){
     return msGetProjectionString(&(self->projection));
   }
-SWIGINTERN int mapObj_setProjection(mapObj *self,char *proj4){
+SWIGINTERN int mapObj_setProjection(struct mapObj *self,char *proj4){
     return msLoadProjectionString(&(self->projection), proj4);
   }
-SWIGINTERN int mapObj_save(mapObj *self,char *filename){
+SWIGINTERN int mapObj_save(struct mapObj *self,char *filename){
     return msSaveMap(self, filename);
   }
-SWIGINTERN int mapObj_saveQuery(mapObj *self,char *filename,int results){
+SWIGINTERN int mapObj_saveQuery(struct mapObj *self,char *filename,int results){
     return msSaveQuery(self, filename, results);
   }
-SWIGINTERN int mapObj_loadQuery(mapObj *self,char *filename){
+SWIGINTERN int mapObj_loadQuery(struct mapObj *self,char *filename){
     return msLoadQuery(self, filename);
   }
-SWIGINTERN void mapObj_freeQuery(mapObj *self,int qlayer){
+SWIGINTERN void mapObj_freeQuery(struct mapObj *self,int qlayer){
     msQueryFree(self, qlayer);
   }
-SWIGINTERN int mapObj_saveQueryAsGML(mapObj *self,char *filename,char const *ns){
+SWIGINTERN int mapObj_saveQueryAsGML(struct mapObj *self,char *filename,char const *ns){
     return msGMLWriteQuery(self, filename, ns);
   }
-SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
+SWIGINTERN char *mapObj_getMetaData(struct mapObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -1712,21 +1712,21 @@ SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int mapObj_setMetaData(mapObj *self,char *name,char *value){
+SWIGINTERN int mapObj_setMetaData(struct mapObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->web.metadata), name, value) == NULL)
 	return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN int mapObj_removeMetaData(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeMetaData(struct mapObj *self,char *name){
     return(msRemoveHashTable(&(self->web.metadata), name));
   }
-SWIGINTERN char *mapObj_getFirstMetaDataKey(mapObj *self){
+SWIGINTERN char *mapObj_getFirstMetaDataKey(struct mapObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->web.metadata));
   }
-SWIGINTERN char *mapObj_getNextMetaDataKey(mapObj *self,char *lastkey){
+SWIGINTERN char *mapObj_getNextMetaDataKey(struct mapObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->web.metadata), lastkey);
   }
-SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_setSymbolSet(struct mapObj *self,char *szFileName){
     msFreeSymbolSet(&self->symbolset);
     msInitSymbolSet(&self->symbolset);
    
@@ -1737,10 +1737,10 @@ SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
 
     return msLoadSymbolSet(&self->symbolset, self);
   }
-SWIGINTERN int mapObj_getNumSymbols(mapObj *self){
+SWIGINTERN int mapObj_getNumSymbols(struct mapObj *self){
     return self->symbolset.numsymbols;
   }
-SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
+SWIGINTERN int mapObj_setFontSet(struct mapObj *self,char *filename){
     msFreeFontSet(&(self->fontset));
     msInitFontSet(&(self->fontset));
    
@@ -1748,19 +1748,19 @@ SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
 
     return msLoadFontSet(&(self->fontset), self);
   }
-SWIGINTERN int mapObj_saveMapContext(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_saveMapContext(struct mapObj *self,char *szFileName){
     return msSaveMapContext(self, szFileName);
   }
-SWIGINTERN int mapObj_loadMapContext(mapObj *self,char *szFileName,int useUniqueNames){
+SWIGINTERN int mapObj_loadMapContext(struct mapObj *self,char *szFileName,int useUniqueNames){
     return msLoadMapContext(self, szFileName, useUniqueNames);
   }
-SWIGINTERN int mapObj_moveLayerUp(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerUp(struct mapObj *self,int layerindex){
     return msMoveLayerUp(self, layerindex);
   }
-SWIGINTERN int mapObj_moveLayerDown(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerDown(struct mapObj *self,int layerindex){
     return msMoveLayerDown(self, layerindex);
   }
-SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
+SWIGINTERN intarray *mapObj_getLayersDrawingOrder(struct mapObj *self){
     int i;
     intarray *order;
     order = new_intarray(self->numlayers);
@@ -1772,53 +1772,53 @@ SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
         
     return order;
   }
-SWIGINTERN int mapObj_setLayersDrawingOrder(mapObj *self,int *panIndexes){
+SWIGINTERN int mapObj_setLayersDrawingOrder(struct mapObj *self,int *panIndexes){
     return  msSetLayersdrawingOrder(self, panIndexes); 
   }
-SWIGINTERN void mapObj_setConfigOption(mapObj *self,char *key,char *value){
+SWIGINTERN void mapObj_setConfigOption(struct mapObj *self,char *key,char *value){
     msSetConfigOption(self,key,value);
   }
-SWIGINTERN char *mapObj_getConfigOption(mapObj *self,char *key){
+SWIGINTERN char *mapObj_getConfigOption(struct mapObj *self,char *key){
     return (char *) msGetConfigOption(self,key);
   }
-SWIGINTERN void mapObj_applyConfigOptions(mapObj *self){
+SWIGINTERN void mapObj_applyConfigOptions(struct mapObj *self){
     msApplyMapConfigOptions( self );
   }
-SWIGINTERN int mapObj_applySLD(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLD(struct mapObj *self,char *sld){
       return msSLDApplySLD(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN int mapObj_applySLDURL(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLDURL(struct mapObj *self,char *sld){
       return msSLDApplySLDURL(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN char *mapObj_generateSLD(mapObj *self){
+SWIGINTERN char *mapObj_generateSLD(struct mapObj *self){
         return (char *) msSLDGenerateSLD(self, -1, NULL);
     }
-SWIGINTERN char *mapObj_processTemplate(mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processTemplate(struct mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
         return msProcessTemplate(self, bGenerateImages, names, values,
                                  numentries);
     }
-SWIGINTERN char *mapObj_processLegendTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processLegendTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessLegendTemplate(self, names, values, numentries);
     }
-SWIGINTERN char *mapObj_processQueryTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processQueryTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessQueryTemplate(self, 1, names, values, numentries);
     }
-SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(mapObj *self,char *name){
+SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(struct mapObj *self,char *name){
         return msSelectOutputFormat(self, name); 
     }
-SWIGINTERN int mapObj_appendOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN int mapObj_appendOutputFormat(struct mapObj *self,outputFormatObj *format){
         return msAppendOutputFormat(self, format);
     }
-SWIGINTERN int mapObj_removeOutputFormat(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeOutputFormat(struct mapObj *self,char *name){
         return msRemoveOutputFormat(self, name);
     }
-SWIGINTERN int mapObj_loadOWSParameters(mapObj *self,cgiRequestObj *request,char *wmtver_string){
+SWIGINTERN int mapObj_loadOWSParameters(struct mapObj *self,cgiRequestObj *request,char *wmtver_string){
         return msMapLoadOWSParameters(self, request, wmtver_string);
     }
-SWIGINTERN int mapObj_OWSDispatch(mapObj *self,cgiRequestObj *req){
+SWIGINTERN int mapObj_OWSDispatch(struct mapObj *self,cgiRequestObj *req){
 	return msOWSDispatch( self, req, 1 );
     }
-SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomPoint(struct mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -1994,7 +1994,7 @@ SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,i
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomRectangle(struct mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
         double      dfNewScale;
@@ -2159,7 +2159,7 @@ SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,in
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomScale(mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomScale(struct mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -3073,11 +3073,11 @@ SWIGINTERN int symbolObj_setImage(symbolObj *self,imageObj *image){
 
         return MS_SUCCESS;
     }
-SWIGINTERN errorObj *new_errorObj(){    
+SWIGINTERN struct errorObj *new_errorObj(){    
         return msGetErrorObj();
     }
-SWIGINTERN void delete_errorObj(errorObj *self){}
-SWIGINTERN errorObj *errorObj_next(errorObj *self){
+SWIGINTERN void delete_errorObj(struct errorObj *self){}
+SWIGINTERN errorObj *errorObj_next(struct errorObj *self){
         errorObj *ep;	
 
         if (self == NULL || self->next == NULL) return NULL;
@@ -3343,7 +3343,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MAX_ERROR_LEN_get() {
   int jresult ;
   int result;
   
-  result = (int) 8192;
+  result = (int)(8192);
   jresult = result; 
   return jresult;
 }
@@ -3353,7 +3353,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_MS_VERSION_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "6.2.1";
+  result = (char *)("6.2.2");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
@@ -3363,7 +3363,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_VERSION_MAJOR_get() {
   int jresult ;
   int result;
   
-  result = (int) 6;
+  result = (int)(6);
   jresult = result; 
   return jresult;
 }
@@ -3373,7 +3373,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_VERSION_MINOR_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3383,7 +3383,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_VERSION_REV_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3393,7 +3393,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_VERSION_NUM_get() {
   int jresult ;
   int result;
   
-  result = (int) (6*10000+2*100+1);
+  result = (int)((6*10000+2*100+2));
   jresult = result; 
   return jresult;
 }
@@ -3403,7 +3403,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_TRUE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -3413,7 +3413,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_FALSE_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -3423,7 +3423,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_UNKNOWN_get() {
   int jresult ;
   int result;
   
-  result = (int) -1;
+  result = (int)(-1);
   jresult = result; 
   return jresult;
 }
@@ -3433,7 +3433,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_ON_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -3443,7 +3443,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_OFF_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -3453,7 +3453,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_DEFAULT_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3463,7 +3463,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_EMBED_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -3473,7 +3473,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_DELETE_get() {
   int jresult ;
   int result;
   
-  result = (int) 4;
+  result = (int)(4);
   jresult = result; 
   return jresult;
 }
@@ -3483,7 +3483,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_YES_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -3493,7 +3493,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NO_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -3503,7 +3503,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_GD_ALPHA_get() {
   int jresult ;
   int result;
   
-  result = (int) 1000;
+  result = (int)(1000);
   jresult = result; 
   return jresult;
 }
@@ -3513,7 +3513,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_LAYER_ALLOCSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 64;
+  result = (int)(64);
   jresult = result; 
   return jresult;
 }
@@ -3523,7 +3523,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_CLASS_ALLOCSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -3533,7 +3533,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_STYLE_ALLOCSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 4;
+  result = (int)(4);
   jresult = result; 
   return jresult;
 }
@@ -3543,7 +3543,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_LABEL_ALLOCSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3553,7 +3553,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MAX_LABEL_PRIORITY_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -3563,7 +3563,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MAX_LABEL_FONTS_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
@@ -3573,7 +3573,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_DEFAULT_LABEL_PRIORITY_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -3583,7 +3583,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_LABEL_FORCE_GROUP_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3593,7 +3593,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_SWF_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -3603,7 +3603,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_RAWDATA_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -3613,7 +3613,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_IMAGEMAP_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
@@ -3623,7 +3623,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_TEMPLATE_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -3633,7 +3633,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_OGR_get() {
   int jresult ;
   int result;
   
-  result = (int) 16;
+  result = (int)(16);
   jresult = result; 
   return jresult;
 }
@@ -3643,7 +3643,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_PLUGIN_get() {
   int jresult ;
   int result;
   
-  result = (int) 100;
+  result = (int)(100);
   jresult = result; 
   return jresult;
 }
@@ -3653,7 +3653,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_CAIRO_RASTER_get() {
   int jresult ;
   int result;
   
-  result = (int) 101;
+  result = (int)(101);
   jresult = result; 
   return jresult;
 }
@@ -3663,7 +3663,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_CAIRO_PDF_get() {
   int jresult ;
   int result;
   
-  result = (int) 102;
+  result = (int)(102);
   jresult = result; 
   return jresult;
 }
@@ -3673,7 +3673,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_CAIRO_SVG_get() {
   int jresult ;
   int result;
   
-  result = (int) 103;
+  result = (int)(103);
   jresult = result; 
   return jresult;
 }
@@ -3683,7 +3683,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_OGL_get() {
   int jresult ;
   int result;
   
-  result = (int) 104;
+  result = (int)(104);
   jresult = result; 
   return jresult;
 }
@@ -3693,7 +3693,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_AGG_get() {
   int jresult ;
   int result;
   
-  result = (int) 105;
+  result = (int)(105);
   jresult = result; 
   return jresult;
 }
@@ -3703,7 +3703,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_GD_get() {
   int jresult ;
   int result;
   
-  result = (int) 106;
+  result = (int)(106);
   jresult = result; 
   return jresult;
 }
@@ -3713,7 +3713,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDER_WITH_KML_get() {
   int jresult ;
   int result;
   
-  result = (int) 107;
+  result = (int)(107);
   jresult = result; 
   return jresult;
 }
@@ -3723,7 +3723,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_POSITIONS_LENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 14;
+  result = (int)(14);
   jresult = result; 
   return jresult;
 }
@@ -3733,7 +3733,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SINGLE_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -3743,7 +3743,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MULTIPLE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -3753,7 +3753,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_CJC_DEFAULT_JOIN_MAXSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -3763,7 +3763,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_STYLE_BINDING_LENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 12;
+  result = (int)(12);
   jresult = result; 
   return jresult;
 }
@@ -3773,7 +3773,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_LABEL_BINDING_LENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 9;
+  result = (int)(9);
   jresult = result; 
   return jresult;
 }
@@ -4675,7 +4675,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NOOVERRIDE_get() {
   int jresult ;
   int result;
   
-  result = (int) -1111;
+  result = (int)(-1111);
   jresult = result; 
   return jresult;
 }
@@ -8083,10 +8083,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_labelObj_moveStyleDown(void * jarg1, int jarg2
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_status_set(void * jarg1, int jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->status = arg2;
 }
@@ -8094,10 +8094,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_status_set(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_status_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->status);
   jresult = result; 
   return jresult;
@@ -8106,10 +8106,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_status_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_numstyles_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->numstyles);
   jresult = result; 
   return jresult;
@@ -8117,10 +8117,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_numstyles_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_numlabels_set(void * jarg1, int jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->numlabels = arg2;
 }
@@ -8128,10 +8128,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_numlabels_set(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_numlabels_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->numlabels);
   jresult = result; 
   return jresult;
@@ -8139,10 +8139,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_numlabels_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_name_set(void * jarg1, char * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->name) free((char*)arg1->name);
@@ -8158,10 +8158,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_name_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_name_get(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (char *) ((arg1)->name);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8169,10 +8169,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_name_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_title_set(void * jarg1, char * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->title) free((char*)arg1->title);
@@ -8188,10 +8188,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_title_set(void * jarg1, char * jarg2
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_title_get(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (char *) ((arg1)->title);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8199,10 +8199,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_title_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_template_set(void * jarg1, char * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->template) free((char*)arg1->template);
@@ -8218,10 +8218,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_template_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_template_get(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (char *) ((arg1)->template);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8229,10 +8229,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_template_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_type_set(void * jarg1, int jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->type = arg2;
 }
@@ -8240,10 +8240,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_type_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_type_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->type);
   jresult = result; 
   return jresult;
@@ -8252,10 +8252,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_type_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_metadata_get(void * jarg1) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->metadata);
   jresult = (void *)result; 
   return jresult;
@@ -8264,10 +8264,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_metadata_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_validation_get(void * jarg1) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->validation);
   jresult = (void *)result; 
   return jresult;
@@ -8275,10 +8275,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_validation_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_minscaledenom_set(void * jarg1, double jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->minscaledenom = arg2;
 }
@@ -8286,10 +8286,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_minscaledenom_set(void * jarg1, doub
 
 SWIGEXPORT double SWIGSTDCALL CSharp_classObj_minscaledenom_get(void * jarg1) {
   double jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (double) ((arg1)->minscaledenom);
   jresult = result; 
   return jresult;
@@ -8297,10 +8297,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_classObj_minscaledenom_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_maxscaledenom_set(void * jarg1, double jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->maxscaledenom = arg2;
 }
@@ -8308,10 +8308,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_maxscaledenom_set(void * jarg1, doub
 
 SWIGEXPORT double SWIGSTDCALL CSharp_classObj_maxscaledenom_get(void * jarg1) {
   double jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (double) ((arg1)->maxscaledenom);
   jresult = result; 
   return jresult;
@@ -8319,10 +8319,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_classObj_maxscaledenom_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_minfeaturesize_set(void * jarg1, int jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->minfeaturesize = arg2;
 }
@@ -8330,10 +8330,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_minfeaturesize_set(void * jarg1, int
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_minfeaturesize_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->minfeaturesize);
   jresult = result; 
   return jresult;
@@ -8342,10 +8342,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_minfeaturesize_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_refcount_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->refcount);
   jresult = result; 
   return jresult;
@@ -8354,10 +8354,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_refcount_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_layer_get(void * jarg1) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   struct layerObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (struct layerObj *) ((arg1)->layer);
   jresult = (void *)result; 
   return jresult;
@@ -8365,10 +8365,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_layer_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_debug_set(void * jarg1, int jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->debug = arg2;
 }
@@ -8376,10 +8376,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_debug_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_debug_get(void * jarg1) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (int) ((arg1)->debug);
   jresult = result; 
   return jresult;
@@ -8387,10 +8387,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_debug_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_keyimage_set(void * jarg1, char * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->keyimage) free((char*)arg1->keyimage);
@@ -8406,10 +8406,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_keyimage_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_keyimage_get(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (char *) ((arg1)->keyimage);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8417,10 +8417,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_keyimage_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_group_set(void * jarg1, char * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->group) free((char*)arg1->group);
@@ -8436,10 +8436,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_group_set(void * jarg1, char * jarg2
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_group_get(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (char *) ((arg1)->group);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -8447,10 +8447,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_group_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_classObj_leader_set(void * jarg1, void * jarg2) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   labelLeaderObj *arg2 = (labelLeaderObj *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (labelLeaderObj *)jarg2; 
   if (arg1) (arg1)->leader = *arg2;
 }
@@ -8458,10 +8458,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_classObj_leader_set(void * jarg1, void * jarg
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_leader_get(void * jarg1) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   labelLeaderObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   result = (labelLeaderObj *)& ((arg1)->leader);
   jresult = (void *)result; 
   return jresult;
@@ -8471,12 +8471,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_leader_get(void * jarg1) {
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_classObj(void * jarg1) {
   void * jresult ;
   layerObj *arg1 = (layerObj *) NULL ;
-  classObj *result = 0 ;
+  struct classObj *result = 0 ;
   
   arg1 = (layerObj *)jarg1; 
   {
     errorObj *ms_error;
-    result = (classObj *)new_classObj(arg1);
+    result = (struct classObj *)new_classObj(arg1);
     ms_error = msGetErrorObj();
     if (ms_error != NULL && ms_error->code != MS_NOERR) {
       if (ms_error->code != MS_NOTFOUND && ms_error->code != -1) {
@@ -8498,9 +8498,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_classObj(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_classObj(void * jarg1) {
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   {
     errorObj *ms_error;
     delete_classObj(arg1);
@@ -8524,11 +8524,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_classObj(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_updateFromString(void * jarg1, char * jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -8555,10 +8555,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_updateFromString(void * jarg1, char *
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_clone(void * jarg1) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   classObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (classObj *)classObj_clone(arg1);
@@ -8584,11 +8584,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_clone(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setExpression(void * jarg1, char * jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -8615,10 +8615,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setExpression(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getExpressionString(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)classObj_getExpressionString(arg1);
@@ -8645,11 +8645,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getExpressionString(void * jarg1)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setText(void * jarg1, char * jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -8676,10 +8676,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setText(void * jarg1, char * jarg2) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getTextString(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)classObj_getTextString(arg1);
@@ -8706,11 +8706,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getTextString(void * jarg1) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getMetaData(void * jarg1, char * jarg2) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -8737,12 +8737,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getMetaData(void * jarg1, char * j
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setMetaData(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -8770,10 +8770,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_setMetaData(void * jarg1, char * jarg
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getFirstMetaDataKey(void * jarg1) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)classObj_getFirstMetaDataKey(arg1);
@@ -8799,11 +8799,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getFirstMetaDataKey(void * jarg1)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getNextMetaDataKey(void * jarg1, char * jarg2) {
   char * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -8830,7 +8830,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_classObj_getNextMetaDataKey(void * jarg1, c
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_drawLegendIcon(void * jarg1, void * jarg2, void * jarg3, int jarg4, int jarg5, void * jarg6, int jarg7, int jarg8) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   layerObj *arg3 = (layerObj *) 0 ;
   int arg4 ;
@@ -8840,7 +8840,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_drawLegendIcon(void * jarg1, void * j
   int arg8 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (layerObj *)jarg3; 
   arg4 = (int)jarg4; 
@@ -8873,14 +8873,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_drawLegendIcon(void * jarg1, void * j
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_createLegendIcon(void * jarg1, void * jarg2, void * jarg3, int jarg4, int jarg5) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   layerObj *arg3 = (layerObj *) 0 ;
   int arg4 ;
   int arg5 ;
   imageObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (layerObj *)jarg3; 
   arg4 = (int)jarg4; 
@@ -8910,11 +8910,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_createLegendIcon(void * jarg1, voi
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_getLabel(void * jarg1, int jarg2) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   labelObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -8941,11 +8941,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_getLabel(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_addLabel(void * jarg1, void * jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   labelObj *arg2 = (labelObj *) 0 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (labelObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -8972,11 +8972,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_addLabel(void * jarg1, void * jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_removeLabel(void * jarg1, int jarg2) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   labelObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -9003,11 +9003,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_removeLabel(void * jarg1, int jarg
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_getStyle(void * jarg1, int jarg2) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   styleObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -9034,12 +9034,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_getStyle(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_insertStyle(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   styleObj *arg2 = (styleObj *) 0 ;
   int arg3 = (int) -1 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (styleObj *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -9067,11 +9067,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_insertStyle(void * jarg1, void * jarg
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_removeStyle(void * jarg1, int jarg2) {
   void * jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   styleObj *result = 0 ;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -9098,11 +9098,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_classObj_removeStyle(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_moveStyleUp(void * jarg1, int jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -9129,11 +9129,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_classObj_moveStyleUp(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_classObj_moveStyleDown(void * jarg1, int jarg2) {
   int jresult ;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (classObj *)jarg1; 
+  arg1 = (struct classObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -11617,10 +11617,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_imageObj_getSize(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_classitem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->classitem) free((char*)arg1->classitem);
@@ -11636,10 +11636,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_classitem_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_classitem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->classitem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11648,10 +11648,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_classitem_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_refcount_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->refcount);
   jresult = result; 
   return jresult;
@@ -11660,10 +11660,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_refcount_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numclasses_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->numclasses);
   jresult = result; 
   return jresult;
@@ -11672,10 +11672,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numclasses_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_maxclasses_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->maxclasses);
   jresult = result; 
   return jresult;
@@ -11684,10 +11684,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_maxclasses_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_index_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->index);
   jresult = result; 
   return jresult;
@@ -11696,10 +11696,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_index_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_map_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   struct mapObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (struct mapObj *) ((arg1)->map);
   jresult = (void *)result; 
   return jresult;
@@ -11707,10 +11707,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_map_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_header_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->header) free((char*)arg1->header);
@@ -11726,10 +11726,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_header_set(void * jarg1, char * jarg
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_header_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->header);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11737,10 +11737,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_header_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_footer_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->footer) free((char*)arg1->footer);
@@ -11756,10 +11756,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_footer_set(void * jarg1, char * jarg
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_footer_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->footer);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11767,10 +11767,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_footer_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_template_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->template) free((char*)arg1->template);
@@ -11786,10 +11786,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_template_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_template_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->template);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11797,10 +11797,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_template_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_name_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->name) free((char*)arg1->name);
@@ -11816,10 +11816,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_name_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_name_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->name);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11827,10 +11827,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_name_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_group_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->group) free((char*)arg1->group);
@@ -11846,10 +11846,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_group_set(void * jarg1, char * jarg2
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_group_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->group);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11857,10 +11857,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_group_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_status_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->status = arg2;
 }
@@ -11868,10 +11868,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_status_set(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_status_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->status);
   jresult = result; 
   return jresult;
@@ -11879,10 +11879,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_status_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_data_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->data) free((char*)arg1->data);
@@ -11898,10 +11898,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_data_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_data_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->data);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -11909,10 +11909,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_data_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_type_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_LAYER_TYPE arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (enum MS_LAYER_TYPE)jarg2; 
   if (arg1) (arg1)->type = arg2;
 }
@@ -11920,10 +11920,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_type_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_type_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_LAYER_TYPE result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (enum MS_LAYER_TYPE) ((arg1)->type);
   jresult = result; 
   return jresult;
@@ -11931,10 +11931,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_type_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tolerance_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->tolerance = arg2;
 }
@@ -11942,10 +11942,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tolerance_set(void * jarg1, double j
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_tolerance_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->tolerance);
   jresult = result; 
   return jresult;
@@ -11953,10 +11953,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_tolerance_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_toleranceunits_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->toleranceunits = arg2;
 }
@@ -11964,10 +11964,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_toleranceunits_set(void * jarg1, int
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_toleranceunits_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->toleranceunits);
   jresult = result; 
   return jresult;
@@ -11975,10 +11975,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_toleranceunits_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_symbolscaledenom_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->symbolscaledenom = arg2;
 }
@@ -11986,10 +11986,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_symbolscaledenom_set(void * jarg1, d
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_symbolscaledenom_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->symbolscaledenom);
   jresult = result; 
   return jresult;
@@ -11997,10 +11997,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_symbolscaledenom_get(void * jarg1)
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_minscaledenom_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->minscaledenom = arg2;
 }
@@ -12008,10 +12008,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_minscaledenom_set(void * jarg1, doub
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_minscaledenom_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->minscaledenom);
   jresult = result; 
   return jresult;
@@ -12019,10 +12019,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_minscaledenom_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxscaledenom_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->maxscaledenom = arg2;
 }
@@ -12030,10 +12030,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxscaledenom_set(void * jarg1, doub
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_maxscaledenom_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->maxscaledenom);
   jresult = result; 
   return jresult;
@@ -12041,10 +12041,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_maxscaledenom_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_minfeaturesize_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->minfeaturesize = arg2;
 }
@@ -12052,10 +12052,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_minfeaturesize_set(void * jarg1, int
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_minfeaturesize_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->minfeaturesize);
   jresult = result; 
   return jresult;
@@ -12063,10 +12063,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_minfeaturesize_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelminscaledenom_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->labelminscaledenom = arg2;
 }
@@ -12074,10 +12074,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelminscaledenom_set(void * jarg1,
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_labelminscaledenom_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->labelminscaledenom);
   jresult = result; 
   return jresult;
@@ -12085,10 +12085,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_labelminscaledenom_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelmaxscaledenom_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->labelmaxscaledenom = arg2;
 }
@@ -12096,10 +12096,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelmaxscaledenom_set(void * jarg1,
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_labelmaxscaledenom_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->labelmaxscaledenom);
   jresult = result; 
   return jresult;
@@ -12107,10 +12107,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_labelmaxscaledenom_get(void * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_mingeowidth_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->mingeowidth = arg2;
 }
@@ -12118,10 +12118,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_mingeowidth_set(void * jarg1, double
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_mingeowidth_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->mingeowidth);
   jresult = result; 
   return jresult;
@@ -12129,10 +12129,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_mingeowidth_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxgeowidth_set(void * jarg1, double jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->maxgeowidth = arg2;
 }
@@ -12140,10 +12140,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxgeowidth_set(void * jarg1, double
 
 SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_maxgeowidth_get(void * jarg1) {
   double jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (double) ((arg1)->maxgeowidth);
   jresult = result; 
   return jresult;
@@ -12151,10 +12151,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_layerObj_maxgeowidth_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_sizeunits_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->sizeunits = arg2;
 }
@@ -12162,10 +12162,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_sizeunits_set(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_sizeunits_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->sizeunits);
   jresult = result; 
   return jresult;
@@ -12173,10 +12173,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_sizeunits_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxfeatures_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->maxfeatures = arg2;
 }
@@ -12184,10 +12184,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_maxfeatures_set(void * jarg1, int ja
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_maxfeatures_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->maxfeatures);
   jresult = result; 
   return jresult;
@@ -12195,10 +12195,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_maxfeatures_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_startindex_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->startindex = arg2;
 }
@@ -12206,10 +12206,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_startindex_set(void * jarg1, int jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_startindex_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->startindex);
   jresult = result; 
   return jresult;
@@ -12217,10 +12217,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_startindex_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_offsite_set(void * jarg1, void * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   colorObj *arg2 = (colorObj *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (colorObj *)jarg2; 
   if (arg1) (arg1)->offsite = *arg2;
 }
@@ -12228,10 +12228,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_offsite_set(void * jarg1, void * jar
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_offsite_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   colorObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (colorObj *)& ((arg1)->offsite);
   jresult = (void *)result; 
   return jresult;
@@ -12239,10 +12239,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_offsite_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_transform_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->transform = arg2;
 }
@@ -12250,10 +12250,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_transform_set(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_transform_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->transform);
   jresult = result; 
   return jresult;
@@ -12261,10 +12261,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_transform_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelcache_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->labelcache = arg2;
 }
@@ -12272,10 +12272,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelcache_set(void * jarg1, int jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_labelcache_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->labelcache);
   jresult = result; 
   return jresult;
@@ -12283,10 +12283,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_labelcache_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_postlabelcache_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->postlabelcache = arg2;
 }
@@ -12294,10 +12294,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_postlabelcache_set(void * jarg1, int
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_postlabelcache_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->postlabelcache);
   jresult = result; 
   return jresult;
@@ -12305,10 +12305,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_postlabelcache_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelitem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->labelitem) free((char*)arg1->labelitem);
@@ -12324,10 +12324,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelitem_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_labelitem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->labelitem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12335,10 +12335,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_labelitem_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tileitem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->tileitem) free((char*)arg1->tileitem);
@@ -12354,10 +12354,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tileitem_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_tileitem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->tileitem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12365,10 +12365,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_tileitem_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tileindex_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->tileindex) free((char*)arg1->tileindex);
@@ -12384,10 +12384,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_tileindex_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_tileindex_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->tileindex);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12395,10 +12395,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_tileindex_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_units_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->units = arg2;
 }
@@ -12406,10 +12406,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_units_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_units_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->units);
   jresult = result; 
   return jresult;
@@ -12417,10 +12417,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_units_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_connection_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->connection) free((char*)arg1->connection);
@@ -12436,10 +12436,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_connection_set(void * jarg1, char *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_connection_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->connection);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12447,10 +12447,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_connection_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_plugin_library_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->plugin_library) free((char*)arg1->plugin_library);
@@ -12466,10 +12466,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_plugin_library_set(void * jarg1, cha
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_plugin_library_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->plugin_library);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12477,10 +12477,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_plugin_library_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_plugin_library_original_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->plugin_library_original) free((char*)arg1->plugin_library_original);
@@ -12496,10 +12496,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_plugin_library_original_set(void * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_plugin_library_original_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->plugin_library_original);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12507,10 +12507,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_plugin_library_original_get(void *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_connectiontype_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_CONNECTION_TYPE arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (enum MS_CONNECTION_TYPE)jarg2; 
   if (arg1) (arg1)->connectiontype = arg2;
 }
@@ -12518,10 +12518,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_connectiontype_set(void * jarg1, int
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_connectiontype_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_CONNECTION_TYPE result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (enum MS_CONNECTION_TYPE) ((arg1)->connectiontype);
   jresult = result; 
   return jresult;
@@ -12530,10 +12530,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_connectiontype_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numitems_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->numitems);
   jresult = result; 
   return jresult;
@@ -12541,10 +12541,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numitems_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_bandsitem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->bandsitem) free((char*)arg1->bandsitem);
@@ -12560,10 +12560,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_bandsitem_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_bandsitem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->bandsitem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12571,10 +12571,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_bandsitem_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_filteritem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->filteritem) free((char*)arg1->filteritem);
@@ -12590,10 +12590,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_filteritem_set(void * jarg1, char *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_filteritem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->filteritem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12601,10 +12601,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_filteritem_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_styleitem_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->styleitem) free((char*)arg1->styleitem);
@@ -12620,10 +12620,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_styleitem_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_styleitem_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->styleitem);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12631,10 +12631,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_styleitem_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_requires_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->requires) free((char*)arg1->requires);
@@ -12650,10 +12650,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_requires_set(void * jarg1, char * ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_requires_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->requires);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12661,10 +12661,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_requires_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelrequires_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->labelrequires) free((char*)arg1->labelrequires);
@@ -12680,10 +12680,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_labelrequires_set(void * jarg1, char
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_labelrequires_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->labelrequires);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12692,10 +12692,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_labelrequires_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_metadata_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->metadata);
   jresult = (void *)result; 
   return jresult;
@@ -12704,10 +12704,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_metadata_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_validation_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->validation);
   jresult = (void *)result; 
   return jresult;
@@ -12716,10 +12716,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_validation_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_bindvals_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->bindvals);
   jresult = (void *)result; 
   return jresult;
@@ -12728,10 +12728,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_bindvals_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_cluster_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   clusterObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (clusterObj *)& ((arg1)->cluster);
   jresult = (void *)result; 
   return jresult;
@@ -12739,10 +12739,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_cluster_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_opacity_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->opacity = arg2;
 }
@@ -12750,10 +12750,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_opacity_set(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_opacity_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->opacity);
   jresult = result; 
   return jresult;
@@ -12761,10 +12761,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_opacity_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_dump_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->dump = arg2;
 }
@@ -12772,10 +12772,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_dump_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_dump_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->dump);
   jresult = result; 
   return jresult;
@@ -12783,10 +12783,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_dump_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_debug_set(void * jarg1, int jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->debug = arg2;
 }
@@ -12794,10 +12794,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_debug_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_debug_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->debug);
   jresult = result; 
   return jresult;
@@ -12806,10 +12806,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_debug_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_extent_get(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   rectObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (rectObj *)& ((arg1)->extent);
   jresult = (void *)result; 
   return jresult;
@@ -12818,10 +12818,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_extent_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numprocessing_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->numprocessing);
   jresult = result; 
   return jresult;
@@ -12830,10 +12830,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numprocessing_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numjoins_get(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (int) ((arg1)->numjoins);
   jresult = result; 
   return jresult;
@@ -12841,10 +12841,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_numjoins_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_classgroup_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->classgroup) free((char*)arg1->classgroup);
@@ -12860,10 +12860,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_classgroup_set(void * jarg1, char *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_classgroup_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->classgroup);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12871,10 +12871,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_classgroup_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_mask_set(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->mask) free((char*)arg1->mask);
@@ -12890,10 +12890,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_mask_set(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_mask_get(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   result = (char *) ((arg1)->mask);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -12903,12 +12903,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_mask_get(void * jarg1) {
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_layerObj(void * jarg1) {
   void * jresult ;
   mapObj *arg1 = (mapObj *) NULL ;
-  layerObj *result = 0 ;
+  struct layerObj *result = 0 ;
   
   arg1 = (mapObj *)jarg1; 
   {
     errorObj *ms_error;
-    result = (layerObj *)new_layerObj(arg1);
+    result = (struct layerObj *)new_layerObj(arg1);
     ms_error = msGetErrorObj();
     if (ms_error != NULL && ms_error->code != MS_NOERR) {
       if (ms_error->code != MS_NOTFOUND && ms_error->code != -1) {
@@ -12930,9 +12930,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_layerObj(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_layerObj(void * jarg1) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     delete_layerObj(arg1);
@@ -12956,10 +12956,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_layerObj(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_clone(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   layerObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (layerObj *)layerObj_clone(arg1);
@@ -12985,11 +12985,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_clone(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_updateFromString(void * jarg1, char * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -13016,12 +13016,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_updateFromString(void * jarg1, char *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_insertClass(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   classObj *arg2 = (classObj *) 0 ;
   int arg3 = (int) -1 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (classObj *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -13049,11 +13049,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_insertClass(void * jarg1, void * jarg
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_removeClass(void * jarg1, int jarg2) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   classObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -13080,10 +13080,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_removeClass(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_open(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)layerObj_open(arg1);
@@ -13109,12 +13109,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_open(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_whichShapes(void * jarg1, void * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   rectObj arg2 ;
   rectObj *argp2 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   argp2 = (rectObj *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null rectObj", 0);
@@ -13146,10 +13146,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_whichShapes(void * jarg1, void * jarg
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_nextShape(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   shapeObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (shapeObj *)layerObj_nextShape(arg1);
@@ -13174,9 +13174,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_nextShape(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_close(void * jarg1) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     layerObj_close(arg1);
@@ -13200,11 +13200,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_close(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getShape(void * jarg1, void * jarg2) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   resultObj *arg2 = (resultObj *) 0 ;
   shapeObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (resultObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -13231,10 +13231,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getShape(void * jarg1, void * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getNumResults(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)layerObj_getNumResults(arg1);
@@ -13260,10 +13260,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getNumResults(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResultsBounds(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   rectObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (rectObj *)layerObj_getResultsBounds(arg1);
@@ -13289,11 +13289,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResultsBounds(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResult(void * jarg1, int jarg2) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   resultObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -13320,11 +13320,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResult(void * jarg1, int jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getClass(void * jarg1, int jarg2) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   classObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -13351,11 +13351,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getClass(void * jarg1, int jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getItem(void * jarg1, int jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -13382,12 +13382,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getItem(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setItems(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char **arg2 = (char **) 0 ;
   int arg3 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char **)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -13415,12 +13415,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setItems(void * jarg1, void * jarg2,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_draw(void * jarg1, void * jarg2, void * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   imageObj *arg3 = (imageObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (imageObj *)jarg3; 
   {
@@ -13448,12 +13448,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_draw(void * jarg1, void * jarg2, void
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_drawQuery(void * jarg1, void * jarg2, void * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   imageObj *arg3 = (imageObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (imageObj *)jarg3; 
   {
@@ -13481,12 +13481,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_drawQuery(void * jarg1, void * jarg2,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByFilter(void * jarg1, void * jarg2, char * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -13514,14 +13514,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByFilter(void * jarg1, void * ja
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByAttributes(void * jarg1, void * jarg2, char * jarg3, char * jarg4, int jarg5) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   int arg5 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (char *)jarg3; 
   arg4 = (char *)jarg4; 
@@ -13551,14 +13551,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByAttributes(void * jarg1, void
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByPoint(void * jarg1, void * jarg2, void * jarg3, int jarg4, double jarg5) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
   double arg5 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (pointObj *)jarg3; 
   arg4 = (int)jarg4; 
@@ -13588,13 +13588,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByPoint(void * jarg1, void * jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByRect(void * jarg1, void * jarg2, void * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   rectObj arg3 ;
   rectObj *argp3 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   argp3 = (rectObj *)jarg3; 
   if (!argp3) {
@@ -13627,12 +13627,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByRect(void * jarg1, void * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByFeatures(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -13660,12 +13660,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByFeatures(void * jarg1, void *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByShape(void * jarg1, void * jarg2, void * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   shapeObj *arg3 = (shapeObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (shapeObj *)jarg3; 
   {
@@ -13693,14 +13693,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByShape(void * jarg1, void * jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByIndex(void * jarg1, void * jarg2, int jarg3, int jarg4, int jarg5) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   int arg4 ;
   int arg5 = (int) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (int)jarg3; 
   arg4 = (int)jarg4; 
@@ -13730,10 +13730,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_queryByIndex(void * jarg1, void * jar
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResults(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   resultCacheObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (resultCacheObj *)layerObj_getResults(arg1);
@@ -13759,11 +13759,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getResults(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setFilter(void * jarg1, char * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -13790,10 +13790,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setFilter(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getFilterString(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)layerObj_getFilterString(arg1);
@@ -13820,11 +13820,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getFilterString(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setWKTProjection(void * jarg1, char * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -13851,10 +13851,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setWKTProjection(void * jarg1, char *
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProjection(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)layerObj_getProjection(arg1);
@@ -13881,11 +13881,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProjection(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setProjection(void * jarg1, char * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -13912,11 +13912,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setProjection(void * jarg1, char * ja
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_addFeature(void * jarg1, void * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   shapeObj *arg2 = (shapeObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (shapeObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -13943,10 +13943,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_addFeature(void * jarg1, void * jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getNumFeatures(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)layerObj_getNumFeatures(arg1);
@@ -13972,10 +13972,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getNumFeatures(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getExtent(void * jarg1) {
   void * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   rectObj *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (rectObj *)layerObj_getExtent(arg1);
@@ -14001,14 +14001,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_layerObj_getExtent(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setExtent(void * jarg1, double jarg2, double jarg3, double jarg4, double jarg5) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 = (double) -1.0 ;
   double arg3 = (double) -1.0 ;
   double arg4 = (double) -1.0 ;
   double arg5 = (double) -1.0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (double)jarg2; 
   arg3 = (double)jarg3; 
   arg4 = (double)jarg4; 
@@ -14038,11 +14038,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setExtent(void * jarg1, double jarg2,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getMetaData(void * jarg1, char * jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14069,12 +14069,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getMetaData(void * jarg1, char * j
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setMetaData(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -14102,11 +14102,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setMetaData(void * jarg1, char * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_removeMetaData(void * jarg1, char * jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14133,10 +14133,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_removeMetaData(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getFirstMetaDataKey(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)layerObj_getFirstMetaDataKey(arg1);
@@ -14162,11 +14162,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getFirstMetaDataKey(void * jarg1)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getNextMetaDataKey(void * jarg1, char * jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14193,7 +14193,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getNextMetaDataKey(void * jarg1, c
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getWMSFeatureInfoURL(void * jarg1, void * jarg2, int jarg3, int jarg4, int jarg5, char * jarg6) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   int arg4 ;
@@ -14201,7 +14201,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getWMSFeatureInfoURL(void * jarg1,
   char *arg6 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (int)jarg3; 
   arg4 = (int)jarg4; 
@@ -14233,11 +14233,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getWMSFeatureInfoURL(void * jarg1,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_executeWFSGetFeature(void * jarg1, void * jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   layerObj *arg2 = (layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (layerObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -14265,12 +14265,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_executeWFSGetFeature(void * jarg1,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_applySLD(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -14298,12 +14298,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_applySLD(void * jarg1, char * jarg2,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_applySLDURL(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -14331,10 +14331,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_applySLDURL(void * jarg1, char * jarg
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_generateSLD(void * jarg1) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)layerObj_generateSLD(arg1);
@@ -14361,10 +14361,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_generateSLD(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_isVisible(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)layerObj_isVisible(arg1);
@@ -14390,11 +14390,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_isVisible(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_moveClassUp(void * jarg1, int jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -14421,11 +14421,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_moveClassUp(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_moveClassDown(void * jarg1, int jarg2) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -14451,11 +14451,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_moveClassDown(void * jarg1, int jarg2
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_setProcessingKey(void * jarg1, char * jarg2, char * jarg3) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -14480,10 +14480,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_setProcessingKey(void * jarg1, char
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_setProcessing(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14507,10 +14507,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_setProcessing(void * jarg1, char * j
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_addProcessing(void * jarg1, char * jarg2) {
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14535,11 +14535,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_layerObj_addProcessing(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProcessing(void * jarg1, int jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -14566,11 +14566,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProcessing(void * jarg1, int ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProcessingKey(void * jarg1, char * jarg2) {
   char * jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -14597,10 +14597,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_layerObj_getProcessingKey(void * jarg1, cha
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_clearProcessing(void * jarg1) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)layerObj_clearProcessing(arg1);
@@ -14626,12 +14626,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_clearProcessing(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setConnectionType(void * jarg1, int jarg2, char * jarg3) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (int)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -14659,14 +14659,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_setConnectionType(void * jarg1, int j
 
 SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getClassIndex(void * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
   int jresult ;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   shapeObj *arg3 = (shapeObj *) 0 ;
   int *arg4 = (int *) NULL ;
   int arg5 = (int) 0 ;
   int result;
   
-  arg1 = (layerObj *)jarg1; 
+  arg1 = (struct layerObj *)jarg1; 
   arg2 = (mapObj *)jarg2; 
   arg3 = (shapeObj *)jarg3; 
   arg4 = (int *)jarg4; 
@@ -14695,10 +14695,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_layerObj_getClassIndex(void * jarg1, void * ja
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_name_set(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->name) free((char*)arg1->name);
@@ -14714,10 +14714,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_name_set(void * jarg1, char * jarg2) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_name_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->name);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -14725,10 +14725,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_name_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_status_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->status = arg2;
 }
@@ -14736,10 +14736,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_status_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_status_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->status);
   jresult = result; 
   return jresult;
@@ -14747,10 +14747,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_status_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_height_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->height = arg2;
 }
@@ -14758,10 +14758,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_height_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_height_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->height);
   jresult = result; 
   return jresult;
@@ -14769,10 +14769,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_height_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_width_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->width = arg2;
 }
@@ -14780,10 +14780,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_width_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_width_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->width);
   jresult = result; 
   return jresult;
@@ -14791,10 +14791,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_width_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_maxsize_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->maxsize = arg2;
 }
@@ -14802,10 +14802,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_maxsize_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_maxsize_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->maxsize);
   jresult = result; 
   return jresult;
@@ -14814,10 +14814,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_maxsize_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_refcount_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->refcount);
   jresult = result; 
   return jresult;
@@ -14826,10 +14826,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_refcount_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_numlayers_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->numlayers);
   jresult = result; 
   return jresult;
@@ -14838,10 +14838,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_numlayers_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_maxlayers_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->maxlayers);
   jresult = result; 
   return jresult;
@@ -14850,10 +14850,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_maxlayers_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_symbolset_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   symbolSetObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (symbolSetObj *)& ((arg1)->symbolset);
   jresult = (void *)result; 
   return jresult;
@@ -14862,10 +14862,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_symbolset_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_fontset_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   fontSetObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (fontSetObj *)& ((arg1)->fontset);
   jresult = (void *)result; 
   return jresult;
@@ -14874,10 +14874,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_fontset_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_labelcache_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   labelCacheObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (labelCacheObj *)& ((arg1)->labelcache);
   jresult = (void *)result; 
   return jresult;
@@ -14885,10 +14885,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_labelcache_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_transparent_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->transparent = arg2;
 }
@@ -14896,10 +14896,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_transparent_set(void * jarg1, int jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_transparent_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->transparent);
   jresult = result; 
   return jresult;
@@ -14907,10 +14907,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_transparent_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_interlace_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->interlace = arg2;
 }
@@ -14918,10 +14918,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_interlace_set(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_interlace_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->interlace);
   jresult = result; 
   return jresult;
@@ -14929,10 +14929,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_interlace_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_imagequality_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->imagequality = arg2;
 }
@@ -14940,10 +14940,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_imagequality_set(void * jarg1, int jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_imagequality_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->imagequality);
   jresult = result; 
   return jresult;
@@ -14951,10 +14951,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_imagequality_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_extent_set(void * jarg1, void * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj *arg2 = (rectObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (rectObj *)jarg2; 
   if (arg1) (arg1)->extent = *arg2;
 }
@@ -14962,10 +14962,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_extent_set(void * jarg1, void * jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_extent_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (rectObj *)& ((arg1)->extent);
   jresult = (void *)result; 
   return jresult;
@@ -14973,10 +14973,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_extent_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_cellsize_set(void * jarg1, double jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->cellsize = arg2;
 }
@@ -14984,10 +14984,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_cellsize_set(void * jarg1, double jarg
 
 SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_cellsize_get(void * jarg1) {
   double jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (double) ((arg1)->cellsize);
   jresult = result; 
   return jresult;
@@ -14995,10 +14995,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_cellsize_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_units_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   enum MS_UNITS arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (enum MS_UNITS)jarg2; 
   if (arg1) (arg1)->units = arg2;
 }
@@ -15006,10 +15006,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_units_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_units_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   enum MS_UNITS result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (enum MS_UNITS) ((arg1)->units);
   jresult = result; 
   return jresult;
@@ -15017,10 +15017,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_units_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_scaledenom_set(void * jarg1, double jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->scaledenom = arg2;
 }
@@ -15028,10 +15028,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_scaledenom_set(void * jarg1, double ja
 
 SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_scaledenom_get(void * jarg1) {
   double jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (double) ((arg1)->scaledenom);
   jresult = result; 
   return jresult;
@@ -15039,10 +15039,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_scaledenom_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_resolution_set(void * jarg1, double jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->resolution = arg2;
 }
@@ -15050,10 +15050,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_resolution_set(void * jarg1, double ja
 
 SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_resolution_get(void * jarg1) {
   double jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (double) ((arg1)->resolution);
   jresult = result; 
   return jresult;
@@ -15061,10 +15061,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_resolution_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_defresolution_set(void * jarg1, double jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   if (arg1) (arg1)->defresolution = arg2;
 }
@@ -15072,10 +15072,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_defresolution_set(void * jarg1, double
 
 SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_defresolution_get(void * jarg1) {
   double jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (double) ((arg1)->defresolution);
   jresult = result; 
   return jresult;
@@ -15083,10 +15083,10 @@ SWIGEXPORT double SWIGSTDCALL CSharp_mapObj_defresolution_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_shapepath_set(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->shapepath) free((char*)arg1->shapepath);
@@ -15102,10 +15102,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_shapepath_set(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_shapepath_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->shapepath);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -15113,10 +15113,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_shapepath_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_mappath_set(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->mappath) free((char*)arg1->mappath);
@@ -15132,10 +15132,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_mappath_set(void * jarg1, char * jarg2
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_mappath_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->mappath);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -15143,10 +15143,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_mappath_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_imagecolor_set(void * jarg1, void * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   colorObj *arg2 = (colorObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (colorObj *)jarg2; 
   if (arg1) (arg1)->imagecolor = *arg2;
 }
@@ -15154,10 +15154,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_imagecolor_set(void * jarg1, void * ja
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_imagecolor_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   colorObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (colorObj *)& ((arg1)->imagecolor);
   jresult = (void *)result; 
   return jresult;
@@ -15166,10 +15166,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_imagecolor_get(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_numoutputformats_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->numoutputformats);
   jresult = result; 
   return jresult;
@@ -15178,10 +15178,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_numoutputformats_get(void * jarg1) {
 
 SWIGEXPORT void* SWIGSTDCALL CSharp_mapObj_outputformatlist_get(void * jarg1) {
   void* jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj **result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (outputFormatObj **) ((arg1)->outputformatlist);
   jresult = result; 
   return jresult;
@@ -15190,10 +15190,10 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_mapObj_outputformatlist_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_outputformat_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (outputFormatObj *) ((arg1)->outputformat);
   jresult = (void *)result; 
   return jresult;
@@ -15202,10 +15202,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_outputformat_get(void * jarg1) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_imagetype_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->imagetype);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -15214,10 +15214,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_imagetype_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_reference_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   referenceMapObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (referenceMapObj *)& ((arg1)->reference);
   jresult = (void *)result; 
   return jresult;
@@ -15226,10 +15226,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_reference_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_scalebar_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   scalebarObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (scalebarObj *)& ((arg1)->scalebar);
   jresult = (void *)result; 
   return jresult;
@@ -15238,10 +15238,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_scalebar_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_legend_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   legendObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (legendObj *)& ((arg1)->legend);
   jresult = (void *)result; 
   return jresult;
@@ -15250,10 +15250,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_legend_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_querymap_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   queryMapObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (queryMapObj *)& ((arg1)->querymap);
   jresult = (void *)result; 
   return jresult;
@@ -15262,10 +15262,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_querymap_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_web_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   webObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (webObj *)& ((arg1)->web);
   jresult = (void *)result; 
   return jresult;
@@ -15273,10 +15273,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_web_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_layerorder_set(void * jarg1, void * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int *arg2 = (int *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int *)jarg2; 
   if (arg1) (arg1)->layerorder = arg2;
 }
@@ -15284,10 +15284,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_layerorder_set(void * jarg1, void * ja
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_layerorder_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int *) ((arg1)->layerorder);
   jresult = (void *)result; 
   return jresult;
@@ -15295,10 +15295,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_layerorder_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_debug_set(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->debug = arg2;
 }
@@ -15306,10 +15306,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_debug_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_debug_get(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (int) ((arg1)->debug);
   jresult = result; 
   return jresult;
@@ -15317,10 +15317,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_debug_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_datapattern_set(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->datapattern) free((char*)arg1->datapattern);
@@ -15336,10 +15336,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_datapattern_set(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_datapattern_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->datapattern);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -15347,10 +15347,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_datapattern_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_templatepattern_set(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if (arg1->templatepattern) free((char*)arg1->templatepattern);
@@ -15366,10 +15366,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_templatepattern_set(void * jarg1, char
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_templatepattern_get(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (char *) ((arg1)->templatepattern);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -15378,10 +15378,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_templatepattern_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_configoptions_get(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   hashTableObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   result = (hashTableObj *)& ((arg1)->configoptions);
   jresult = (void *)result; 
   return jresult;
@@ -15391,12 +15391,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_configoptions_get(void * jarg1) {
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_mapObj(char * jarg1) {
   void * jresult ;
   char *arg1 = (char *) "" ;
-  mapObj *result = 0 ;
+  struct mapObj *result = 0 ;
   
   arg1 = (char *)jarg1; 
   {
     errorObj *ms_error;
-    result = (mapObj *)new_mapObj(arg1);
+    result = (struct mapObj *)new_mapObj(arg1);
     ms_error = msGetErrorObj();
     if (ms_error != NULL && ms_error->code != MS_NOERR) {
       if (ms_error->code != MS_NOTFOUND && ms_error->code != -1) {
@@ -15418,9 +15418,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_mapObj(char * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_mapObj(void * jarg1) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     delete_mapObj(arg1);
@@ -15444,10 +15444,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_mapObj(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_clone(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   mapObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (mapObj *)mapObj_clone(arg1);
@@ -15473,12 +15473,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_clone(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_insertLayer(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   layerObj *arg2 = (layerObj *) 0 ;
   int arg3 = (int) -1 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (layerObj *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -15506,11 +15506,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_insertLayer(void * jarg1, void * jarg2,
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_removeLayer(void * jarg1, int jarg2) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   layerObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -15537,14 +15537,14 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_removeLayer(void * jarg1, int jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setExtent(void * jarg1, double jarg2, double jarg3, double jarg4, double jarg5) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   double arg4 ;
   double arg5 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   arg3 = (double)jarg3; 
   arg4 = (double)jarg4; 
@@ -15574,12 +15574,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setExtent(void * jarg1, double jarg2, d
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_offsetExtent(void * jarg1, double jarg2, double jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   arg3 = (double)jarg3; 
   {
@@ -15607,13 +15607,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_offsetExtent(void * jarg1, double jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_scaleExtent(void * jarg1, double jarg2, double jarg3, double jarg4) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   double arg4 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   arg3 = (double)jarg3; 
   arg4 = (double)jarg4; 
@@ -15642,11 +15642,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_scaleExtent(void * jarg1, double jarg2,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setCenter(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   pointObj *arg2 = (pointObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (pointObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -15673,12 +15673,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setCenter(void * jarg1, void * jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setSize(void * jarg1, int jarg2, int jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   int arg3 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -15706,11 +15706,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setSize(void * jarg1, int jarg2, int ja
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setRotation(void * jarg1, double jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   {
     errorObj *ms_error;
@@ -15737,11 +15737,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setRotation(void * jarg1, double jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayer(void * jarg1, int jarg2) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   layerObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -15768,11 +15768,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayer(void * jarg1, int jarg2) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayerByName(void * jarg1, char * jarg2) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   layerObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -15799,11 +15799,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayerByName(void * jarg1, char *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_getSymbolByName(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -15829,9 +15829,9 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_getSymbolByName(void * jarg1, char * ja
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_prepareQuery(void * jarg1) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     mapObj_prepareQuery(arg1);
@@ -15855,10 +15855,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_prepareQuery(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_prepareImage(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_prepareImage(arg1);
@@ -15883,10 +15883,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_prepareImage(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setImageType(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -15910,10 +15910,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setImageType(void * jarg1, char * jarg
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_selectOutputFormat(void * jarg1, char * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -15937,10 +15937,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_selectOutputFormat(void * jarg1, char
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setOutputFormat(void * jarg1, void * jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj *arg2 = (outputFormatObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (outputFormatObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -15965,10 +15965,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setOutputFormat(void * jarg1, void * j
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_draw(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_draw(arg1);
@@ -15994,10 +15994,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_draw(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawQuery(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_drawQuery(arg1);
@@ -16023,10 +16023,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawQuery(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawLegend(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_drawLegend(arg1);
@@ -16052,10 +16052,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawLegend(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawScalebar(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_drawScalebar(arg1);
@@ -16081,10 +16081,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawScalebar(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawReferenceMap(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (imageObj *)mapObj_drawReferenceMap(arg1);
@@ -16110,11 +16110,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_drawReferenceMap(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_embedScalebar(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (imageObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -16141,11 +16141,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_embedScalebar(void * jarg1, void * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_embedLegend(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (imageObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -16172,11 +16172,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_embedLegend(void * jarg1, void * jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_drawLabelCache(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (imageObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -16203,11 +16203,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_drawLabelCache(void * jarg1, void * jar
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLabel(void * jarg1, int jarg2) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   labelCacheMemberObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -16234,10 +16234,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLabel(void * jarg1, int jarg2) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_nextLabel(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   labelCacheMemberObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (labelCacheMemberObj *)mapObj_nextLabel(arg1);
@@ -16263,11 +16263,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_nextLabel(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByFilter(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16294,13 +16294,13 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByFilter(void * jarg1, char * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByPoint(void * jarg1, void * jarg2, int jarg3, double jarg4) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   pointObj *arg2 = (pointObj *) 0 ;
   int arg3 ;
   double arg4 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (pointObj *)jarg2; 
   arg3 = (int)jarg3; 
   arg4 = (double)jarg4; 
@@ -16329,12 +16329,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByPoint(void * jarg1, void * jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByRect(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj arg2 ;
   rectObj *argp2 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   argp2 = (rectObj *)jarg2; 
   if (!argp2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null rectObj", 0);
@@ -16366,11 +16366,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByRect(void * jarg1, void * jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByFeatures(void * jarg1, int jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -16397,11 +16397,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByFeatures(void * jarg1, int jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByShape(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   shapeObj *arg2 = (shapeObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (shapeObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -16428,11 +16428,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_queryByShape(void * jarg1, void * jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setWKTProjection(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16459,10 +16459,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setWKTProjection(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getProjection(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)mapObj_getProjection(arg1);
@@ -16489,11 +16489,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getProjection(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setProjection(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16520,11 +16520,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setProjection(void * jarg1, char * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_save(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16551,12 +16551,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_save(void * jarg1, char * jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveQuery(void * jarg1, char * jarg2, int jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -16584,11 +16584,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveQuery(void * jarg1, char * jarg2, i
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadQuery(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16614,10 +16614,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadQuery(void * jarg1, char * jarg2) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_freeQuery(void * jarg1, int jarg2) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 = (int) -1 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -16642,12 +16642,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_freeQuery(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveQueryAsGML(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) "GOMF" ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -16675,11 +16675,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveQueryAsGML(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getMetaData(void * jarg1, char * jarg2) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16706,12 +16706,12 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getMetaData(void * jarg1, char * jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setMetaData(void * jarg1, char * jarg2, char * jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -16739,11 +16739,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setMetaData(void * jarg1, char * jarg2,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_removeMetaData(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16770,10 +16770,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_removeMetaData(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getFirstMetaDataKey(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)mapObj_getFirstMetaDataKey(arg1);
@@ -16799,11 +16799,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getFirstMetaDataKey(void * jarg1) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getNextMetaDataKey(void * jarg1, char * jarg2) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16830,11 +16830,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getNextMetaDataKey(void * jarg1, cha
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setSymbolSet(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16861,10 +16861,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setSymbolSet(void * jarg1, char * jarg2
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_getNumSymbols(void * jarg1) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (int)mapObj_getNumSymbols(arg1);
@@ -16890,11 +16890,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_getNumSymbols(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setFontSet(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16921,11 +16921,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setFontSet(void * jarg1, char * jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveMapContext(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -16952,12 +16952,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_saveMapContext(void * jarg1, char * jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadMapContext(void * jarg1, char * jarg2, int jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (int)jarg3; 
   {
@@ -16985,11 +16985,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadMapContext(void * jarg1, char * jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_moveLayerUp(void * jarg1, int jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -17016,11 +17016,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_moveLayerUp(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_moveLayerDown(void * jarg1, int jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   {
     errorObj *ms_error;
@@ -17047,10 +17047,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_moveLayerDown(void * jarg1, int jarg2)
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayersDrawingOrder(void * jarg1) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   intarray *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (intarray *)mapObj_getLayersDrawingOrder(arg1);
@@ -17076,11 +17076,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getLayersDrawingOrder(void * jarg1)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setLayersDrawingOrder(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int *arg2 = (int *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int *)jarg2; 
   {
     errorObj *ms_error;
@@ -17106,11 +17106,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_setLayersDrawingOrder(void * jarg1, voi
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setConfigOption(void * jarg1, char * jarg2, char * jarg3) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -17136,11 +17136,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_setConfigOption(void * jarg1, char * j
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getConfigOption(void * jarg1, char * jarg2) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -17166,9 +17166,9 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_getConfigOption(void * jarg1, char *
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_applyConfigOptions(void * jarg1) {
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     mapObj_applyConfigOptions(arg1);
@@ -17192,11 +17192,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_mapObj_applyConfigOptions(void * jarg1) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_applySLD(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -17223,11 +17223,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_applySLD(void * jarg1, char * jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_applySLDURL(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -17254,10 +17254,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_applySLDURL(void * jarg1, char * jarg2)
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_generateSLD(void * jarg1) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (char *)mapObj_generateSLD(arg1);
@@ -17284,14 +17284,14 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_generateSLD(void * jarg1) {
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processTemplate(void * jarg1, int jarg2, void * jarg3, void * jarg4, int jarg5) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   char **arg3 = (char **) 0 ;
   char **arg4 = (char **) 0 ;
   int arg5 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   arg3 = (char **)jarg3; 
   arg4 = (char **)jarg4; 
@@ -17322,13 +17322,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processTemplate(void * jarg1, int ja
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processLegendTemplate(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char **arg2 = (char **) 0 ;
   char **arg3 = (char **) 0 ;
   int arg4 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char **)jarg2; 
   arg3 = (char **)jarg3; 
   arg4 = (int)jarg4; 
@@ -17358,13 +17358,13 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processLegendTemplate(void * jarg1,
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processQueryTemplate(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
   char * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char **arg2 = (char **) 0 ;
   char **arg3 = (char **) 0 ;
   int arg4 ;
   char *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char **)jarg2; 
   arg3 = (char **)jarg3; 
   arg4 = (int)jarg4; 
@@ -17394,11 +17394,11 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_mapObj_processQueryTemplate(void * jarg1, v
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getOutputFormatByName(void * jarg1, char * jarg2) {
   void * jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   outputFormatObj *result = 0 ;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -17425,11 +17425,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_mapObj_getOutputFormatByName(void * jarg1,
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_appendOutputFormat(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj *arg2 = (outputFormatObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (outputFormatObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -17456,11 +17456,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_appendOutputFormat(void * jarg1, void *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_removeOutputFormat(void * jarg1, char * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     errorObj *ms_error;
@@ -17487,12 +17487,12 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_removeOutputFormat(void * jarg1, char *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadOWSParameters(void * jarg1, void * jarg2, char * jarg3) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
   char *arg3 = (char *) "1.1.1" ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (cgiRequestObj *)jarg2; 
   arg3 = (char *)jarg3; 
   {
@@ -17520,11 +17520,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_loadOWSParameters(void * jarg1, void *
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_OWSDispatch(void * jarg1, void * jarg2) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (cgiRequestObj *)jarg2; 
   {
     errorObj *ms_error;
@@ -17551,7 +17551,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_OWSDispatch(void * jarg1, void * jarg2)
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomPoint(void * jarg1, int jarg2, void * jarg3, int jarg4, int jarg5, void * jarg6, void * jarg7) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
@@ -17560,7 +17560,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomPoint(void * jarg1, int jarg2, void
   rectObj *arg7 = (rectObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (int)jarg2; 
   arg3 = (pointObj *)jarg3; 
   arg4 = (int)jarg4; 
@@ -17592,7 +17592,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomPoint(void * jarg1, int jarg2, void
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomRectangle(void * jarg1, void * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj *arg2 = (rectObj *) 0 ;
   int arg3 ;
   int arg4 ;
@@ -17600,7 +17600,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomRectangle(void * jarg1, void * jarg
   rectObj *arg6 = (rectObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (rectObj *)jarg2; 
   arg3 = (int)jarg3; 
   arg4 = (int)jarg4; 
@@ -17631,7 +17631,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomRectangle(void * jarg1, void * jarg
 
 SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomScale(void * jarg1, double jarg2, void * jarg3, int jarg4, int jarg5, void * jarg6, void * jarg7) {
   int jresult ;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
@@ -17640,7 +17640,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_mapObj_zoomScale(void * jarg1, double jarg2, v
   rectObj *arg7 = (rectObj *) 0 ;
   int result;
   
-  arg1 = (mapObj *)jarg1; 
+  arg1 = (struct mapObj *)jarg1; 
   arg2 = (double)jarg2; 
   arg3 = (pointObj *)jarg3; 
   arg4 = (int)jarg4; 
@@ -21134,7 +21134,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SHX_BUFFER_PAGE_get() {
   int jresult ;
   int result;
   
-  result = (int) 1024;
+  result = (int)(1024);
   jresult = result; 
   return jresult;
 }
@@ -21144,7 +21144,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHAPEFILE_POINT_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -21154,7 +21154,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHAPEFILE_ARC_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -21164,7 +21164,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHAPEFILE_POLYGON_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
@@ -21174,7 +21174,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHAPEFILE_MULTIPOINT_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -21184,7 +21184,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_POINTZ_get() {
   int jresult ;
   int result;
   
-  result = (int) 11;
+  result = (int)(11);
   jresult = result; 
   return jresult;
 }
@@ -21194,7 +21194,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_ARCZ_get() {
   int jresult ;
   int result;
   
-  result = (int) 13;
+  result = (int)(13);
   jresult = result; 
   return jresult;
 }
@@ -21204,7 +21204,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_POLYGONZ_get() {
   int jresult ;
   int result;
   
-  result = (int) 15;
+  result = (int)(15);
   jresult = result; 
   return jresult;
 }
@@ -21214,7 +21214,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_MULTIPOINTZ_get() {
   int jresult ;
   int result;
   
-  result = (int) 18;
+  result = (int)(18);
   jresult = result; 
   return jresult;
 }
@@ -21224,7 +21224,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_POINTM_get() {
   int jresult ;
   int result;
   
-  result = (int) 21;
+  result = (int)(21);
   jresult = result; 
   return jresult;
 }
@@ -21234,7 +21234,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_ARCM_get() {
   int jresult ;
   int result;
   
-  result = (int) 23;
+  result = (int)(23);
   jresult = result; 
   return jresult;
 }
@@ -21244,7 +21244,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_POLYGONM_get() {
   int jresult ;
   int result;
   
-  result = (int) 25;
+  result = (int)(25);
   jresult = result; 
   return jresult;
 }
@@ -21254,7 +21254,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHP_MULTIPOINTM_get() {
   int jresult ;
   int result;
   
-  result = (int) 28;
+  result = (int)(28);
   jresult = result; 
   return jresult;
 }
@@ -22036,7 +22036,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_wkp_none_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -22046,7 +22046,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_wkp_lonlat_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -22056,7 +22056,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_wkp_gmerc_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -22226,7 +22226,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SYMBOL_ALLOCSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 64;
+  result = (int)(64);
   jresult = result; 
   return jresult;
 }
@@ -22236,7 +22236,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MAXVECTORPOINTS_get() {
   int jresult ;
   int result;
   
-  result = (int) 100;
+  result = (int)(100);
   jresult = result; 
   return jresult;
 }
@@ -22246,7 +22246,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MAXPATTERNLENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -22256,7 +22256,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_IMAGECACHESIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 6;
+  result = (int)(6);
   jresult = result; 
   return jresult;
 }
@@ -23183,7 +23183,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NOERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 0;
+  result = (int)(0);
   jresult = result; 
   return jresult;
 }
@@ -23193,7 +23193,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_IOERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 1;
+  result = (int)(1);
   jresult = result; 
   return jresult;
 }
@@ -23203,7 +23203,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MEMERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 2;
+  result = (int)(2);
   jresult = result; 
   return jresult;
 }
@@ -23213,7 +23213,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_TYPEERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 3;
+  result = (int)(3);
   jresult = result; 
   return jresult;
 }
@@ -23223,7 +23223,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SYMERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 4;
+  result = (int)(4);
   jresult = result; 
   return jresult;
 }
@@ -23233,7 +23233,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_REGEXERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 5;
+  result = (int)(5);
   jresult = result; 
   return jresult;
 }
@@ -23243,7 +23243,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_TTFERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 6;
+  result = (int)(6);
   jresult = result; 
   return jresult;
 }
@@ -23253,7 +23253,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_DBFERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 7;
+  result = (int)(7);
   jresult = result; 
   return jresult;
 }
@@ -23263,7 +23263,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_GDERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 8;
+  result = (int)(8);
   jresult = result; 
   return jresult;
 }
@@ -23273,7 +23273,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_IDENTERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 9;
+  result = (int)(9);
   jresult = result; 
   return jresult;
 }
@@ -23283,7 +23283,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_EOFERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 10;
+  result = (int)(10);
   jresult = result; 
   return jresult;
 }
@@ -23293,7 +23293,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_PROJERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 11;
+  result = (int)(11);
   jresult = result; 
   return jresult;
 }
@@ -23303,7 +23303,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MISCERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 12;
+  result = (int)(12);
   jresult = result; 
   return jresult;
 }
@@ -23313,7 +23313,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_CGIERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 13;
+  result = (int)(13);
   jresult = result; 
   return jresult;
 }
@@ -23323,7 +23323,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WEBERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 14;
+  result = (int)(14);
   jresult = result; 
   return jresult;
 }
@@ -23333,7 +23333,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_IMGERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 15;
+  result = (int)(15);
   jresult = result; 
   return jresult;
 }
@@ -23343,7 +23343,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_HASHERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 16;
+  result = (int)(16);
   jresult = result; 
   return jresult;
 }
@@ -23353,7 +23353,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_JOINERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 17;
+  result = (int)(17);
   jresult = result; 
   return jresult;
 }
@@ -23363,7 +23363,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NOTFOUND_get() {
   int jresult ;
   int result;
   
-  result = (int) 18;
+  result = (int)(18);
   jresult = result; 
   return jresult;
 }
@@ -23373,7 +23373,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SHPERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 19;
+  result = (int)(19);
   jresult = result; 
   return jresult;
 }
@@ -23383,7 +23383,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_PARSEERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 20;
+  result = (int)(20);
   jresult = result; 
   return jresult;
 }
@@ -23393,7 +23393,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SDEERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 21;
+  result = (int)(21);
   jresult = result; 
   return jresult;
 }
@@ -23403,7 +23403,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_OGRERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 22;
+  result = (int)(22);
   jresult = result; 
   return jresult;
 }
@@ -23413,7 +23413,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_QUERYERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 23;
+  result = (int)(23);
   jresult = result; 
   return jresult;
 }
@@ -23423,7 +23423,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WMSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 24;
+  result = (int)(24);
   jresult = result; 
   return jresult;
 }
@@ -23433,7 +23433,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WMSCONNERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 25;
+  result = (int)(25);
   jresult = result; 
   return jresult;
 }
@@ -23443,7 +23443,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_ORACLESPATIALERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 26;
+  result = (int)(26);
   jresult = result; 
   return jresult;
 }
@@ -23453,7 +23453,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WFSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 27;
+  result = (int)(27);
   jresult = result; 
   return jresult;
 }
@@ -23463,7 +23463,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WFSCONNERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 28;
+  result = (int)(28);
   jresult = result; 
   return jresult;
 }
@@ -23473,7 +23473,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_MAPCONTEXTERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 29;
+  result = (int)(29);
   jresult = result; 
   return jresult;
 }
@@ -23483,7 +23483,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_HTTPERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 30;
+  result = (int)(30);
   jresult = result; 
   return jresult;
 }
@@ -23493,7 +23493,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_CHILDERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 31;
+  result = (int)(31);
   jresult = result; 
   return jresult;
 }
@@ -23503,7 +23503,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_WCSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 32;
+  result = (int)(32);
   jresult = result; 
   return jresult;
 }
@@ -23513,7 +23513,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_GEOSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 33;
+  result = (int)(33);
   jresult = result; 
   return jresult;
 }
@@ -23523,7 +23523,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RECTERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 34;
+  result = (int)(34);
   jresult = result; 
   return jresult;
 }
@@ -23533,7 +23533,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_TIMEERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 35;
+  result = (int)(35);
   jresult = result; 
   return jresult;
 }
@@ -23543,7 +23543,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_GMLERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 36;
+  result = (int)(36);
   jresult = result; 
   return jresult;
 }
@@ -23553,7 +23553,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_SOSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 37;
+  result = (int)(37);
   jresult = result; 
   return jresult;
 }
@@ -23563,7 +23563,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NULLPARENTERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 38;
+  result = (int)(38);
   jresult = result; 
   return jresult;
 }
@@ -23573,7 +23573,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_AGGERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 39;
+  result = (int)(39);
   jresult = result; 
   return jresult;
 }
@@ -23583,7 +23583,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_OWSERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 40;
+  result = (int)(40);
   jresult = result; 
   return jresult;
 }
@@ -23593,7 +23593,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_OGLERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 42;
+  result = (int)(42);
   jresult = result; 
   return jresult;
 }
@@ -23603,7 +23603,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_RENDERERERR_get() {
   int jresult ;
   int result;
   
-  result = (int) 43;
+  result = (int)(43);
   jresult = result; 
   return jresult;
 }
@@ -23613,7 +23613,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_NUMERRORCODES_get() {
   int jresult ;
   int result;
   
-  result = (int) 44;
+  result = (int)(44);
   jresult = result; 
   return jresult;
 }
@@ -23623,7 +23623,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MESSAGELENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 2048;
+  result = (int)(2048);
   jresult = result; 
   return jresult;
 }
@@ -23633,7 +23633,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_ROUTINELENGTH_get() {
   int jresult ;
   int result;
   
-  result = (int) 64;
+  result = (int)(64);
   jresult = result; 
   return jresult;
 }
@@ -23643,17 +23643,17 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_MS_ERROR_LANGUAGE_get() {
   char * jresult ;
   char *result = 0 ;
   
-  result = (char *) "en-US";
+  result = (char *)("en-US");
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_code_set(void * jarg1, int jarg2) {
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int arg2 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->code = arg2;
 }
@@ -23661,10 +23661,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_code_set(void * jarg1, int jarg2) {
 
 SWIGEXPORT int SWIGSTDCALL CSharp_errorObj_code_get(void * jarg1) {
   int jresult ;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int result;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   result = (int) ((arg1)->code);
   jresult = result; 
   return jresult;
@@ -23672,10 +23672,10 @@ SWIGEXPORT int SWIGSTDCALL CSharp_errorObj_code_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_routine_set(void * jarg1, char * jarg2) {
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *arg2 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if(arg2) {
@@ -23690,10 +23690,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_routine_set(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_errorObj_routine_get(void * jarg1) {
   char * jresult ;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   result = (char *)(char *) ((arg1)->routine);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -23701,10 +23701,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_errorObj_routine_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_message_set(void * jarg1, char * jarg2) {
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *arg2 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   arg2 = (char *)jarg2; 
   {
     if(arg2) {
@@ -23719,10 +23719,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_message_set(void * jarg1, char * jar
 
 SWIGEXPORT char * SWIGSTDCALL CSharp_errorObj_message_get(void * jarg1) {
   char * jresult ;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *result = 0 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   result = (char *)(char *) ((arg1)->message);
   jresult = SWIG_csharp_string_callback((const char *)result); 
   return jresult;
@@ -23730,10 +23730,10 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_errorObj_message_get(void * jarg1) {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_isreported_set(void * jarg1, int jarg2) {
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int arg2 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   arg2 = (int)jarg2; 
   if (arg1) (arg1)->isreported = arg2;
 }
@@ -23741,10 +23741,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_errorObj_isreported_set(void * jarg1, int jar
 
 SWIGEXPORT int SWIGSTDCALL CSharp_errorObj_isreported_get(void * jarg1) {
   int jresult ;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int result;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   result = (int) ((arg1)->isreported);
   jresult = result; 
   return jresult;
@@ -23753,11 +23753,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_errorObj_isreported_get(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_errorObj() {
   void * jresult ;
-  errorObj *result = 0 ;
+  struct errorObj *result = 0 ;
   
   {
     errorObj *ms_error;
-    result = (errorObj *)new_errorObj();
+    result = (struct errorObj *)new_errorObj();
     ms_error = msGetErrorObj();
     if (ms_error != NULL && ms_error->code != MS_NOERR) {
       if (ms_error->code != MS_NOTFOUND && ms_error->code != -1) {
@@ -23779,9 +23779,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_new_errorObj() {
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_errorObj(void * jarg1) {
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   {
     errorObj *ms_error;
     delete_errorObj(arg1);
@@ -23805,10 +23805,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_errorObj(void * jarg1) {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_errorObj_next(void * jarg1) {
   void * jresult ;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   errorObj *result = 0 ;
   
-  arg1 = (errorObj *)jarg1; 
+  arg1 = (struct errorObj *)jarg1; 
   {
     errorObj *ms_error;
     result = (errorObj *)errorObj_next(arg1);
@@ -23968,7 +23968,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_HASHSIZE_get() {
   int jresult ;
   int result;
   
-  result = (int) 41;
+  result = (int)(41);
   jresult = result; 
   return jresult;
 }
@@ -24195,7 +24195,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_MS_DEFAULT_CGI_PARAMS_get() {
   int jresult ;
   int result;
   
-  result = (int) 100;
+  result = (int)(100);
   jresult = result; 
   return jresult;
 }
diff --git a/mapscript/csharp/markerCacheMemberObj.cs b/mapscript/csharp/markerCacheMemberObj.cs
index 54984f3..7c378b1 100644
--- a/mapscript/csharp/markerCacheMemberObj.cs
+++ b/mapscript/csharp/markerCacheMemberObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/outputFormatObj.cs b/mapscript/csharp/outputFormatObj.cs
index 7ff3107..3db3aca 100644
--- a/mapscript/csharp/outputFormatObj.cs
+++ b/mapscript/csharp/outputFormatObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/pointObj.cs b/mapscript/csharp/pointObj.cs
index 67e1937..9da5358 100644
--- a/mapscript/csharp/pointObj.cs
+++ b/mapscript/csharp/pointObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/projectionObj.cs b/mapscript/csharp/projectionObj.cs
index e5d3ed2..0bdaee5 100644
--- a/mapscript/csharp/projectionObj.cs
+++ b/mapscript/csharp/projectionObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/queryMapObj.cs b/mapscript/csharp/queryMapObj.cs
index 327091b..61718e4 100644
--- a/mapscript/csharp/queryMapObj.cs
+++ b/mapscript/csharp/queryMapObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/rectObj.cs b/mapscript/csharp/rectObj.cs
index 70efd76..7598a12 100644
--- a/mapscript/csharp/rectObj.cs
+++ b/mapscript/csharp/rectObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/referenceMapObj.cs b/mapscript/csharp/referenceMapObj.cs
index 9370639..8616513 100644
--- a/mapscript/csharp/referenceMapObj.cs
+++ b/mapscript/csharp/referenceMapObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/resultCacheObj.cs b/mapscript/csharp/resultCacheObj.cs
index bc0b88b..c66216b 100644
--- a/mapscript/csharp/resultCacheObj.cs
+++ b/mapscript/csharp/resultCacheObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/resultObj.cs b/mapscript/csharp/resultObj.cs
index e1ebac0..2d415a1 100644
--- a/mapscript/csharp/resultObj.cs
+++ b/mapscript/csharp/resultObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/scalebarObj.cs b/mapscript/csharp/scalebarObj.cs
index 60bdf63..b1cb379 100644
--- a/mapscript/csharp/scalebarObj.cs
+++ b/mapscript/csharp/scalebarObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/shapeObj.cs b/mapscript/csharp/shapeObj.cs
index 37bac43..602188d 100644
--- a/mapscript/csharp/shapeObj.cs
+++ b/mapscript/csharp/shapeObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/shapefileObj.cs b/mapscript/csharp/shapefileObj.cs
index 56c1d1e..4c06ccb 100644
--- a/mapscript/csharp/shapefileObj.cs
+++ b/mapscript/csharp/shapefileObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/strokeStyleObj.cs b/mapscript/csharp/strokeStyleObj.cs
index 92cd4c1..a8ee455 100644
--- a/mapscript/csharp/strokeStyleObj.cs
+++ b/mapscript/csharp/strokeStyleObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/styleObj.cs b/mapscript/csharp/styleObj.cs
index 74890cb..e6cac7d 100644
--- a/mapscript/csharp/styleObj.cs
+++ b/mapscript/csharp/styleObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/symbolObj.cs b/mapscript/csharp/symbolObj.cs
index 995e76f..bb31702 100644
--- a/mapscript/csharp/symbolObj.cs
+++ b/mapscript/csharp/symbolObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/symbolSetObj.cs b/mapscript/csharp/symbolSetObj.cs
index 993cd35..05cc878 100644
--- a/mapscript/csharp/symbolSetObj.cs
+++ b/mapscript/csharp/symbolSetObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/symbolStyleObj.cs b/mapscript/csharp/symbolStyleObj.cs
index ec5e0ab..11be1b0 100644
--- a/mapscript/csharp/symbolStyleObj.cs
+++ b/mapscript/csharp/symbolStyleObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/tileCacheObj.cs b/mapscript/csharp/tileCacheObj.cs
index f8deb5c..5faa03c 100644
--- a/mapscript/csharp/tileCacheObj.cs
+++ b/mapscript/csharp/tileCacheObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/csharp/webObj.cs b/mapscript/csharp/webObj.cs
index 6f027a5..5e6c2f5 100644
--- a/mapscript/csharp/webObj.cs
+++ b/mapscript/csharp/webObj.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/mapscript/perl/mapscript.pm b/mapscript/perl/mapscript.pm
index 9eb6cda..b29d820 100644
--- a/mapscript/perl/mapscript.pm
+++ b/mapscript/perl/mapscript.pm
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
+# Version 2.0.7
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
diff --git a/mapscript/perl/mapscript_wrap.c b/mapscript/perl/mapscript_wrap.c
index 4b90aa0..436caee 100644
--- a/mapscript/perl/mapscript_wrap.c
+++ b/mapscript/perl/mapscript_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -173,7 +173,7 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -830,50 +830,35 @@ extern "C" {
 
 SWIGINTERN const char*
 SWIG_Perl_ErrorType(int code) {
-  const char* type = 0;
   switch(code) {
   case SWIG_MemoryError:
-    type = "MemoryError";
-    break;
+    return "MemoryError";
   case SWIG_IOError:
-    type = "IOError";
-    break;
+    return "IOError";
   case SWIG_RuntimeError:
-    type = "RuntimeError";
-    break;
+    return "RuntimeError";
   case SWIG_IndexError:
-    type = "IndexError";
-    break;
+    return "IndexError";
   case SWIG_TypeError:
-    type = "TypeError";
-    break;
+    return "TypeError";
   case SWIG_DivisionByZero:
-    type = "ZeroDivisionError";
-    break;
+    return "ZeroDivisionError";
   case SWIG_OverflowError:
-    type = "OverflowError";
-    break;
+    return "OverflowError";
   case SWIG_SyntaxError:
-    type = "SyntaxError";
-    break;
+    return "SyntaxError";
   case SWIG_ValueError:
-    type = "ValueError";
-    break;
+    return "ValueError";
   case SWIG_SystemError:
-    type = "SystemError";
-    break;
+    return "SystemError";
   case SWIG_AttributeError:
-    type = "AttributeError";
-    break;
+    return "AttributeError";
   default:
-    type = "RuntimeError";
+    return "RuntimeError";
   }
-  return type;
 }
 
 
-
-
 /* -----------------------------------------------------------------------------
  * perlrun.swg
  *
@@ -923,7 +908,7 @@ SWIG_Perl_ErrorType(int code) {
 /* Error manipulation */
 
 #define SWIG_ErrorType(code)                            SWIG_Perl_ErrorType(code)               
-#define SWIG_Error(code, msg)            		sv_setpvf(GvSV(PL_errgv),"%s %s\n", SWIG_ErrorType(code), msg)
+#define SWIG_Error(code, msg)            		sv_setpvf(get_sv("@", GV_ADD), "%s %s", SWIG_ErrorType(code), msg)
 #define SWIG_fail                        		goto fail						    
 
 /* Perl-specific SWIG API */
@@ -1017,8 +1002,6 @@ typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
 #endif /* MULTIPLICITY */
 #endif /* PERL_OBJECT */
 
-/* Workaround for bug in perl 5.6.x croak and earlier */
-#if (PERL_VERSION < 8)
 #  ifdef PERL_OBJECT
 #    define SWIG_croak_null() SWIG_Perl_croak_null(pPerl)
 static void SWIG_Perl_croak_null(CPerlObj *pPerl)
@@ -1026,17 +1009,16 @@ static void SWIG_Perl_croak_null(CPerlObj *pPerl)
 static void SWIG_croak_null()
 #  endif
 {
-  SV *err=ERRSV;
+  SV *err = get_sv("@", GV_ADD);
 #  if (PERL_VERSION < 6)
   croak("%_", err);
 #  else
-  if (SvOK(err) && !SvROK(err)) croak("%_", err);
-  croak(Nullch);
+  if (sv_isobject(err))
+    croak(0);
+  else
+    croak("%s", SvPV_nolen(err));
 #  endif
 }
-#else
-#  define SWIG_croak_null() croak(Nullch)
-#endif
 
 
 /* 
@@ -1088,8 +1070,7 @@ SWIG_TypeProxyCheck(const char *c, swig_type_info *ty) {
   if (ty) {
     swig_cast_info *iter = ty->cast;
     while (iter) {
-      if ( (!iter->type->clientdata && (strcmp(iter->type->name, c) == 0)) ||
-            (iter->type->clientdata && (strcmp((char*)iter->type->clientdata, c) == 0)) ) {
+      if (strcmp(SWIG_Perl_TypeProxyName(iter->type), c) == 0) {
         if (iter == ty->cast)
           return iter;
         /* Move iter to the top of the linked list */
@@ -1150,8 +1131,14 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
     return SWIG_OK;
   } else if (SvTYPE(sv) == SVt_RV) {  /* Check for NULL pointer */
     if (!SvROK(sv)) {
-      *(ptr) = (void *) 0;
-      return SWIG_OK;
+      /* In Perl 5.12 and later, SVt_RV == SVt_IV, so sv could be a valid integer value.  */
+      if (SvIOK(sv)) {
+        return SWIG_ERROR;
+      } else {
+        /* NULL pointer (reference to undef). */
+        *(ptr) = (void *) 0;
+        return SWIG_OK;
+      }
     } else {
       return SWIG_ERROR;
     }
@@ -1169,7 +1156,7 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
       int newmemory = 0;
       *ptr = SWIG_TypeCast(tc,voidptr,&newmemory);
       if (newmemory == SWIG_CAST_NEW_MEMORY) {
-        assert(own);
+        assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
         if (own)
           *own = *own | SWIG_CAST_NEW_MEMORY;
       }
@@ -1187,7 +1174,7 @@ SWIG_Perl_ConvertPtrAndOwn(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_
      */
     SV *obj = sv;
     HV *stash = SvSTASH(SvRV(obj));
-    GV *gv = *(GV**) hv_fetch(stash, "OWNER", 5, TRUE);
+    GV *gv = *(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
     if (isGV(gv)) {
       HV *hv = GvHVn(gv);
       /*
@@ -1214,11 +1201,11 @@ SWIG_Perl_MakePtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, swig_type_info *t, i
     SV *obj=newSV(0);
     HV *hash=newHV();
     HV *stash;
-    sv_setref_pv(obj, (char *) SWIG_Perl_TypeProxyName(t), ptr);
+    sv_setref_pv(obj, SWIG_Perl_TypeProxyName(t), ptr);
     stash=SvSTASH(SvRV(obj));
     if (flags & SWIG_POINTER_OWN) {
       HV *hv;
-      GV *gv=*(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
+      GV *gv = *(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
       if (!isGV(gv))
         gv_init(gv, stash, "OWNER", 5, FALSE);
       hv=GvHVn(gv);
@@ -1232,7 +1219,7 @@ SWIG_Perl_MakePtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, swig_type_info *t, i
     sv_bless(sv, stash);
   }
   else {
-    sv_setref_pv(sv, (char *) SWIG_Perl_TypeProxyName(t), ptr);
+    sv_setref_pv(sv, SWIG_Perl_TypeProxyName(t), ptr);
   }
 }
 
@@ -1323,19 +1310,23 @@ typedef struct {
 
 /* Magic variable code */
 #ifndef PERL_OBJECT
-#define swig_create_magic(s,a,b,c) _swig_create_magic(s,a,b,c)
-  #ifndef MULTIPLICITY
-     SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(SV *, MAGIC *), int (*get)(SV *,MAGIC *)) 
-  #else
-     SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(struct interpreter*, SV *, MAGIC *), int (*get)(struct interpreter*, SV *,MAGIC *)) 
-  #endif
+# ifdef __cplusplus
+#  define swig_create_magic(s,a,b,c) _swig_create_magic(s,const_cast<char*>(a),b,c)
+# else
+#  define swig_create_magic(s,a,b,c) _swig_create_magic(s,(char*)(a),b,c)
+# endif
+# ifndef MULTIPLICITY
+SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(SV *, MAGIC *), int (*get)(SV *,MAGIC *)) 
+# else
+SWIGRUNTIME void _swig_create_magic(SV *sv, char *name, int (*set)(struct interpreter*, SV *, MAGIC *), int (*get)(struct interpreter*, SV *,MAGIC *)) 
+# endif
 #else
 #  define swig_create_magic(s,a,b,c) _swig_create_magic(pPerl,s,a,b,c)
 SWIGRUNTIME void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int (CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) 
 #endif
 {
   MAGIC *mg;
-  sv_magic(sv,sv,'U',(char *) name,strlen(name));
+  sv_magic(sv,sv,'U',name,strlen(name));
   mg = mg_find(sv,'U');
   mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
   mg->mg_virtual->svt_get = (SwigMagicFunc) get;
@@ -1477,6 +1468,12 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #ifdef bind
   #undef bind
 #endif
+#ifdef access
+  #undef access
+#endif
+#ifdef stat
+  #undef stat
+#endif
 
 
 
@@ -1553,7 +1550,7 @@ static swig_module_info swig_module = {swig_types, 50, 0, 0, 0, 0};
 #define SWIG_name   "mapscriptc::boot_mapscript"
 #define SWIG_prefix "mapscriptc::"
 
-#define SWIGVERSION 0x010340 
+#define SWIGVERSION 0x020007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1607,7 +1604,9 @@ SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val)
     const char *nptr = SvPV_nolen(obj);
     if (nptr) {
       char *endptr;
-      double v = strtod(nptr, &endptr);
+      double v;
+      errno = 0;
+      v = strtod(nptr, &endptr);
       if (errno == ERANGE) {
 	errno = 0;
 	return SWIG_OverflowError;
@@ -1663,16 +1662,19 @@ SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long *val) 
 {
   if (SvUOK(obj)) {
-    if (val) *val = SvUV(obj);
-    return SWIG_OK;
-  } else  if (SvIOK(obj)) {
-    long v = SvIV(obj);
-    if (v >= 0) {
+    UV v = SvUV(obj);
+    if (v <= ULONG_MAX) {
       if (val) *val = v;
       return SWIG_OK;
-    } else {
-      return SWIG_OverflowError;
     }
+    return SWIG_OverflowError;
+  } else if (SvIOK(obj)) {
+    IV v = SvIV(obj);
+    if (v >= 0 && v <= ULONG_MAX) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+    return SWIG_OverflowError;
   } else {
     int dispatch = 0;
     const char *nptr = SvPV_nolen(obj);
@@ -1725,10 +1727,13 @@ SWIGINTERN int intarray_getitem(intarray *self,size_t index){
 
 SWIGINTERNINLINE SV *
 SWIG_From_long  SWIG_PERL_DECL_ARGS_1(long value)
-{    
-  SV *obj = sv_newmortal();
-  sv_setiv(obj, (IV) value);
-  return obj;
+{
+  SV *sv;
+  if (value >= IV_MIN && value <= IV_MAX)
+    sv = newSViv(value);
+  else
+    sv = newSVpvf("%ld", value);
+  return sv_2mortal(sv);
 }
 
 
@@ -1752,9 +1757,20 @@ SWIG_From_int  SWIG_PERL_DECL_ARGS_1(int value)
 SWIGINTERN int
 SWIG_AsVal_long SWIG_PERL_DECL_ARGS_2(SV *obj, long* val)
 {
-  if (SvIOK(obj)) {
-    if (val) *val = SvIV(obj);
-    return SWIG_OK;
+  if (SvUOK(obj)) {
+    UV v = SvUV(obj);
+    if (v <= LONG_MAX) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+    return SWIG_OverflowError;
+  } else if (SvIOK(obj)) {
+    IV v = SvIV(obj);
+    if (v >= LONG_MIN && v <= LONG_MAX) {
+      if(val) *val = v;
+      return SWIG_OK;
+    }
+    return SWIG_OverflowError;
   } else {
     int dispatch = 0;
     const char *nptr = SvPV_nolen(obj);
@@ -1848,10 +1864,8 @@ SWIG_FromCharPtr(const char *cptr)
 
 SWIGINTERNINLINE SV *
 SWIG_From_double  SWIG_PERL_DECL_ARGS_1(double value)
-{    
-  SV *obj = sv_newmortal();
-  sv_setnv(obj, value);
-  return obj;
+{
+  return sv_2mortal(newSVnv(value));
 }
 
 
@@ -2256,7 +2270,7 @@ SWIGINTERN int labelObj_moveStyleUp(labelObj *self,int index){
 SWIGINTERN int labelObj_moveStyleDown(labelObj *self,int index){
        return msMoveLabelStyleDown(self, index);
     }
-SWIGINTERN classObj *new_classObj(layerObj *layer){
+SWIGINTERN struct classObj *new_classObj(layerObj *layer){
         classObj *new_class=NULL;
         
         if (!layer)
@@ -2288,7 +2302,7 @@ SWIGINTERN classObj *new_classObj(layerObj *layer){
 
         return NULL;
     }
-SWIGINTERN void delete_classObj(classObj *self){
+SWIGINTERN void delete_classObj(struct classObj *self){
         if (self)
         {
             if (freeClass(self)==MS_SUCCESS) {
@@ -2297,10 +2311,10 @@ SWIGINTERN void delete_classObj(classObj *self){
 	    }
         }
     }
-SWIGINTERN int classObj_updateFromString(classObj *self,char *snippet){
+SWIGINTERN int classObj_updateFromString(struct classObj *self,char *snippet){
         return msUpdateClassFromString(self, snippet, 0);
     }
-SWIGINTERN classObj *classObj_clone(classObj *self){
+SWIGINTERN classObj *classObj_clone(struct classObj *self){
         classObj *new_class;
 
         new_class = (classObj *) malloc(sizeof(classObj));
@@ -2327,27 +2341,27 @@ SWIGINTERN classObj *classObj_clone(classObj *self){
         
         return new_class;
     }
-SWIGINTERN int classObj_setExpression(classObj *self,char *expression){
+SWIGINTERN int classObj_setExpression(struct classObj *self,char *expression){
     if (!expression || strlen(expression) == 0) {
        freeExpression(&self->expression);
        return MS_SUCCESS;
     }
     else return msLoadExpressionString(&self->expression, expression);
   }
-SWIGINTERN char *classObj_getExpressionString(classObj *self){
+SWIGINTERN char *classObj_getExpressionString(struct classObj *self){
     return msGetExpressionString(&(self->expression));
   }
-SWIGINTERN int classObj_setText(classObj *self,char *text){
+SWIGINTERN int classObj_setText(struct classObj *self,char *text){
     if (!text || strlen(text) == 0) {
       freeExpression(&self->text);
       return MS_SUCCESS;
     }	
     else return msLoadExpressionString(&self->text, text);
   }
-SWIGINTERN char *classObj_getTextString(classObj *self){
+SWIGINTERN char *classObj_getTextString(struct classObj *self){
     return msGetExpressionString(&(self->text));
   }
-SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
+SWIGINTERN char *classObj_getMetaData(struct classObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -2360,24 +2374,24 @@ SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int classObj_setMetaData(classObj *self,char *name,char *value){
+SWIGINTERN int classObj_setMetaData(struct classObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN char *classObj_getFirstMetaDataKey(classObj *self){
+SWIGINTERN char *classObj_getFirstMetaDataKey(struct classObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->metadata));
   }
-SWIGINTERN char *classObj_getNextMetaDataKey(classObj *self,char *lastkey){
+SWIGINTERN char *classObj_getNextMetaDataKey(struct classObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
   }
-SWIGINTERN int classObj_drawLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
+SWIGINTERN int classObj_drawLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
     return msDrawLegendIcon(map, layer, self, width, height, dstImage, dstX, dstY);
   }
-SWIGINTERN imageObj *classObj_createLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height){
+SWIGINTERN imageObj *classObj_createLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height){
     return msCreateLegendIcon(map, layer, self, width, height);
   }
-SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
+SWIGINTERN labelObj *classObj_getLabel(struct classObj *self,int i){
     if (i >= 0 && i < self->numlabels) {
       MS_REFCNT_INCR(self->labels[i]);
       return self->labels[i];
@@ -2386,15 +2400,15 @@ SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_addLabel(classObj *self,labelObj *label){
+SWIGINTERN int classObj_addLabel(struct classObj *self,labelObj *label){
     return msAddLabelToClass(self, label);
   }
-SWIGINTERN labelObj *classObj_removeLabel(classObj *self,int index){
+SWIGINTERN labelObj *classObj_removeLabel(struct classObj *self,int index){
     labelObj* label = (labelObj *) msRemoveLabelFromClass(self, index);
     if (label) MS_REFCNT_INCR(label);
     return label;
   }
-SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
+SWIGINTERN styleObj *classObj_getStyle(struct classObj *self,int i){
     if (i >= 0 && i < self->numstyles) {
       MS_REFCNT_INCR(self->styles[i]);
       return self->styles[i];
@@ -2403,18 +2417,18 @@ SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_insertStyle(classObj *self,styleObj *style,int index){
+SWIGINTERN int classObj_insertStyle(struct classObj *self,styleObj *style,int index){
     return msInsertStyle(self, style, index);
   }
-SWIGINTERN styleObj *classObj_removeStyle(classObj *self,int index){
+SWIGINTERN styleObj *classObj_removeStyle(struct classObj *self,int index){
     styleObj* style = (styleObj *) msRemoveStyle(self, index);
     if (style) MS_REFCNT_INCR(style);
     return style;
   }
-SWIGINTERN int classObj_moveStyleUp(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleUp(struct classObj *self,int index){
     return msMoveStyleUp(self, index);
   }
-SWIGINTERN int classObj_moveStyleDown(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleDown(struct classObj *self,int index){
     return msMoveStyleDown(self, index);
   }
 SWIGINTERN void labelCacheObj_freeCache(labelCacheObj *self){
@@ -2612,7 +2626,7 @@ SWIGINTERN int imageObj_getSize(imageObj *self){
 	free(buffer.data);
         return size;
     }
-SWIGINTERN layerObj *new_layerObj(mapObj *map){
+SWIGINTERN struct layerObj *new_layerObj(mapObj *map){
         layerObj *layer;
         int result;
         
@@ -2649,7 +2663,7 @@ SWIGINTERN layerObj *new_layerObj(mapObj *map){
             return (map->layers[map->numlayers-1]);
         }
     }
-SWIGINTERN void delete_layerObj(layerObj *self){
+SWIGINTERN void delete_layerObj(struct layerObj *self){
         /*if (!self->map) {*/
         if (self) {
             if(freeLayer(self)==MS_SUCCESS) {
@@ -2657,7 +2671,7 @@ SWIGINTERN void delete_layerObj(layerObj *self){
 	    }
         }
     }
-SWIGINTERN layerObj *layerObj_clone(layerObj *self){
+SWIGINTERN layerObj *layerObj_clone(struct layerObj *self){
         layerObj *layer;
         int result;
 
@@ -2684,20 +2698,20 @@ SWIGINTERN layerObj *layerObj_clone(layerObj *self){
         
         return layer;
     }
-SWIGINTERN int layerObj_updateFromString(layerObj *self,char *snippet){
+SWIGINTERN int layerObj_updateFromString(struct layerObj *self,char *snippet){
         return msUpdateLayerFromString(self, snippet, 0);
     }
-SWIGINTERN int layerObj_insertClass(layerObj *self,classObj *classobj,int index){
+SWIGINTERN int layerObj_insertClass(struct layerObj *self,classObj *classobj,int index){
         return msInsertClass(self, classobj, index);
     }
-SWIGINTERN classObj *layerObj_removeClass(layerObj *self,int index){
+SWIGINTERN classObj *layerObj_removeClass(struct layerObj *self,int index){
         classObj* c = msRemoveClass(self, index);
 	if (c != NULL) {
 		MS_REFCNT_INCR(c);
 	}
 	return c;
     }
-SWIGINTERN int layerObj_open(layerObj *self){
+SWIGINTERN int layerObj_open(struct layerObj *self){
         int status;
         status =  msLayerOpen(self);
         if (status == MS_SUCCESS) {
@@ -2705,7 +2719,7 @@ SWIGINTERN int layerObj_open(layerObj *self){
         }
         return status;
     }
-SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
+SWIGINTERN int layerObj_whichShapes(struct layerObj *self,rectObj rect){
         int oldconnectiontype = self->connectiontype;
         self->connectiontype = MS_INLINE;
 
@@ -2717,7 +2731,7 @@ SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
 
         return msLayerWhichShapes(self, rect, 0);
     }
-SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
+SWIGINTERN shapeObj *layerObj_nextShape(struct layerObj *self){
        int status;
        shapeObj *shape;
 
@@ -2733,10 +2747,10 @@ SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
        } else
          return shape;
     }
-SWIGINTERN void layerObj_close(layerObj *self){
+SWIGINTERN void layerObj_close(struct layerObj *self){
         msLayerClose(self);
     }
-SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
+SWIGINTERN shapeObj *layerObj_getShape(struct layerObj *self,resultObj *record){
         int retval;
         shapeObj *shape;
 
@@ -2751,25 +2765,25 @@ SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
         retval = msLayerGetShape(self, shape, record);
         return shape;
     }
-SWIGINTERN int layerObj_getNumResults(layerObj *self){
+SWIGINTERN int layerObj_getNumResults(struct layerObj *self){
         if (!self->resultcache) return 0;
         return self->resultcache->numresults;
     }
-SWIGINTERN rectObj *layerObj_getResultsBounds(layerObj *self){
+SWIGINTERN rectObj *layerObj_getResultsBounds(struct layerObj *self){
         rectObj *bounds;
         if (!self->resultcache) return NULL;
         bounds = (rectObj *) malloc(sizeof(rectObj));
         MS_COPYRECT(bounds, &self->resultcache->bounds);
         return bounds;
     }
-SWIGINTERN resultObj *layerObj_getResult(layerObj *self,int i){
+SWIGINTERN resultObj *layerObj_getResult(struct layerObj *self,int i){
         if (!self->resultcache) return NULL;
         if (i >= 0 && i < self->resultcache->numresults)
             return &self->resultcache->results[i]; 
         else
             return NULL;
     }
-SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
+SWIGINTERN classObj *layerObj_getClass(struct layerObj *self,int i){
 	classObj *result=NULL;
         if (i >= 0 && i < self->numclasses) {
             result=self->class[i]; 
@@ -2777,23 +2791,23 @@ SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
 	}
 	return result;
     }
-SWIGINTERN char *layerObj_getItem(layerObj *self,int i){
+SWIGINTERN char *layerObj_getItem(struct layerObj *self,int i){
   
         if (i >= 0 && i < self->numitems)
             return (char *) (self->items[i]);
         else
             return NULL;
     }
-SWIGINTERN int layerObj_setItems(layerObj *self,char **items,int numitems){
+SWIGINTERN int layerObj_setItems(struct layerObj *self,char **items,int numitems){
         return msLayerSetItems(self, items, numitems);
     }
-SWIGINTERN int layerObj_draw(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_draw(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_drawQuery(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_drawQuery(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawQueryLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
+SWIGINTERN int layerObj_queryByFilter(struct layerObj *self,mapObj *map,char *string){
         int status;
         int retval;
 
@@ -2817,7 +2831,7 @@ SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
         self->status = status;
 	return retval;
     }
-SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
+SWIGINTERN int layerObj_queryByAttributes(struct layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
         int status;
         int retval;
 
@@ -2837,7 +2851,7 @@ SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
+SWIGINTERN int layerObj_queryByPoint(struct layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
         int status;
         int retval;
 
@@ -2856,7 +2870,7 @@ SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
+SWIGINTERN int layerObj_queryByRect(struct layerObj *self,mapObj *map,rectObj rect){
         int status;
         int retval;
 
@@ -2874,7 +2888,7 @@ SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
+SWIGINTERN int layerObj_queryByFeatures(struct layerObj *self,mapObj *map,int slayer){
         int status;
         int retval;
 
@@ -2887,7 +2901,7 @@ SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape){
+SWIGINTERN int layerObj_queryByShape(struct layerObj *self,mapObj *map,shapeObj *shape){
         int status;
         int retval;
         
@@ -2906,7 +2920,7 @@ SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape)
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
+SWIGINTERN int layerObj_queryByIndex(struct layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
         int status;
         int retval;
         
@@ -2925,31 +2939,31 @@ SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,in
         self->status = status;
         return retval;
     }
-SWIGINTERN resultCacheObj *layerObj_getResults(layerObj *self){
+SWIGINTERN resultCacheObj *layerObj_getResults(struct layerObj *self){
         return self->resultcache;
     }
-SWIGINTERN int layerObj_setFilter(layerObj *self,char *filter){
+SWIGINTERN int layerObj_setFilter(struct layerObj *self,char *filter){
         if (!filter || strlen(filter) == 0) {
             freeExpression(&self->filter);
             return MS_SUCCESS;
         }
         else return msLoadExpressionString(&self->filter, filter);
     }
-SWIGINTERN char *layerObj_getFilterString(layerObj *self){
+SWIGINTERN char *layerObj_getFilterString(struct layerObj *self){
         return msGetExpressionString(&(self->filter));
     }
-SWIGINTERN int layerObj_setWKTProjection(layerObj *self,char *wkt){
+SWIGINTERN int layerObj_setWKTProjection(struct layerObj *self,char *wkt){
         self->project = 1;
         return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
     }
-SWIGINTERN char *layerObj_getProjection(layerObj *self){    
+SWIGINTERN char *layerObj_getProjection(struct layerObj *self){    
         return (char *) msGetProjectionString(&(self->projection));
     }
-SWIGINTERN int layerObj_setProjection(layerObj *self,char *proj4){
+SWIGINTERN int layerObj_setProjection(struct layerObj *self,char *proj4){
         self->project = 1;
         return msLoadProjectionString(&(self->projection), proj4);
     }
-SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){    
+SWIGINTERN int layerObj_addFeature(struct layerObj *self,shapeObj *shape){    
         self->connectiontype = MS_INLINE;
         if(self->features != NULL && self->features->tailifhead != NULL) 
             shape->index = self->features->tailifhead->shape.index + 1;
@@ -2959,16 +2973,16 @@ SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_getNumFeatures(layerObj *self){
+SWIGINTERN int layerObj_getNumFeatures(struct layerObj *self){
         return msLayerGetNumFeatures(self);
     }
-SWIGINTERN rectObj *layerObj_getExtent(layerObj *self){
+SWIGINTERN rectObj *layerObj_getExtent(struct layerObj *self){
         rectObj *extent;
         extent = (rectObj *) malloc(sizeof(rectObj));
         msLayerGetExtent(self, extent);
         return extent;
     }
-SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double maxx,double maxy){
+SWIGINTERN int layerObj_setExtent(struct layerObj *self,double minx,double miny,double maxx,double maxy){
         if (minx > maxx || miny > maxy) {
             msSetError(34,
                 "{ 'minx': %f , 'miny': %f , 'maxx': %f , 'maxy': %f }",
@@ -2978,7 +2992,7 @@ SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double
 
         return msLayerSetExtent(self, minx, miny, maxx, maxy);
     }
-SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
+SWIGINTERN char *layerObj_getMetaData(struct layerObj *self,char *name){
         char *value = NULL;
         if (!name) {
             msSetError(16, "NULL key", "getMetaData");
@@ -2999,37 +3013,37 @@ SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
 
         return value;
     }
-SWIGINTERN int layerObj_setMetaData(layerObj *self,char *name,char *value){
+SWIGINTERN int layerObj_setMetaData(struct layerObj *self,char *name,char *value){
         if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_removeMetaData(layerObj *self,char *name){
+SWIGINTERN int layerObj_removeMetaData(struct layerObj *self,char *name){
         return(msRemoveHashTable(&(self->metadata), name));
     }
-SWIGINTERN char *layerObj_getFirstMetaDataKey(layerObj *self){
+SWIGINTERN char *layerObj_getFirstMetaDataKey(struct layerObj *self){
         return (char *) msFirstKeyFromHashTable(&(self->metadata));
     }
-SWIGINTERN char *layerObj_getNextMetaDataKey(layerObj *self,char *lastkey){
+SWIGINTERN char *layerObj_getNextMetaDataKey(struct layerObj *self,char *lastkey){
         return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
     }
-SWIGINTERN char *layerObj_getWMSFeatureInfoURL(layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
+SWIGINTERN char *layerObj_getWMSFeatureInfoURL(struct layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
         return (char *) msWMSGetFeatureInfoURL(map, self, click_x, click_y,
                feature_count, info_format);
     }
-SWIGINTERN char *layerObj_executeWFSGetFeature(layerObj *self,layerObj *layer){
+SWIGINTERN char *layerObj_executeWFSGetFeature(struct layerObj *self,layerObj *layer){
         return (char *) msWFSExecuteGetFeature(layer);
     }
-SWIGINTERN int layerObj_applySLD(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLD(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLD(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN int layerObj_applySLDURL(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLDURL(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLDURL(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN char *layerObj_generateSLD(layerObj *self){
+SWIGINTERN char *layerObj_generateSLD(struct layerObj *self){
         return (char *) msSLDGenerateSLD(self->map, self->index, NULL);
     }
-SWIGINTERN int layerObj_isVisible(layerObj *self){
+SWIGINTERN int layerObj_isVisible(struct layerObj *self){
         if (!self->map)
         {
             msSetError(12,
@@ -3039,31 +3053,31 @@ SWIGINTERN int layerObj_isVisible(layerObj *self){
         }
         return msLayerIsVisible(self->map, self);
     }
-SWIGINTERN int layerObj_moveClassUp(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassUp(struct layerObj *self,int index){
         return msMoveClassUp(self, index);
     }
-SWIGINTERN int layerObj_moveClassDown(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassDown(struct layerObj *self,int index){
         return msMoveClassDown(self, index);
     }
-SWIGINTERN void layerObj_setProcessingKey(layerObj *self,char const *key,char const *value){
+SWIGINTERN void layerObj_setProcessingKey(struct layerObj *self,char const *key,char const *value){
 	   msLayerSetProcessingKey( self, key, value );
     }
-SWIGINTERN void layerObj_setProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_setProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN void layerObj_addProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_addProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN char *layerObj_getProcessing(layerObj *self,int index){
+SWIGINTERN char *layerObj_getProcessing(struct layerObj *self,int index){
         return (char *) msLayerGetProcessing(self, index);
     }
-SWIGINTERN char *layerObj_getProcessingKey(layerObj *self,char const *key){
+SWIGINTERN char *layerObj_getProcessingKey(struct layerObj *self,char const *key){
       return (char *) msLayerGetProcessingKey(self, key);
     }
-SWIGINTERN int layerObj_clearProcessing(layerObj *self){
+SWIGINTERN int layerObj_clearProcessing(struct layerObj *self){
         return msLayerClearProcessing(self);
     }
-SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char const *library_str){    
+SWIGINTERN int layerObj_setConnectionType(struct layerObj *self,int connectiontype,char const *library_str){    
         /* Caller is responsible to close previous layer correctly before
          * calling msConnectLayer() 
          */
@@ -3071,20 +3085,20 @@ SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char
           msLayerClose(self);
         return msConnectLayer(self, connectiontype, library_str);
     }
-SWIGINTERN int layerObj_getClassIndex(layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
+SWIGINTERN int layerObj_getClassIndex(struct layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
         return msShapeGetClass(self, map, shape, classgroup, numclasses);
     }
-SWIGINTERN mapObj *new_mapObj(char *filename){
+SWIGINTERN struct mapObj *new_mapObj(char *filename){
         if (filename && strlen(filename))
             return msLoadMap(filename, NULL);
         else { /* create an empty map, no layers etc... */
             return msNewMapObj();
         }      
     }
-SWIGINTERN void delete_mapObj(mapObj *self){
+SWIGINTERN void delete_mapObj(struct mapObj *self){
         msFreeMap(self);
     }
-SWIGINTERN mapObj *mapObj_clone(mapObj *self){
+SWIGINTERN mapObj *mapObj_clone(struct mapObj *self){
         mapObj *dstMap;
         dstMap = msNewMapObj();
         if (msCopyMap(dstMap, self) != MS_SUCCESS) {
@@ -3093,33 +3107,33 @@ SWIGINTERN mapObj *mapObj_clone(mapObj *self){
         }
         return dstMap;
     }
-SWIGINTERN int mapObj_insertLayer(mapObj *self,layerObj *layer,int index){
+SWIGINTERN int mapObj_insertLayer(struct mapObj *self,layerObj *layer,int index){
         return msInsertLayer(self, layer, index);  
     }
-SWIGINTERN layerObj *mapObj_removeLayer(mapObj *self,int index){
+SWIGINTERN layerObj *mapObj_removeLayer(struct mapObj *self,int index){
     	layerObj *layer=msRemoveLayer(self, index);
 	MS_REFCNT_INCR(layer);
         return layer;
     }
-SWIGINTERN int mapObj_setExtent(mapObj *self,double minx,double miny,double maxx,double maxy){	
+SWIGINTERN int mapObj_setExtent(struct mapObj *self,double minx,double miny,double maxx,double maxy){	
 	return msMapSetExtent( self, minx, miny, maxx, maxy );
     }
-SWIGINTERN int mapObj_offsetExtent(mapObj *self,double x,double y){	
+SWIGINTERN int mapObj_offsetExtent(struct mapObj *self,double x,double y){	
 	return msMapOffsetExtent( self, x, y );
     }
-SWIGINTERN int mapObj_scaleExtent(mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
+SWIGINTERN int mapObj_scaleExtent(struct mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
 	return msMapScaleExtent( self, zoomfactor, minscaledenom, maxscaledenom );
     }
-SWIGINTERN int mapObj_setCenter(mapObj *self,pointObj *center){	
+SWIGINTERN int mapObj_setCenter(struct mapObj *self,pointObj *center){	
 	return msMapSetCenter( self, center );
     }
-SWIGINTERN int mapObj_setSize(mapObj *self,int width,int height){
+SWIGINTERN int mapObj_setSize(struct mapObj *self,int width,int height){
         return msMapSetSize(self, width, height);
     }
-SWIGINTERN int mapObj_setRotation(mapObj *self,double rotation_angle){
+SWIGINTERN int mapObj_setRotation(struct mapObj *self,double rotation_angle){
         return msMapSetRotation( self, rotation_angle );
     }
-SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
+SWIGINTERN layerObj *mapObj_getLayer(struct mapObj *self,int i){
     if(i >= 0 && i < self->numlayers) {
     	MS_REFCNT_INCR(self->layers[i]);
       	return (self->layers[i]); /* returns an EXISTING layer */
@@ -3127,7 +3141,7 @@ SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
+SWIGINTERN layerObj *mapObj_getLayerByName(struct mapObj *self,char *name){
     int i;
 
     i = msGetLayerIndex(self, name);
@@ -3139,19 +3153,19 @@ SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
     else
       return NULL;
   }
-SWIGINTERN int mapObj_getSymbolByName(mapObj *self,char *name){
+SWIGINTERN int mapObj_getSymbolByName(struct mapObj *self,char *name){
     return msGetSymbolIndex(&self->symbolset, name, 1);
   }
-SWIGINTERN void mapObj_prepareQuery(mapObj *self){
+SWIGINTERN void mapObj_prepareQuery(struct mapObj *self){
     int status;
 
     status = msCalculateScale(self->extent, self->units, self->width, self->height, self->resolution, &self->scaledenom);
     if(status != MS_SUCCESS) self->scaledenom = -1;
   }
-SWIGINTERN imageObj *mapObj_prepareImage(mapObj *self){
+SWIGINTERN imageObj *mapObj_prepareImage(struct mapObj *self){
     return msPrepareImage(self, 0);
   }
-SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_setImageType(struct mapObj *self,char *imagetype){
       outputFormatObj *format;
 
       format = msSelectOutputFormat( self, imagetype );
@@ -3166,7 +3180,7 @@ SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
                                -1111, -1111 );
       }
   }
-SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_selectOutputFormat(struct mapObj *self,char *imagetype){
         outputFormatObj *format;
 
         format = msSelectOutputFormat( self, imagetype );
@@ -3181,38 +3195,38 @@ SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
                                  -1111, -1111 );
         }
     }
-SWIGINTERN void mapObj_setOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN void mapObj_setOutputFormat(struct mapObj *self,outputFormatObj *format){
       msApplyOutputFormat( &(self->outputformat), format, -1111, 
                            -1111, -1111 );
   }
-SWIGINTERN imageObj *mapObj_draw(mapObj *self){
+SWIGINTERN imageObj *mapObj_draw(struct mapObj *self){
     return msDrawMap(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawQuery(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawQuery(struct mapObj *self){
     return msDrawMap(self, 1);
   }
-SWIGINTERN imageObj *mapObj_drawLegend(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawLegend(struct mapObj *self){
     return msDrawLegend(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawScalebar(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawScalebar(struct mapObj *self){
     return msDrawScalebar(self);
   }
-SWIGINTERN imageObj *mapObj_drawReferenceMap(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawReferenceMap(struct mapObj *self){
     return msDrawReferenceMap(self);
   }
-SWIGINTERN int mapObj_embedScalebar(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedScalebar(struct mapObj *self,imageObj *image){	
     return msEmbedScalebar(self, image);
   }
-SWIGINTERN int mapObj_embedLegend(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedLegend(struct mapObj *self,imageObj *image){	
     return msEmbedLegend(self, image);
   }
-SWIGINTERN int mapObj_drawLabelCache(mapObj *self,imageObj *image){
+SWIGINTERN int mapObj_drawLabelCache(struct mapObj *self,imageObj *image){
     return msDrawLabelCache(image, self);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_getLabel(mapObj *self,int i){
+SWIGINTERN labelCacheMemberObj *mapObj_getLabel(struct mapObj *self,int i){
     return msGetLabelCacheMember(&(self->labelcache), i);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
+SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(struct mapObj *self){
     static int i=0;
 
     if(i<self->labelcache.numlabels)
@@ -3220,7 +3234,7 @@ SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
     else
       return NULL;	
   }
-SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
+SWIGINTERN int mapObj_queryByFilter(struct mapObj *self,char *string){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_FILTER;
@@ -3236,7 +3250,7 @@ SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
 
     return msQueryByFilter(self);
   }
-SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double buffer){
+SWIGINTERN int mapObj_queryByPoint(struct mapObj *self,pointObj *point,int mode,double buffer){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_POINT;
@@ -3246,7 +3260,7 @@ SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double
 
     return msQueryByPoint(self);
   }
-SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
+SWIGINTERN int mapObj_queryByRect(struct mapObj *self,rectObj rect){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_RECT;
@@ -3255,11 +3269,11 @@ SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
 
     return msQueryByRect(self);
   }
-SWIGINTERN int mapObj_queryByFeatures(mapObj *self,int slayer){
+SWIGINTERN int mapObj_queryByFeatures(struct mapObj *self,int slayer){
     self->query.slayer = slayer;
     return msQueryByFeatures(self);
   }
-SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
+SWIGINTERN int mapObj_queryByShape(struct mapObj *self,shapeObj *shape){
     msInitQuery(&(self->query));
     
     self->query.type = MS_QUERY_BY_SHAPE;
@@ -3270,31 +3284,31 @@ SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
 
     return msQueryByShape(self);
   }
-SWIGINTERN int mapObj_setWKTProjection(mapObj *self,char *wkt){
+SWIGINTERN int mapObj_setWKTProjection(struct mapObj *self,char *wkt){
     return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
   }
-SWIGINTERN char *mapObj_getProjection(mapObj *self){
+SWIGINTERN char *mapObj_getProjection(struct mapObj *self){
     return msGetProjectionString(&(self->projection));
   }
-SWIGINTERN int mapObj_setProjection(mapObj *self,char *proj4){
+SWIGINTERN int mapObj_setProjection(struct mapObj *self,char *proj4){
     return msLoadProjectionString(&(self->projection), proj4);
   }
-SWIGINTERN int mapObj_save(mapObj *self,char *filename){
+SWIGINTERN int mapObj_save(struct mapObj *self,char *filename){
     return msSaveMap(self, filename);
   }
-SWIGINTERN int mapObj_saveQuery(mapObj *self,char *filename,int results){
+SWIGINTERN int mapObj_saveQuery(struct mapObj *self,char *filename,int results){
     return msSaveQuery(self, filename, results);
   }
-SWIGINTERN int mapObj_loadQuery(mapObj *self,char *filename){
+SWIGINTERN int mapObj_loadQuery(struct mapObj *self,char *filename){
     return msLoadQuery(self, filename);
   }
-SWIGINTERN void mapObj_freeQuery(mapObj *self,int qlayer){
+SWIGINTERN void mapObj_freeQuery(struct mapObj *self,int qlayer){
     msQueryFree(self, qlayer);
   }
-SWIGINTERN int mapObj_saveQueryAsGML(mapObj *self,char *filename,char const *ns){
+SWIGINTERN int mapObj_saveQueryAsGML(struct mapObj *self,char *filename,char const *ns){
     return msGMLWriteQuery(self, filename, ns);
   }
-SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
+SWIGINTERN char *mapObj_getMetaData(struct mapObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -3307,21 +3321,21 @@ SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int mapObj_setMetaData(mapObj *self,char *name,char *value){
+SWIGINTERN int mapObj_setMetaData(struct mapObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->web.metadata), name, value) == NULL)
 	return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN int mapObj_removeMetaData(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeMetaData(struct mapObj *self,char *name){
     return(msRemoveHashTable(&(self->web.metadata), name));
   }
-SWIGINTERN char *mapObj_getFirstMetaDataKey(mapObj *self){
+SWIGINTERN char *mapObj_getFirstMetaDataKey(struct mapObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->web.metadata));
   }
-SWIGINTERN char *mapObj_getNextMetaDataKey(mapObj *self,char *lastkey){
+SWIGINTERN char *mapObj_getNextMetaDataKey(struct mapObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->web.metadata), lastkey);
   }
-SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_setSymbolSet(struct mapObj *self,char *szFileName){
     msFreeSymbolSet(&self->symbolset);
     msInitSymbolSet(&self->symbolset);
    
@@ -3332,10 +3346,10 @@ SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
 
     return msLoadSymbolSet(&self->symbolset, self);
   }
-SWIGINTERN int mapObj_getNumSymbols(mapObj *self){
+SWIGINTERN int mapObj_getNumSymbols(struct mapObj *self){
     return self->symbolset.numsymbols;
   }
-SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
+SWIGINTERN int mapObj_setFontSet(struct mapObj *self,char *filename){
     msFreeFontSet(&(self->fontset));
     msInitFontSet(&(self->fontset));
    
@@ -3343,19 +3357,19 @@ SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
 
     return msLoadFontSet(&(self->fontset), self);
   }
-SWIGINTERN int mapObj_saveMapContext(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_saveMapContext(struct mapObj *self,char *szFileName){
     return msSaveMapContext(self, szFileName);
   }
-SWIGINTERN int mapObj_loadMapContext(mapObj *self,char *szFileName,int useUniqueNames){
+SWIGINTERN int mapObj_loadMapContext(struct mapObj *self,char *szFileName,int useUniqueNames){
     return msLoadMapContext(self, szFileName, useUniqueNames);
   }
-SWIGINTERN int mapObj_moveLayerUp(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerUp(struct mapObj *self,int layerindex){
     return msMoveLayerUp(self, layerindex);
   }
-SWIGINTERN int mapObj_moveLayerDown(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerDown(struct mapObj *self,int layerindex){
     return msMoveLayerDown(self, layerindex);
   }
-SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
+SWIGINTERN intarray *mapObj_getLayersDrawingOrder(struct mapObj *self){
     int i;
     intarray *order;
     order = new_intarray(self->numlayers);
@@ -3367,53 +3381,53 @@ SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
         
     return order;
   }
-SWIGINTERN int mapObj_setLayersDrawingOrder(mapObj *self,int *panIndexes){
+SWIGINTERN int mapObj_setLayersDrawingOrder(struct mapObj *self,int *panIndexes){
     return  msSetLayersdrawingOrder(self, panIndexes); 
   }
-SWIGINTERN void mapObj_setConfigOption(mapObj *self,char *key,char *value){
+SWIGINTERN void mapObj_setConfigOption(struct mapObj *self,char *key,char *value){
     msSetConfigOption(self,key,value);
   }
-SWIGINTERN char *mapObj_getConfigOption(mapObj *self,char *key){
+SWIGINTERN char *mapObj_getConfigOption(struct mapObj *self,char *key){
     return (char *) msGetConfigOption(self,key);
   }
-SWIGINTERN void mapObj_applyConfigOptions(mapObj *self){
+SWIGINTERN void mapObj_applyConfigOptions(struct mapObj *self){
     msApplyMapConfigOptions( self );
   }
-SWIGINTERN int mapObj_applySLD(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLD(struct mapObj *self,char *sld){
       return msSLDApplySLD(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN int mapObj_applySLDURL(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLDURL(struct mapObj *self,char *sld){
       return msSLDApplySLDURL(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN char *mapObj_generateSLD(mapObj *self){
+SWIGINTERN char *mapObj_generateSLD(struct mapObj *self){
         return (char *) msSLDGenerateSLD(self, -1, NULL);
     }
-SWIGINTERN char *mapObj_processTemplate(mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processTemplate(struct mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
         return msProcessTemplate(self, bGenerateImages, names, values,
                                  numentries);
     }
-SWIGINTERN char *mapObj_processLegendTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processLegendTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessLegendTemplate(self, names, values, numentries);
     }
-SWIGINTERN char *mapObj_processQueryTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processQueryTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessQueryTemplate(self, 1, names, values, numentries);
     }
-SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(mapObj *self,char *name){
+SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(struct mapObj *self,char *name){
         return msSelectOutputFormat(self, name); 
     }
-SWIGINTERN int mapObj_appendOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN int mapObj_appendOutputFormat(struct mapObj *self,outputFormatObj *format){
         return msAppendOutputFormat(self, format);
     }
-SWIGINTERN int mapObj_removeOutputFormat(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeOutputFormat(struct mapObj *self,char *name){
         return msRemoveOutputFormat(self, name);
     }
-SWIGINTERN int mapObj_loadOWSParameters(mapObj *self,cgiRequestObj *request,char *wmtver_string){
+SWIGINTERN int mapObj_loadOWSParameters(struct mapObj *self,cgiRequestObj *request,char *wmtver_string){
         return msMapLoadOWSParameters(self, request, wmtver_string);
     }
-SWIGINTERN int mapObj_OWSDispatch(mapObj *self,cgiRequestObj *req){
+SWIGINTERN int mapObj_OWSDispatch(struct mapObj *self,cgiRequestObj *req){
 	return msOWSDispatch( self, req, 1 );
     }
-SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomPoint(struct mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -3589,7 +3603,7 @@ SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,i
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomRectangle(struct mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
         double      dfNewScale;
@@ -3754,7 +3768,7 @@ SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,in
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomScale(mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomScale(struct mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -4350,10 +4364,13 @@ SWIGINTERN void shapeObj_initValues(shapeObj *self,int numvalues){
 
 SWIGINTERNINLINE SV *
 SWIG_From_unsigned_SS_long  SWIG_PERL_DECL_ARGS_1(unsigned long value)
-{    
-  SV *obj = sv_newmortal();
-  sv_setuv(obj, (UV) value);
-  return obj;
+{
+  SV *sv;
+  if (value <= UV_MAX)
+    sv = newSVuv(value);
+  else
+    sv = newSVpvf("%lu", value);
+  return sv_2mortal(sv);
 }
 
 
@@ -4684,11 +4701,11 @@ SWIGINTERN int symbolObj_setImage(symbolObj *self,imageObj *image){
 
         return MS_SUCCESS;
     }
-SWIGINTERN errorObj *new_errorObj(){    
+SWIGINTERN struct errorObj *new_errorObj(){    
         return msGetErrorObj();
     }
-SWIGINTERN void delete_errorObj(errorObj *self){}
-SWIGINTERN errorObj *errorObj_next(errorObj *self){
+SWIGINTERN void delete_errorObj(struct errorObj *self){}
+SWIGINTERN errorObj *errorObj_next(struct errorObj *self){
         errorObj *ep;	
 
         if (self == NULL || self->next == NULL) return NULL;
@@ -14765,7 +14782,7 @@ XS(_wrap_labelObj_moveStyleDown) {
 
 XS(_wrap_classObj_status_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -14779,9 +14796,9 @@ XS(_wrap_classObj_status_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -14802,7 +14819,7 @@ XS(_wrap_classObj_status_set) {
 
 XS(_wrap_classObj_status_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -14814,9 +14831,9 @@ XS(_wrap_classObj_status_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->status);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -14830,7 +14847,7 @@ XS(_wrap_classObj_status_get) {
 
 XS(_wrap_classObj_numstyles_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -14842,9 +14859,9 @@ XS(_wrap_classObj_numstyles_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numstyles_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numstyles_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->numstyles);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -14858,7 +14875,7 @@ XS(_wrap_classObj_numstyles_get) {
 
 XS(_wrap_classObj_numlabels_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -14872,9 +14889,9 @@ XS(_wrap_classObj_numlabels_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_numlabels_set" "', argument " "2"" of type '" "int""'");
@@ -14895,7 +14912,7 @@ XS(_wrap_classObj_numlabels_set) {
 
 XS(_wrap_classObj_numlabels_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -14907,9 +14924,9 @@ XS(_wrap_classObj_numlabels_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->numlabels);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -14923,7 +14940,7 @@ XS(_wrap_classObj_numlabels_get) {
 
 XS(_wrap_classObj_name_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -14938,9 +14955,9 @@ XS(_wrap_classObj_name_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_name_set" "', argument " "2"" of type '" "char *""'");
@@ -14969,7 +14986,7 @@ XS(_wrap_classObj_name_set) {
 
 XS(_wrap_classObj_name_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -14981,9 +14998,9 @@ XS(_wrap_classObj_name_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *) ((arg1)->name);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -14997,7 +15014,7 @@ XS(_wrap_classObj_name_get) {
 
 XS(_wrap_classObj_title_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15012,9 +15029,9 @@ XS(_wrap_classObj_title_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_title_set" "', argument " "2"" of type '" "char *""'");
@@ -15043,7 +15060,7 @@ XS(_wrap_classObj_title_set) {
 
 XS(_wrap_classObj_title_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15055,9 +15072,9 @@ XS(_wrap_classObj_title_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *) ((arg1)->title);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -15071,7 +15088,7 @@ XS(_wrap_classObj_title_get) {
 
 XS(_wrap_classObj_template_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15086,9 +15103,9 @@ XS(_wrap_classObj_template_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_template_set" "', argument " "2"" of type '" "char *""'");
@@ -15117,7 +15134,7 @@ XS(_wrap_classObj_template_set) {
 
 XS(_wrap_classObj_template_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15129,9 +15146,9 @@ XS(_wrap_classObj_template_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *) ((arg1)->template);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -15145,7 +15162,7 @@ XS(_wrap_classObj_template_get) {
 
 XS(_wrap_classObj_type_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15159,9 +15176,9 @@ XS(_wrap_classObj_type_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_type_set" "', argument " "2"" of type '" "int""'");
@@ -15182,7 +15199,7 @@ XS(_wrap_classObj_type_set) {
 
 XS(_wrap_classObj_type_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15194,9 +15211,9 @@ XS(_wrap_classObj_type_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->type);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -15210,7 +15227,7 @@ XS(_wrap_classObj_type_get) {
 
 XS(_wrap_classObj_metadata_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15222,9 +15239,9 @@ XS(_wrap_classObj_metadata_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_metadata_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_metadata_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->metadata);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -15238,7 +15255,7 @@ XS(_wrap_classObj_metadata_get) {
 
 XS(_wrap_classObj_validation_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15250,9 +15267,9 @@ XS(_wrap_classObj_validation_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_validation_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_validation_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->validation);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -15266,7 +15283,7 @@ XS(_wrap_classObj_validation_get) {
 
 XS(_wrap_classObj_minscaledenom_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15280,9 +15297,9 @@ XS(_wrap_classObj_minscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_minscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -15303,7 +15320,7 @@ XS(_wrap_classObj_minscaledenom_set) {
 
 XS(_wrap_classObj_minscaledenom_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15315,9 +15332,9 @@ XS(_wrap_classObj_minscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (double) ((arg1)->minscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -15331,7 +15348,7 @@ XS(_wrap_classObj_minscaledenom_get) {
 
 XS(_wrap_classObj_maxscaledenom_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15345,9 +15362,9 @@ XS(_wrap_classObj_maxscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_maxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -15368,7 +15385,7 @@ XS(_wrap_classObj_maxscaledenom_set) {
 
 XS(_wrap_classObj_maxscaledenom_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15380,9 +15397,9 @@ XS(_wrap_classObj_maxscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (double) ((arg1)->maxscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -15396,7 +15413,7 @@ XS(_wrap_classObj_maxscaledenom_get) {
 
 XS(_wrap_classObj_minfeaturesize_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15410,9 +15427,9 @@ XS(_wrap_classObj_minfeaturesize_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_minfeaturesize_set" "', argument " "2"" of type '" "int""'");
@@ -15433,7 +15450,7 @@ XS(_wrap_classObj_minfeaturesize_set) {
 
 XS(_wrap_classObj_minfeaturesize_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15445,9 +15462,9 @@ XS(_wrap_classObj_minfeaturesize_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->minfeaturesize);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -15461,7 +15478,7 @@ XS(_wrap_classObj_minfeaturesize_get) {
 
 XS(_wrap_classObj_refcount_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15473,9 +15490,9 @@ XS(_wrap_classObj_refcount_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_refcount_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_refcount_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->refcount);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -15489,7 +15506,7 @@ XS(_wrap_classObj_refcount_get) {
 
 XS(_wrap_classObj_layer_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15501,9 +15518,9 @@ XS(_wrap_classObj_layer_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_layer_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_layer_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     {
       /* Accessing layer */
       result = (struct layerObj *) ((arg1)->layer);;
@@ -15521,7 +15538,7 @@ XS(_wrap_classObj_layer_get) {
 
 XS(_wrap_classObj_debug_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15535,9 +15552,9 @@ XS(_wrap_classObj_debug_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -15558,7 +15575,7 @@ XS(_wrap_classObj_debug_set) {
 
 XS(_wrap_classObj_debug_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15570,9 +15587,9 @@ XS(_wrap_classObj_debug_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (int) ((arg1)->debug);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -15586,7 +15603,7 @@ XS(_wrap_classObj_debug_get) {
 
 XS(_wrap_classObj_keyimage_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15601,9 +15618,9 @@ XS(_wrap_classObj_keyimage_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_keyimage_set" "', argument " "2"" of type '" "char *""'");
@@ -15632,7 +15649,7 @@ XS(_wrap_classObj_keyimage_set) {
 
 XS(_wrap_classObj_keyimage_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15644,9 +15661,9 @@ XS(_wrap_classObj_keyimage_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *) ((arg1)->keyimage);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -15660,7 +15677,7 @@ XS(_wrap_classObj_keyimage_get) {
 
 XS(_wrap_classObj_group_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15675,9 +15692,9 @@ XS(_wrap_classObj_group_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_group_set" "', argument " "2"" of type '" "char *""'");
@@ -15706,7 +15723,7 @@ XS(_wrap_classObj_group_set) {
 
 XS(_wrap_classObj_group_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15718,9 +15735,9 @@ XS(_wrap_classObj_group_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *) ((arg1)->group);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -15734,7 +15751,7 @@ XS(_wrap_classObj_group_get) {
 
 XS(_wrap_classObj_leader_set) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     labelLeaderObj *arg2 = (labelLeaderObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15748,9 +15765,9 @@ XS(_wrap_classObj_leader_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_set" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_set" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_labelLeaderObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_leader_set" "', argument " "2"" of type '" "labelLeaderObj *""'"); 
@@ -15771,7 +15788,7 @@ XS(_wrap_classObj_leader_set) {
 
 XS(_wrap_classObj_leader_get) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15783,9 +15800,9 @@ XS(_wrap_classObj_leader_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_get" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_get" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (labelLeaderObj *)& ((arg1)->leader);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_labelLeaderObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -15803,7 +15820,7 @@ XS(_wrap_new_classObj) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
-    classObj *result = 0 ;
+    struct classObj *result = 0 ;
     dXSARGS;
     
     if ((items < 0) || (items > 1)) {
@@ -15816,7 +15833,7 @@ XS(_wrap_new_classObj) {
       }
       arg1 = (layerObj *)(argp1);
     }
-    result = (classObj *)new_classObj(arg1);
+    result = (struct classObj *)new_classObj(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_classObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
     XSRETURN(argvi);
@@ -15829,7 +15846,7 @@ XS(_wrap_new_classObj) {
 
 XS(_wrap_delete_classObj) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15840,9 +15857,9 @@ XS(_wrap_delete_classObj) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_classObj" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_classObj" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     delete_classObj(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -15856,7 +15873,7 @@ XS(_wrap_delete_classObj) {
 
 XS(_wrap_classObj_updateFromString) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15872,9 +15889,9 @@ XS(_wrap_classObj_updateFromString) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_updateFromString" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_updateFromString" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_updateFromString" "', argument " "2"" of type '" "char *""'");
@@ -15895,7 +15912,7 @@ XS(_wrap_classObj_updateFromString) {
 
 XS(_wrap_classObj_clone) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15907,9 +15924,9 @@ XS(_wrap_classObj_clone) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_clone" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_clone" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (classObj *)classObj_clone(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_classObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -15923,7 +15940,7 @@ XS(_wrap_classObj_clone) {
 
 XS(_wrap_classObj_setExpression) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -15939,9 +15956,9 @@ XS(_wrap_classObj_setExpression) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setExpression" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setExpression" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_setExpression" "', argument " "2"" of type '" "char *""'");
@@ -15962,7 +15979,7 @@ XS(_wrap_classObj_setExpression) {
 
 XS(_wrap_classObj_getExpressionString) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -15974,9 +15991,9 @@ XS(_wrap_classObj_getExpressionString) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getExpressionString" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getExpressionString" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *)classObj_getExpressionString(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -15991,7 +16008,7 @@ XS(_wrap_classObj_getExpressionString) {
 
 XS(_wrap_classObj_setText) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16007,9 +16024,9 @@ XS(_wrap_classObj_setText) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setText" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setText" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_setText" "', argument " "2"" of type '" "char *""'");
@@ -16030,7 +16047,7 @@ XS(_wrap_classObj_setText) {
 
 XS(_wrap_classObj_getTextString) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -16042,9 +16059,9 @@ XS(_wrap_classObj_getTextString) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getTextString" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getTextString" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *)classObj_getTextString(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -16059,7 +16076,7 @@ XS(_wrap_classObj_getTextString) {
 
 XS(_wrap_classObj_getMetaData) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16075,9 +16092,9 @@ XS(_wrap_classObj_getMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getMetaData" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getMetaData" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_getMetaData" "', argument " "2"" of type '" "char *""'");
@@ -16098,7 +16115,7 @@ XS(_wrap_classObj_getMetaData) {
 
 XS(_wrap_classObj_setMetaData) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -16118,9 +16135,9 @@ XS(_wrap_classObj_setMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setMetaData" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setMetaData" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_setMetaData" "', argument " "2"" of type '" "char *""'");
@@ -16148,7 +16165,7 @@ XS(_wrap_classObj_setMetaData) {
 
 XS(_wrap_classObj_getFirstMetaDataKey) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -16160,9 +16177,9 @@ XS(_wrap_classObj_getFirstMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getFirstMetaDataKey" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     result = (char *)classObj_getFirstMetaDataKey(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -16176,7 +16193,7 @@ XS(_wrap_classObj_getFirstMetaDataKey) {
 
 XS(_wrap_classObj_getNextMetaDataKey) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16192,9 +16209,9 @@ XS(_wrap_classObj_getNextMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getNextMetaDataKey" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_getNextMetaDataKey" "', argument " "2"" of type '" "char *""'");
@@ -16215,7 +16232,7 @@ XS(_wrap_classObj_getNextMetaDataKey) {
 
 XS(_wrap_classObj_drawLegendIcon) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     layerObj *arg3 = (layerObj *) 0 ;
     int arg4 ;
@@ -16248,9 +16265,9 @@ XS(_wrap_classObj_drawLegendIcon) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_drawLegendIcon" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_drawLegendIcon" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_drawLegendIcon" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -16313,7 +16330,7 @@ XS(_wrap_classObj_drawLegendIcon) {
 
 XS(_wrap_classObj_createLegendIcon) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     layerObj *arg3 = (layerObj *) 0 ;
     int arg4 ;
@@ -16337,9 +16354,9 @@ XS(_wrap_classObj_createLegendIcon) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_createLegendIcon" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_createLegendIcon" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_createLegendIcon" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -16381,7 +16398,7 @@ XS(_wrap_classObj_createLegendIcon) {
 
 XS(_wrap_classObj_getLabel) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16396,9 +16413,9 @@ XS(_wrap_classObj_getLabel) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getLabel" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_getLabel" "', argument " "2"" of type '" "int""'");
@@ -16419,7 +16436,7 @@ XS(_wrap_classObj_getLabel) {
 
 XS(_wrap_classObj_addLabel) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     labelObj *arg2 = (labelObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16434,9 +16451,9 @@ XS(_wrap_classObj_addLabel) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_addLabel" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_addLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_labelObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_addLabel" "', argument " "2"" of type '" "labelObj *""'"); 
@@ -16457,7 +16474,7 @@ XS(_wrap_classObj_addLabel) {
 
 XS(_wrap_classObj_removeLabel) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16472,9 +16489,9 @@ XS(_wrap_classObj_removeLabel) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeLabel" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_removeLabel" "', argument " "2"" of type '" "int""'");
@@ -16495,7 +16512,7 @@ XS(_wrap_classObj_removeLabel) {
 
 XS(_wrap_classObj_getStyle) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16510,9 +16527,9 @@ XS(_wrap_classObj_getStyle) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getStyle" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_getStyle" "', argument " "2"" of type '" "int""'");
@@ -16533,7 +16550,7 @@ XS(_wrap_classObj_getStyle) {
 
 XS(_wrap_classObj_insertStyle) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     styleObj *arg2 = (styleObj *) 0 ;
     int arg3 = (int) -1 ;
     void *argp1 = 0 ;
@@ -16551,9 +16568,9 @@ XS(_wrap_classObj_insertStyle) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_insertStyle" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_insertStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_styleObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_insertStyle" "', argument " "2"" of type '" "styleObj *""'"); 
@@ -16583,7 +16600,7 @@ XS(_wrap_classObj_insertStyle) {
 
 XS(_wrap_classObj_removeStyle) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16598,9 +16615,9 @@ XS(_wrap_classObj_removeStyle) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeStyle" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_removeStyle" "', argument " "2"" of type '" "int""'");
@@ -16621,7 +16638,7 @@ XS(_wrap_classObj_removeStyle) {
 
 XS(_wrap_classObj_moveStyleUp) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16636,9 +16653,9 @@ XS(_wrap_classObj_moveStyleUp) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleUp" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleUp" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_moveStyleUp" "', argument " "2"" of type '" "int""'");
@@ -16659,7 +16676,7 @@ XS(_wrap_classObj_moveStyleUp) {
 
 XS(_wrap_classObj_moveStyleDown) {
   {
-    classObj *arg1 = (classObj *) 0 ;
+    struct classObj *arg1 = (struct classObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -16674,9 +16691,9 @@ XS(_wrap_classObj_moveStyleDown) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleDown" "', argument " "1"" of type '" "classObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleDown" "', argument " "1"" of type '" "struct classObj *""'"); 
     }
-    arg1 = (classObj *)(argp1);
+    arg1 = (struct classObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_moveStyleDown" "', argument " "2"" of type '" "int""'");
@@ -21764,7 +21781,7 @@ XS(_wrap_imageObj_getSize) {
 
 XS(_wrap_layerObj_classitem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -21779,9 +21796,9 @@ XS(_wrap_layerObj_classitem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_classitem_set" "', argument " "2"" of type '" "char *""'");
@@ -21810,7 +21827,7 @@ XS(_wrap_layerObj_classitem_set) {
 
 XS(_wrap_layerObj_classitem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21822,9 +21839,9 @@ XS(_wrap_layerObj_classitem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->classitem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -21838,7 +21855,7 @@ XS(_wrap_layerObj_classitem_get) {
 
 XS(_wrap_layerObj_refcount_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21850,9 +21867,9 @@ XS(_wrap_layerObj_refcount_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_refcount_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_refcount_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->refcount);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -21866,7 +21883,7 @@ XS(_wrap_layerObj_refcount_get) {
 
 XS(_wrap_layerObj_numclasses_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21878,9 +21895,9 @@ XS(_wrap_layerObj_numclasses_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numclasses_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numclasses_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->numclasses);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -21894,7 +21911,7 @@ XS(_wrap_layerObj_numclasses_get) {
 
 XS(_wrap_layerObj_maxclasses_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21906,9 +21923,9 @@ XS(_wrap_layerObj_maxclasses_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxclasses_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxclasses_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->maxclasses);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -21922,7 +21939,7 @@ XS(_wrap_layerObj_maxclasses_get) {
 
 XS(_wrap_layerObj_index_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21934,9 +21951,9 @@ XS(_wrap_layerObj_index_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_index_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_index_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->index);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -21950,7 +21967,7 @@ XS(_wrap_layerObj_index_get) {
 
 XS(_wrap_layerObj_map_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -21962,9 +21979,9 @@ XS(_wrap_layerObj_map_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_map_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_map_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     {
       /* Accessing map */
       result = (struct mapObj *) ((arg1)->map);;
@@ -21982,7 +21999,7 @@ XS(_wrap_layerObj_map_get) {
 
 XS(_wrap_layerObj_header_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -21997,9 +22014,9 @@ XS(_wrap_layerObj_header_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_header_set" "', argument " "2"" of type '" "char *""'");
@@ -22028,7 +22045,7 @@ XS(_wrap_layerObj_header_set) {
 
 XS(_wrap_layerObj_header_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22040,9 +22057,9 @@ XS(_wrap_layerObj_header_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->header);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22056,7 +22073,7 @@ XS(_wrap_layerObj_header_get) {
 
 XS(_wrap_layerObj_footer_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22071,9 +22088,9 @@ XS(_wrap_layerObj_footer_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_footer_set" "', argument " "2"" of type '" "char *""'");
@@ -22102,7 +22119,7 @@ XS(_wrap_layerObj_footer_set) {
 
 XS(_wrap_layerObj_footer_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22114,9 +22131,9 @@ XS(_wrap_layerObj_footer_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->footer);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22130,7 +22147,7 @@ XS(_wrap_layerObj_footer_get) {
 
 XS(_wrap_layerObj_template_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22145,9 +22162,9 @@ XS(_wrap_layerObj_template_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_template_set" "', argument " "2"" of type '" "char *""'");
@@ -22176,7 +22193,7 @@ XS(_wrap_layerObj_template_set) {
 
 XS(_wrap_layerObj_template_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22188,9 +22205,9 @@ XS(_wrap_layerObj_template_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->template);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22204,7 +22221,7 @@ XS(_wrap_layerObj_template_get) {
 
 XS(_wrap_layerObj_name_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22219,9 +22236,9 @@ XS(_wrap_layerObj_name_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_name_set" "', argument " "2"" of type '" "char *""'");
@@ -22250,7 +22267,7 @@ XS(_wrap_layerObj_name_set) {
 
 XS(_wrap_layerObj_name_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22262,9 +22279,9 @@ XS(_wrap_layerObj_name_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->name);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22278,7 +22295,7 @@ XS(_wrap_layerObj_name_get) {
 
 XS(_wrap_layerObj_group_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22293,9 +22310,9 @@ XS(_wrap_layerObj_group_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_group_set" "', argument " "2"" of type '" "char *""'");
@@ -22324,7 +22341,7 @@ XS(_wrap_layerObj_group_set) {
 
 XS(_wrap_layerObj_group_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22336,9 +22353,9 @@ XS(_wrap_layerObj_group_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->group);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22352,7 +22369,7 @@ XS(_wrap_layerObj_group_get) {
 
 XS(_wrap_layerObj_status_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22366,9 +22383,9 @@ XS(_wrap_layerObj_status_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -22389,7 +22406,7 @@ XS(_wrap_layerObj_status_set) {
 
 XS(_wrap_layerObj_status_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22401,9 +22418,9 @@ XS(_wrap_layerObj_status_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->status);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -22417,7 +22434,7 @@ XS(_wrap_layerObj_status_get) {
 
 XS(_wrap_layerObj_data_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22432,9 +22449,9 @@ XS(_wrap_layerObj_data_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_data_set" "', argument " "2"" of type '" "char *""'");
@@ -22463,7 +22480,7 @@ XS(_wrap_layerObj_data_set) {
 
 XS(_wrap_layerObj_data_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22475,9 +22492,9 @@ XS(_wrap_layerObj_data_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->data);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -22491,7 +22508,7 @@ XS(_wrap_layerObj_data_get) {
 
 XS(_wrap_layerObj_type_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     enum MS_LAYER_TYPE arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22505,9 +22522,9 @@ XS(_wrap_layerObj_type_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_type_set" "', argument " "2"" of type '" "enum MS_LAYER_TYPE""'");
@@ -22528,7 +22545,7 @@ XS(_wrap_layerObj_type_set) {
 
 XS(_wrap_layerObj_type_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22540,9 +22557,9 @@ XS(_wrap_layerObj_type_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (enum MS_LAYER_TYPE) ((arg1)->type);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -22556,7 +22573,7 @@ XS(_wrap_layerObj_type_get) {
 
 XS(_wrap_layerObj_tolerance_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22570,9 +22587,9 @@ XS(_wrap_layerObj_tolerance_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_tolerance_set" "', argument " "2"" of type '" "double""'");
@@ -22593,7 +22610,7 @@ XS(_wrap_layerObj_tolerance_set) {
 
 XS(_wrap_layerObj_tolerance_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22605,9 +22622,9 @@ XS(_wrap_layerObj_tolerance_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->tolerance);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -22621,7 +22638,7 @@ XS(_wrap_layerObj_tolerance_get) {
 
 XS(_wrap_layerObj_toleranceunits_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22635,9 +22652,9 @@ XS(_wrap_layerObj_toleranceunits_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_toleranceunits_set" "', argument " "2"" of type '" "int""'");
@@ -22658,7 +22675,7 @@ XS(_wrap_layerObj_toleranceunits_set) {
 
 XS(_wrap_layerObj_toleranceunits_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22670,9 +22687,9 @@ XS(_wrap_layerObj_toleranceunits_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->toleranceunits);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -22686,7 +22703,7 @@ XS(_wrap_layerObj_toleranceunits_get) {
 
 XS(_wrap_layerObj_symbolscaledenom_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22700,9 +22717,9 @@ XS(_wrap_layerObj_symbolscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_symbolscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22723,7 +22740,7 @@ XS(_wrap_layerObj_symbolscaledenom_set) {
 
 XS(_wrap_layerObj_symbolscaledenom_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22735,9 +22752,9 @@ XS(_wrap_layerObj_symbolscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->symbolscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -22751,7 +22768,7 @@ XS(_wrap_layerObj_symbolscaledenom_get) {
 
 XS(_wrap_layerObj_minscaledenom_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22765,9 +22782,9 @@ XS(_wrap_layerObj_minscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_minscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22788,7 +22805,7 @@ XS(_wrap_layerObj_minscaledenom_set) {
 
 XS(_wrap_layerObj_minscaledenom_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22800,9 +22817,9 @@ XS(_wrap_layerObj_minscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->minscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -22816,7 +22833,7 @@ XS(_wrap_layerObj_minscaledenom_get) {
 
 XS(_wrap_layerObj_maxscaledenom_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22830,9 +22847,9 @@ XS(_wrap_layerObj_maxscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22853,7 +22870,7 @@ XS(_wrap_layerObj_maxscaledenom_set) {
 
 XS(_wrap_layerObj_maxscaledenom_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22865,9 +22882,9 @@ XS(_wrap_layerObj_maxscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->maxscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -22881,7 +22898,7 @@ XS(_wrap_layerObj_maxscaledenom_get) {
 
 XS(_wrap_layerObj_minfeaturesize_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22895,9 +22912,9 @@ XS(_wrap_layerObj_minfeaturesize_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_minfeaturesize_set" "', argument " "2"" of type '" "int""'");
@@ -22918,7 +22935,7 @@ XS(_wrap_layerObj_minfeaturesize_set) {
 
 XS(_wrap_layerObj_minfeaturesize_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22930,9 +22947,9 @@ XS(_wrap_layerObj_minfeaturesize_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->minfeaturesize);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -22946,7 +22963,7 @@ XS(_wrap_layerObj_minfeaturesize_get) {
 
 XS(_wrap_layerObj_labelminscaledenom_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -22960,9 +22977,9 @@ XS(_wrap_layerObj_labelminscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelminscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22983,7 +23000,7 @@ XS(_wrap_layerObj_labelminscaledenom_set) {
 
 XS(_wrap_layerObj_labelminscaledenom_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -22995,9 +23012,9 @@ XS(_wrap_layerObj_labelminscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->labelminscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -23011,7 +23028,7 @@ XS(_wrap_layerObj_labelminscaledenom_get) {
 
 XS(_wrap_layerObj_labelmaxscaledenom_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23025,9 +23042,9 @@ XS(_wrap_layerObj_labelmaxscaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -23048,7 +23065,7 @@ XS(_wrap_layerObj_labelmaxscaledenom_set) {
 
 XS(_wrap_layerObj_labelmaxscaledenom_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23060,9 +23077,9 @@ XS(_wrap_layerObj_labelmaxscaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->labelmaxscaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -23076,7 +23093,7 @@ XS(_wrap_layerObj_labelmaxscaledenom_get) {
 
 XS(_wrap_layerObj_mingeowidth_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23090,9 +23107,9 @@ XS(_wrap_layerObj_mingeowidth_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_mingeowidth_set" "', argument " "2"" of type '" "double""'");
@@ -23113,7 +23130,7 @@ XS(_wrap_layerObj_mingeowidth_set) {
 
 XS(_wrap_layerObj_mingeowidth_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23125,9 +23142,9 @@ XS(_wrap_layerObj_mingeowidth_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->mingeowidth);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -23141,7 +23158,7 @@ XS(_wrap_layerObj_mingeowidth_get) {
 
 XS(_wrap_layerObj_maxgeowidth_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23155,9 +23172,9 @@ XS(_wrap_layerObj_maxgeowidth_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxgeowidth_set" "', argument " "2"" of type '" "double""'");
@@ -23178,7 +23195,7 @@ XS(_wrap_layerObj_maxgeowidth_set) {
 
 XS(_wrap_layerObj_maxgeowidth_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23190,9 +23207,9 @@ XS(_wrap_layerObj_maxgeowidth_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (double) ((arg1)->maxgeowidth);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -23206,7 +23223,7 @@ XS(_wrap_layerObj_maxgeowidth_get) {
 
 XS(_wrap_layerObj_sizeunits_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23220,9 +23237,9 @@ XS(_wrap_layerObj_sizeunits_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_sizeunits_set" "', argument " "2"" of type '" "int""'");
@@ -23243,7 +23260,7 @@ XS(_wrap_layerObj_sizeunits_set) {
 
 XS(_wrap_layerObj_sizeunits_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23255,9 +23272,9 @@ XS(_wrap_layerObj_sizeunits_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->sizeunits);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23271,7 +23288,7 @@ XS(_wrap_layerObj_sizeunits_get) {
 
 XS(_wrap_layerObj_maxfeatures_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23285,9 +23302,9 @@ XS(_wrap_layerObj_maxfeatures_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxfeatures_set" "', argument " "2"" of type '" "int""'");
@@ -23308,7 +23325,7 @@ XS(_wrap_layerObj_maxfeatures_set) {
 
 XS(_wrap_layerObj_maxfeatures_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23320,9 +23337,9 @@ XS(_wrap_layerObj_maxfeatures_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->maxfeatures);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23336,7 +23353,7 @@ XS(_wrap_layerObj_maxfeatures_get) {
 
 XS(_wrap_layerObj_startindex_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23350,9 +23367,9 @@ XS(_wrap_layerObj_startindex_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_startindex_set" "', argument " "2"" of type '" "int""'");
@@ -23373,7 +23390,7 @@ XS(_wrap_layerObj_startindex_set) {
 
 XS(_wrap_layerObj_startindex_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23385,9 +23402,9 @@ XS(_wrap_layerObj_startindex_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->startindex);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23401,7 +23418,7 @@ XS(_wrap_layerObj_startindex_get) {
 
 XS(_wrap_layerObj_offsite_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     colorObj *arg2 = (colorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23415,9 +23432,9 @@ XS(_wrap_layerObj_offsite_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_colorObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_offsite_set" "', argument " "2"" of type '" "colorObj *""'"); 
@@ -23438,7 +23455,7 @@ XS(_wrap_layerObj_offsite_set) {
 
 XS(_wrap_layerObj_offsite_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23450,9 +23467,9 @@ XS(_wrap_layerObj_offsite_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (colorObj *)& ((arg1)->offsite);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_colorObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -23466,7 +23483,7 @@ XS(_wrap_layerObj_offsite_get) {
 
 XS(_wrap_layerObj_transform_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23480,9 +23497,9 @@ XS(_wrap_layerObj_transform_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_transform_set" "', argument " "2"" of type '" "int""'");
@@ -23503,7 +23520,7 @@ XS(_wrap_layerObj_transform_set) {
 
 XS(_wrap_layerObj_transform_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23515,9 +23532,9 @@ XS(_wrap_layerObj_transform_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->transform);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23531,7 +23548,7 @@ XS(_wrap_layerObj_transform_get) {
 
 XS(_wrap_layerObj_labelcache_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23545,9 +23562,9 @@ XS(_wrap_layerObj_labelcache_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelcache_set" "', argument " "2"" of type '" "int""'");
@@ -23568,7 +23585,7 @@ XS(_wrap_layerObj_labelcache_set) {
 
 XS(_wrap_layerObj_labelcache_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23580,9 +23597,9 @@ XS(_wrap_layerObj_labelcache_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->labelcache);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23596,7 +23613,7 @@ XS(_wrap_layerObj_labelcache_get) {
 
 XS(_wrap_layerObj_postlabelcache_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23610,9 +23627,9 @@ XS(_wrap_layerObj_postlabelcache_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_postlabelcache_set" "', argument " "2"" of type '" "int""'");
@@ -23633,7 +23650,7 @@ XS(_wrap_layerObj_postlabelcache_set) {
 
 XS(_wrap_layerObj_postlabelcache_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23645,9 +23662,9 @@ XS(_wrap_layerObj_postlabelcache_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->postlabelcache);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23661,7 +23678,7 @@ XS(_wrap_layerObj_postlabelcache_get) {
 
 XS(_wrap_layerObj_labelitem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23676,9 +23693,9 @@ XS(_wrap_layerObj_labelitem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_labelitem_set" "', argument " "2"" of type '" "char *""'");
@@ -23707,7 +23724,7 @@ XS(_wrap_layerObj_labelitem_set) {
 
 XS(_wrap_layerObj_labelitem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23719,9 +23736,9 @@ XS(_wrap_layerObj_labelitem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->labelitem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -23735,7 +23752,7 @@ XS(_wrap_layerObj_labelitem_get) {
 
 XS(_wrap_layerObj_tileitem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23750,9 +23767,9 @@ XS(_wrap_layerObj_tileitem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_tileitem_set" "', argument " "2"" of type '" "char *""'");
@@ -23781,7 +23798,7 @@ XS(_wrap_layerObj_tileitem_set) {
 
 XS(_wrap_layerObj_tileitem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23793,9 +23810,9 @@ XS(_wrap_layerObj_tileitem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->tileitem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -23809,7 +23826,7 @@ XS(_wrap_layerObj_tileitem_get) {
 
 XS(_wrap_layerObj_tileindex_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23824,9 +23841,9 @@ XS(_wrap_layerObj_tileindex_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_tileindex_set" "', argument " "2"" of type '" "char *""'");
@@ -23855,7 +23872,7 @@ XS(_wrap_layerObj_tileindex_set) {
 
 XS(_wrap_layerObj_tileindex_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23867,9 +23884,9 @@ XS(_wrap_layerObj_tileindex_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->tileindex);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -23883,7 +23900,7 @@ XS(_wrap_layerObj_tileindex_get) {
 
 XS(_wrap_layerObj_units_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23897,9 +23914,9 @@ XS(_wrap_layerObj_units_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_units_set" "', argument " "2"" of type '" "int""'");
@@ -23920,7 +23937,7 @@ XS(_wrap_layerObj_units_set) {
 
 XS(_wrap_layerObj_units_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -23932,9 +23949,9 @@ XS(_wrap_layerObj_units_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->units);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -23948,7 +23965,7 @@ XS(_wrap_layerObj_units_get) {
 
 XS(_wrap_layerObj_connection_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -23963,9 +23980,9 @@ XS(_wrap_layerObj_connection_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_connection_set" "', argument " "2"" of type '" "char *""'");
@@ -23994,7 +24011,7 @@ XS(_wrap_layerObj_connection_set) {
 
 XS(_wrap_layerObj_connection_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24006,9 +24023,9 @@ XS(_wrap_layerObj_connection_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->connection);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24022,7 +24039,7 @@ XS(_wrap_layerObj_connection_get) {
 
 XS(_wrap_layerObj_plugin_library_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24037,9 +24054,9 @@ XS(_wrap_layerObj_plugin_library_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_plugin_library_set" "', argument " "2"" of type '" "char *""'");
@@ -24068,7 +24085,7 @@ XS(_wrap_layerObj_plugin_library_set) {
 
 XS(_wrap_layerObj_plugin_library_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24080,9 +24097,9 @@ XS(_wrap_layerObj_plugin_library_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->plugin_library);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24096,7 +24113,7 @@ XS(_wrap_layerObj_plugin_library_get) {
 
 XS(_wrap_layerObj_plugin_library_original_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24111,9 +24128,9 @@ XS(_wrap_layerObj_plugin_library_original_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_plugin_library_original_set" "', argument " "2"" of type '" "char *""'");
@@ -24142,7 +24159,7 @@ XS(_wrap_layerObj_plugin_library_original_set) {
 
 XS(_wrap_layerObj_plugin_library_original_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24154,9 +24171,9 @@ XS(_wrap_layerObj_plugin_library_original_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->plugin_library_original);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24170,7 +24187,7 @@ XS(_wrap_layerObj_plugin_library_original_get) {
 
 XS(_wrap_layerObj_connectiontype_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     enum MS_CONNECTION_TYPE arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24184,9 +24201,9 @@ XS(_wrap_layerObj_connectiontype_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_connectiontype_set" "', argument " "2"" of type '" "enum MS_CONNECTION_TYPE""'");
@@ -24207,7 +24224,7 @@ XS(_wrap_layerObj_connectiontype_set) {
 
 XS(_wrap_layerObj_connectiontype_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24219,9 +24236,9 @@ XS(_wrap_layerObj_connectiontype_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (enum MS_CONNECTION_TYPE) ((arg1)->connectiontype);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24235,7 +24252,7 @@ XS(_wrap_layerObj_connectiontype_get) {
 
 XS(_wrap_layerObj_numitems_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24247,9 +24264,9 @@ XS(_wrap_layerObj_numitems_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numitems_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numitems_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->numitems);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24263,7 +24280,7 @@ XS(_wrap_layerObj_numitems_get) {
 
 XS(_wrap_layerObj_bandsitem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24278,9 +24295,9 @@ XS(_wrap_layerObj_bandsitem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_bandsitem_set" "', argument " "2"" of type '" "char *""'");
@@ -24309,7 +24326,7 @@ XS(_wrap_layerObj_bandsitem_set) {
 
 XS(_wrap_layerObj_bandsitem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24321,9 +24338,9 @@ XS(_wrap_layerObj_bandsitem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->bandsitem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24337,7 +24354,7 @@ XS(_wrap_layerObj_bandsitem_get) {
 
 XS(_wrap_layerObj_filteritem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24352,9 +24369,9 @@ XS(_wrap_layerObj_filteritem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_filteritem_set" "', argument " "2"" of type '" "char *""'");
@@ -24383,7 +24400,7 @@ XS(_wrap_layerObj_filteritem_set) {
 
 XS(_wrap_layerObj_filteritem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24395,9 +24412,9 @@ XS(_wrap_layerObj_filteritem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->filteritem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24411,7 +24428,7 @@ XS(_wrap_layerObj_filteritem_get) {
 
 XS(_wrap_layerObj_styleitem_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24426,9 +24443,9 @@ XS(_wrap_layerObj_styleitem_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_styleitem_set" "', argument " "2"" of type '" "char *""'");
@@ -24457,7 +24474,7 @@ XS(_wrap_layerObj_styleitem_set) {
 
 XS(_wrap_layerObj_styleitem_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24469,9 +24486,9 @@ XS(_wrap_layerObj_styleitem_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->styleitem);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24485,7 +24502,7 @@ XS(_wrap_layerObj_styleitem_get) {
 
 XS(_wrap_layerObj_requires_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24500,9 +24517,9 @@ XS(_wrap_layerObj_requires_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_requires_set" "', argument " "2"" of type '" "char *""'");
@@ -24531,7 +24548,7 @@ XS(_wrap_layerObj_requires_set) {
 
 XS(_wrap_layerObj_requires_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24543,9 +24560,9 @@ XS(_wrap_layerObj_requires_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->requires);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24559,7 +24576,7 @@ XS(_wrap_layerObj_requires_get) {
 
 XS(_wrap_layerObj_labelrequires_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24574,9 +24591,9 @@ XS(_wrap_layerObj_labelrequires_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_labelrequires_set" "', argument " "2"" of type '" "char *""'");
@@ -24605,7 +24622,7 @@ XS(_wrap_layerObj_labelrequires_set) {
 
 XS(_wrap_layerObj_labelrequires_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24617,9 +24634,9 @@ XS(_wrap_layerObj_labelrequires_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->labelrequires);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -24633,7 +24650,7 @@ XS(_wrap_layerObj_labelrequires_get) {
 
 XS(_wrap_layerObj_metadata_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24645,9 +24662,9 @@ XS(_wrap_layerObj_metadata_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_metadata_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_metadata_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->metadata);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -24661,7 +24678,7 @@ XS(_wrap_layerObj_metadata_get) {
 
 XS(_wrap_layerObj_validation_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24673,9 +24690,9 @@ XS(_wrap_layerObj_validation_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_validation_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_validation_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->validation);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -24689,7 +24706,7 @@ XS(_wrap_layerObj_validation_get) {
 
 XS(_wrap_layerObj_bindvals_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24701,9 +24718,9 @@ XS(_wrap_layerObj_bindvals_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bindvals_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bindvals_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->bindvals);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -24717,7 +24734,7 @@ XS(_wrap_layerObj_bindvals_get) {
 
 XS(_wrap_layerObj_cluster_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24729,9 +24746,9 @@ XS(_wrap_layerObj_cluster_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_cluster_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_cluster_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (clusterObj *)& ((arg1)->cluster);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_clusterObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -24745,7 +24762,7 @@ XS(_wrap_layerObj_cluster_get) {
 
 XS(_wrap_layerObj_opacity_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24759,9 +24776,9 @@ XS(_wrap_layerObj_opacity_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_opacity_set" "', argument " "2"" of type '" "int""'");
@@ -24782,7 +24799,7 @@ XS(_wrap_layerObj_opacity_set) {
 
 XS(_wrap_layerObj_opacity_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24794,9 +24811,9 @@ XS(_wrap_layerObj_opacity_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->opacity);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24810,7 +24827,7 @@ XS(_wrap_layerObj_opacity_get) {
 
 XS(_wrap_layerObj_dump_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24824,9 +24841,9 @@ XS(_wrap_layerObj_dump_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_dump_set" "', argument " "2"" of type '" "int""'");
@@ -24847,7 +24864,7 @@ XS(_wrap_layerObj_dump_set) {
 
 XS(_wrap_layerObj_dump_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24859,9 +24876,9 @@ XS(_wrap_layerObj_dump_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->dump);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24875,7 +24892,7 @@ XS(_wrap_layerObj_dump_get) {
 
 XS(_wrap_layerObj_debug_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -24889,9 +24906,9 @@ XS(_wrap_layerObj_debug_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -24912,7 +24929,7 @@ XS(_wrap_layerObj_debug_set) {
 
 XS(_wrap_layerObj_debug_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24924,9 +24941,9 @@ XS(_wrap_layerObj_debug_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->debug);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24940,7 +24957,7 @@ XS(_wrap_layerObj_debug_get) {
 
 XS(_wrap_layerObj_extent_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24952,9 +24969,9 @@ XS(_wrap_layerObj_extent_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_extent_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_extent_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (rectObj *)& ((arg1)->extent);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -24968,7 +24985,7 @@ XS(_wrap_layerObj_extent_get) {
 
 XS(_wrap_layerObj_numprocessing_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -24980,9 +24997,9 @@ XS(_wrap_layerObj_numprocessing_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numprocessing_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numprocessing_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->numprocessing);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -24996,7 +25013,7 @@ XS(_wrap_layerObj_numprocessing_get) {
 
 XS(_wrap_layerObj_numjoins_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25008,9 +25025,9 @@ XS(_wrap_layerObj_numjoins_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numjoins_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numjoins_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int) ((arg1)->numjoins);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -25024,7 +25041,7 @@ XS(_wrap_layerObj_numjoins_get) {
 
 XS(_wrap_layerObj_classgroup_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25039,9 +25056,9 @@ XS(_wrap_layerObj_classgroup_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_classgroup_set" "', argument " "2"" of type '" "char *""'");
@@ -25070,7 +25087,7 @@ XS(_wrap_layerObj_classgroup_set) {
 
 XS(_wrap_layerObj_classgroup_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25082,9 +25099,9 @@ XS(_wrap_layerObj_classgroup_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->classgroup);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -25098,7 +25115,7 @@ XS(_wrap_layerObj_classgroup_get) {
 
 XS(_wrap_layerObj_mask_set) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25113,9 +25130,9 @@ XS(_wrap_layerObj_mask_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_set" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_mask_set" "', argument " "2"" of type '" "char *""'");
@@ -25144,7 +25161,7 @@ XS(_wrap_layerObj_mask_set) {
 
 XS(_wrap_layerObj_mask_get) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25156,9 +25173,9 @@ XS(_wrap_layerObj_mask_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_get" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *) ((arg1)->mask);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -25176,7 +25193,7 @@ XS(_wrap_new_layerObj) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
-    layerObj *result = 0 ;
+    struct layerObj *result = 0 ;
     dXSARGS;
     
     if ((items < 0) || (items > 1)) {
@@ -25189,7 +25206,7 @@ XS(_wrap_new_layerObj) {
       }
       arg1 = (mapObj *)(argp1);
     }
-    result = (layerObj *)new_layerObj(arg1);
+    result = (struct layerObj *)new_layerObj(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_layerObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
     XSRETURN(argvi);
@@ -25202,7 +25219,7 @@ XS(_wrap_new_layerObj) {
 
 XS(_wrap_delete_layerObj) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25213,9 +25230,9 @@ XS(_wrap_delete_layerObj) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_layerObj" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_layerObj" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     delete_layerObj(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -25229,7 +25246,7 @@ XS(_wrap_delete_layerObj) {
 
 XS(_wrap_layerObj_clone) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25241,9 +25258,9 @@ XS(_wrap_layerObj_clone) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clone" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clone" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (layerObj *)layerObj_clone(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_layerObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -25257,7 +25274,7 @@ XS(_wrap_layerObj_clone) {
 
 XS(_wrap_layerObj_updateFromString) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25273,9 +25290,9 @@ XS(_wrap_layerObj_updateFromString) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_updateFromString" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_updateFromString" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_updateFromString" "', argument " "2"" of type '" "char *""'");
@@ -25296,7 +25313,7 @@ XS(_wrap_layerObj_updateFromString) {
 
 XS(_wrap_layerObj_insertClass) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     classObj *arg2 = (classObj *) 0 ;
     int arg3 = (int) -1 ;
     void *argp1 = 0 ;
@@ -25314,9 +25331,9 @@ XS(_wrap_layerObj_insertClass) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_insertClass" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_insertClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_classObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_insertClass" "', argument " "2"" of type '" "classObj *""'"); 
@@ -25346,7 +25363,7 @@ XS(_wrap_layerObj_insertClass) {
 
 XS(_wrap_layerObj_removeClass) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25361,9 +25378,9 @@ XS(_wrap_layerObj_removeClass) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeClass" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_removeClass" "', argument " "2"" of type '" "int""'");
@@ -25384,7 +25401,7 @@ XS(_wrap_layerObj_removeClass) {
 
 XS(_wrap_layerObj_open) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25396,9 +25413,9 @@ XS(_wrap_layerObj_open) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_open" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_open" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int)layerObj_open(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -25412,7 +25429,7 @@ XS(_wrap_layerObj_open) {
 
 XS(_wrap_layerObj_whichShapes) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     rectObj arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25427,9 +25444,9 @@ XS(_wrap_layerObj_whichShapes) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_whichShapes" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_whichShapes" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     {
       res2 = SWIG_ConvertPtr(ST(1), &argp2, SWIGTYPE_p_rectObj,  0 );
       if (!SWIG_IsOK(res2)) {
@@ -25454,7 +25471,7 @@ XS(_wrap_layerObj_whichShapes) {
 
 XS(_wrap_layerObj_nextShape) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25466,9 +25483,9 @@ XS(_wrap_layerObj_nextShape) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_nextShape" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_nextShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (shapeObj *)layerObj_nextShape(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_shapeObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -25482,7 +25499,7 @@ XS(_wrap_layerObj_nextShape) {
 
 XS(_wrap_layerObj_close) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25493,9 +25510,9 @@ XS(_wrap_layerObj_close) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_close" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_close" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     layerObj_close(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -25509,7 +25526,7 @@ XS(_wrap_layerObj_close) {
 
 XS(_wrap_layerObj_getShape) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     resultObj *arg2 = (resultObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25524,9 +25541,9 @@ XS(_wrap_layerObj_getShape) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getShape" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_resultObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getShape" "', argument " "2"" of type '" "resultObj *""'"); 
@@ -25547,7 +25564,7 @@ XS(_wrap_layerObj_getShape) {
 
 XS(_wrap_layerObj_getNumResults) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25559,9 +25576,9 @@ XS(_wrap_layerObj_getNumResults) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumResults" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumResults" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int)layerObj_getNumResults(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -25575,7 +25592,7 @@ XS(_wrap_layerObj_getNumResults) {
 
 XS(_wrap_layerObj_getResultsBounds) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -25587,9 +25604,9 @@ XS(_wrap_layerObj_getResultsBounds) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResultsBounds" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResultsBounds" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (rectObj *)layerObj_getResultsBounds(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -25603,7 +25620,7 @@ XS(_wrap_layerObj_getResultsBounds) {
 
 XS(_wrap_layerObj_getResult) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25618,9 +25635,9 @@ XS(_wrap_layerObj_getResult) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResult" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResult" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getResult" "', argument " "2"" of type '" "int""'");
@@ -25641,7 +25658,7 @@ XS(_wrap_layerObj_getResult) {
 
 XS(_wrap_layerObj_getClass) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25656,9 +25673,9 @@ XS(_wrap_layerObj_getClass) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClass" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getClass" "', argument " "2"" of type '" "int""'");
@@ -25679,7 +25696,7 @@ XS(_wrap_layerObj_getClass) {
 
 XS(_wrap_layerObj_getItem) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -25694,9 +25711,9 @@ XS(_wrap_layerObj_getItem) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getItem" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getItem" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getItem" "', argument " "2"" of type '" "int""'");
@@ -25717,7 +25734,7 @@ XS(_wrap_layerObj_getItem) {
 
 XS(_wrap_layerObj_setItems) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char **arg2 = (char **) 0 ;
     int arg3 ;
     void *argp1 = 0 ;
@@ -25735,9 +25752,9 @@ XS(_wrap_layerObj_setItems) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setItems" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setItems" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setItems" "', argument " "2"" of type '" "char **""'"); 
@@ -25765,7 +25782,7 @@ XS(_wrap_layerObj_setItems) {
 
 XS(_wrap_layerObj_draw) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     imageObj *arg3 = (imageObj *) 0 ;
     void *argp1 = 0 ;
@@ -25783,9 +25800,9 @@ XS(_wrap_layerObj_draw) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_draw" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_draw" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_draw" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25813,7 +25830,7 @@ XS(_wrap_layerObj_draw) {
 
 XS(_wrap_layerObj_drawQuery) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     imageObj *arg3 = (imageObj *) 0 ;
     void *argp1 = 0 ;
@@ -25831,9 +25848,9 @@ XS(_wrap_layerObj_drawQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_drawQuery" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_drawQuery" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_drawQuery" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25861,7 +25878,7 @@ XS(_wrap_layerObj_drawQuery) {
 
 XS(_wrap_layerObj_queryByFilter) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -25880,9 +25897,9 @@ XS(_wrap_layerObj_queryByFilter) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFilter" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFilter" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByFilter" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25910,7 +25927,7 @@ XS(_wrap_layerObj_queryByFilter) {
 
 XS(_wrap_layerObj_queryByAttributes) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     char *arg3 = (char *) 0 ;
     char *arg4 = (char *) 0 ;
@@ -25936,9 +25953,9 @@ XS(_wrap_layerObj_queryByAttributes) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByAttributes" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByAttributes" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByAttributes" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25980,7 +25997,7 @@ XS(_wrap_layerObj_queryByAttributes) {
 
 XS(_wrap_layerObj_queryByPoint) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     pointObj *arg3 = (pointObj *) 0 ;
     int arg4 ;
@@ -26004,9 +26021,9 @@ XS(_wrap_layerObj_queryByPoint) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByPoint" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByPoint" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByPoint" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26048,7 +26065,7 @@ XS(_wrap_layerObj_queryByPoint) {
 
 XS(_wrap_layerObj_queryByRect) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     rectObj arg3 ;
     void *argp1 = 0 ;
@@ -26066,9 +26083,9 @@ XS(_wrap_layerObj_queryByRect) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByRect" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByRect" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByRect" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26100,7 +26117,7 @@ XS(_wrap_layerObj_queryByRect) {
 
 XS(_wrap_layerObj_queryByFeatures) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     int arg3 ;
     void *argp1 = 0 ;
@@ -26118,9 +26135,9 @@ XS(_wrap_layerObj_queryByFeatures) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFeatures" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFeatures" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByFeatures" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26148,7 +26165,7 @@ XS(_wrap_layerObj_queryByFeatures) {
 
 XS(_wrap_layerObj_queryByShape) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     shapeObj *arg3 = (shapeObj *) 0 ;
     void *argp1 = 0 ;
@@ -26166,9 +26183,9 @@ XS(_wrap_layerObj_queryByShape) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByShape" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByShape" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26196,7 +26213,7 @@ XS(_wrap_layerObj_queryByShape) {
 
 XS(_wrap_layerObj_queryByIndex) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     int arg3 ;
     int arg4 ;
@@ -26220,9 +26237,9 @@ XS(_wrap_layerObj_queryByIndex) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByIndex" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByIndex" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByIndex" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26266,7 +26283,7 @@ XS(_wrap_layerObj_queryByIndex) {
 
 XS(_wrap_layerObj_getResults) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26278,9 +26295,9 @@ XS(_wrap_layerObj_getResults) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResults" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResults" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (resultCacheObj *)layerObj_getResults(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_resultCacheObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -26294,7 +26311,7 @@ XS(_wrap_layerObj_getResults) {
 
 XS(_wrap_layerObj_setFilter) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26310,9 +26327,9 @@ XS(_wrap_layerObj_setFilter) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setFilter" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setFilter" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setFilter" "', argument " "2"" of type '" "char *""'");
@@ -26333,7 +26350,7 @@ XS(_wrap_layerObj_setFilter) {
 
 XS(_wrap_layerObj_getFilterString) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26345,9 +26362,9 @@ XS(_wrap_layerObj_getFilterString) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFilterString" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFilterString" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *)layerObj_getFilterString(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -26362,7 +26379,7 @@ XS(_wrap_layerObj_getFilterString) {
 
 XS(_wrap_layerObj_setWKTProjection) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26378,9 +26395,9 @@ XS(_wrap_layerObj_setWKTProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setWKTProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setWKTProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setWKTProjection" "', argument " "2"" of type '" "char *""'");
@@ -26401,7 +26418,7 @@ XS(_wrap_layerObj_setWKTProjection) {
 
 XS(_wrap_layerObj_getProjection) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26413,9 +26430,9 @@ XS(_wrap_layerObj_getProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *)layerObj_getProjection(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -26430,7 +26447,7 @@ XS(_wrap_layerObj_getProjection) {
 
 XS(_wrap_layerObj_setProjection) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26446,9 +26463,9 @@ XS(_wrap_layerObj_setProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setProjection" "', argument " "2"" of type '" "char *""'");
@@ -26469,7 +26486,7 @@ XS(_wrap_layerObj_setProjection) {
 
 XS(_wrap_layerObj_addFeature) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     shapeObj *arg2 = (shapeObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26484,9 +26501,9 @@ XS(_wrap_layerObj_addFeature) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addFeature" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addFeature" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_shapeObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_addFeature" "', argument " "2"" of type '" "shapeObj *""'"); 
@@ -26507,7 +26524,7 @@ XS(_wrap_layerObj_addFeature) {
 
 XS(_wrap_layerObj_getNumFeatures) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26519,9 +26536,9 @@ XS(_wrap_layerObj_getNumFeatures) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumFeatures" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumFeatures" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int)layerObj_getNumFeatures(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -26535,7 +26552,7 @@ XS(_wrap_layerObj_getNumFeatures) {
 
 XS(_wrap_layerObj_getExtent) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26547,9 +26564,9 @@ XS(_wrap_layerObj_getExtent) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getExtent" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getExtent" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (rectObj *)layerObj_getExtent(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -26563,7 +26580,7 @@ XS(_wrap_layerObj_getExtent) {
 
 XS(_wrap_layerObj_setExtent) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     double arg2 = (double) -1.0 ;
     double arg3 = (double) -1.0 ;
     double arg4 = (double) -1.0 ;
@@ -26587,9 +26604,9 @@ XS(_wrap_layerObj_setExtent) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setExtent" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setExtent" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     if (items > 1) {
       ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
       if (!SWIG_IsOK(ecode2)) {
@@ -26639,7 +26656,7 @@ XS(_wrap_layerObj_setExtent) {
 
 XS(_wrap_layerObj_getMetaData) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26655,9 +26672,9 @@ XS(_wrap_layerObj_getMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getMetaData" "', argument " "2"" of type '" "char *""'");
@@ -26678,7 +26695,7 @@ XS(_wrap_layerObj_getMetaData) {
 
 XS(_wrap_layerObj_setMetaData) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -26698,9 +26715,9 @@ XS(_wrap_layerObj_setMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setMetaData" "', argument " "2"" of type '" "char *""'");
@@ -26728,7 +26745,7 @@ XS(_wrap_layerObj_setMetaData) {
 
 XS(_wrap_layerObj_removeMetaData) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26744,9 +26761,9 @@ XS(_wrap_layerObj_removeMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_removeMetaData" "', argument " "2"" of type '" "char *""'");
@@ -26767,7 +26784,7 @@ XS(_wrap_layerObj_removeMetaData) {
 
 XS(_wrap_layerObj_getFirstMetaDataKey) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -26779,9 +26796,9 @@ XS(_wrap_layerObj_getFirstMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFirstMetaDataKey" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *)layerObj_getFirstMetaDataKey(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -26795,7 +26812,7 @@ XS(_wrap_layerObj_getFirstMetaDataKey) {
 
 XS(_wrap_layerObj_getNextMetaDataKey) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26811,9 +26828,9 @@ XS(_wrap_layerObj_getNextMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNextMetaDataKey" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getNextMetaDataKey" "', argument " "2"" of type '" "char *""'");
@@ -26834,7 +26851,7 @@ XS(_wrap_layerObj_getNextMetaDataKey) {
 
 XS(_wrap_layerObj_getWMSFeatureInfoURL) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     int arg3 ;
     int arg4 ;
@@ -26862,9 +26879,9 @@ XS(_wrap_layerObj_getWMSFeatureInfoURL) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26914,7 +26931,7 @@ XS(_wrap_layerObj_getWMSFeatureInfoURL) {
 
 XS(_wrap_layerObj_executeWFSGetFeature) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     layerObj *arg2 = (layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -26929,9 +26946,9 @@ XS(_wrap_layerObj_executeWFSGetFeature) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_executeWFSGetFeature" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_executeWFSGetFeature" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_executeWFSGetFeature" "', argument " "2"" of type '" "layerObj *""'"); 
@@ -26953,7 +26970,7 @@ XS(_wrap_layerObj_executeWFSGetFeature) {
 
 XS(_wrap_layerObj_applySLD) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -26973,9 +26990,9 @@ XS(_wrap_layerObj_applySLD) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLD" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLD" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_applySLD" "', argument " "2"" of type '" "char *""'");
@@ -27003,7 +27020,7 @@ XS(_wrap_layerObj_applySLD) {
 
 XS(_wrap_layerObj_applySLDURL) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -27023,9 +27040,9 @@ XS(_wrap_layerObj_applySLDURL) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLDURL" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLDURL" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_applySLDURL" "', argument " "2"" of type '" "char *""'");
@@ -27053,7 +27070,7 @@ XS(_wrap_layerObj_applySLDURL) {
 
 XS(_wrap_layerObj_generateSLD) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27065,9 +27082,9 @@ XS(_wrap_layerObj_generateSLD) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_generateSLD" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_generateSLD" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (char *)layerObj_generateSLD(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -27082,7 +27099,7 @@ XS(_wrap_layerObj_generateSLD) {
 
 XS(_wrap_layerObj_isVisible) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27094,9 +27111,9 @@ XS(_wrap_layerObj_isVisible) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_isVisible" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_isVisible" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int)layerObj_isVisible(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27110,7 +27127,7 @@ XS(_wrap_layerObj_isVisible) {
 
 XS(_wrap_layerObj_moveClassUp) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27125,9 +27142,9 @@ XS(_wrap_layerObj_moveClassUp) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassUp" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassUp" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_moveClassUp" "', argument " "2"" of type '" "int""'");
@@ -27148,7 +27165,7 @@ XS(_wrap_layerObj_moveClassUp) {
 
 XS(_wrap_layerObj_moveClassDown) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27163,9 +27180,9 @@ XS(_wrap_layerObj_moveClassDown) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassDown" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassDown" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_moveClassDown" "', argument " "2"" of type '" "int""'");
@@ -27186,7 +27203,7 @@ XS(_wrap_layerObj_moveClassDown) {
 
 XS(_wrap_layerObj_setProcessingKey) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -27205,9 +27222,9 @@ XS(_wrap_layerObj_setProcessingKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessingKey" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessingKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setProcessingKey" "', argument " "2"" of type '" "char const *""'");
@@ -27235,7 +27252,7 @@ XS(_wrap_layerObj_setProcessingKey) {
 
 XS(_wrap_layerObj_setProcessing) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27250,9 +27267,9 @@ XS(_wrap_layerObj_setProcessing) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setProcessing" "', argument " "2"" of type '" "char const *""'");
@@ -27273,7 +27290,7 @@ XS(_wrap_layerObj_setProcessing) {
 
 XS(_wrap_layerObj_addProcessing) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27288,9 +27305,9 @@ XS(_wrap_layerObj_addProcessing) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_addProcessing" "', argument " "2"" of type '" "char const *""'");
@@ -27311,7 +27328,7 @@ XS(_wrap_layerObj_addProcessing) {
 
 XS(_wrap_layerObj_getProcessing) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27326,9 +27343,9 @@ XS(_wrap_layerObj_getProcessing) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getProcessing" "', argument " "2"" of type '" "int""'");
@@ -27349,7 +27366,7 @@ XS(_wrap_layerObj_getProcessing) {
 
 XS(_wrap_layerObj_getProcessingKey) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27365,9 +27382,9 @@ XS(_wrap_layerObj_getProcessingKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessingKey" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessingKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getProcessingKey" "', argument " "2"" of type '" "char const *""'");
@@ -27388,7 +27405,7 @@ XS(_wrap_layerObj_getProcessingKey) {
 
 XS(_wrap_layerObj_clearProcessing) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27400,9 +27417,9 @@ XS(_wrap_layerObj_clearProcessing) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clearProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clearProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     result = (int)layerObj_clearProcessing(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27416,7 +27433,7 @@ XS(_wrap_layerObj_clearProcessing) {
 
 XS(_wrap_layerObj_setConnectionType) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     int arg2 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -27435,9 +27452,9 @@ XS(_wrap_layerObj_setConnectionType) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setConnectionType" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setConnectionType" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_setConnectionType" "', argument " "2"" of type '" "int""'");
@@ -27465,7 +27482,7 @@ XS(_wrap_layerObj_setConnectionType) {
 
 XS(_wrap_layerObj_getClassIndex) {
   {
-    layerObj *arg1 = (layerObj *) 0 ;
+    struct layerObj *arg1 = (struct layerObj *) 0 ;
     mapObj *arg2 = (mapObj *) 0 ;
     shapeObj *arg3 = (shapeObj *) 0 ;
     int *arg4 = (int *) NULL ;
@@ -27489,9 +27506,9 @@ XS(_wrap_layerObj_getClassIndex) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClassIndex" "', argument " "1"" of type '" "layerObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClassIndex" "', argument " "1"" of type '" "struct layerObj *""'"); 
     }
-    arg1 = (layerObj *)(argp1);
+    arg1 = (struct layerObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getClassIndex" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -27537,7 +27554,7 @@ XS(_wrap_layerObj_getClassIndex) {
 
 XS(_wrap_mapObj_name_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27552,9 +27569,9 @@ XS(_wrap_mapObj_name_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_name_set" "', argument " "2"" of type '" "char *""'");
@@ -27583,7 +27600,7 @@ XS(_wrap_mapObj_name_set) {
 
 XS(_wrap_mapObj_name_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27595,9 +27612,9 @@ XS(_wrap_mapObj_name_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->name);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -27611,7 +27628,7 @@ XS(_wrap_mapObj_name_get) {
 
 XS(_wrap_mapObj_status_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27625,9 +27642,9 @@ XS(_wrap_mapObj_status_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -27648,7 +27665,7 @@ XS(_wrap_mapObj_status_set) {
 
 XS(_wrap_mapObj_status_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27660,9 +27677,9 @@ XS(_wrap_mapObj_status_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->status);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27676,7 +27693,7 @@ XS(_wrap_mapObj_status_get) {
 
 XS(_wrap_mapObj_height_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27690,9 +27707,9 @@ XS(_wrap_mapObj_height_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_height_set" "', argument " "2"" of type '" "int""'");
@@ -27713,7 +27730,7 @@ XS(_wrap_mapObj_height_set) {
 
 XS(_wrap_mapObj_height_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27725,9 +27742,9 @@ XS(_wrap_mapObj_height_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->height);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27741,7 +27758,7 @@ XS(_wrap_mapObj_height_get) {
 
 XS(_wrap_mapObj_width_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27755,9 +27772,9 @@ XS(_wrap_mapObj_width_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_width_set" "', argument " "2"" of type '" "int""'");
@@ -27778,7 +27795,7 @@ XS(_wrap_mapObj_width_set) {
 
 XS(_wrap_mapObj_width_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27790,9 +27807,9 @@ XS(_wrap_mapObj_width_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->width);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27806,7 +27823,7 @@ XS(_wrap_mapObj_width_get) {
 
 XS(_wrap_mapObj_maxsize_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -27820,9 +27837,9 @@ XS(_wrap_mapObj_maxsize_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_maxsize_set" "', argument " "2"" of type '" "int""'");
@@ -27843,7 +27860,7 @@ XS(_wrap_mapObj_maxsize_set) {
 
 XS(_wrap_mapObj_maxsize_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27855,9 +27872,9 @@ XS(_wrap_mapObj_maxsize_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->maxsize);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27871,7 +27888,7 @@ XS(_wrap_mapObj_maxsize_get) {
 
 XS(_wrap_mapObj_refcount_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27883,9 +27900,9 @@ XS(_wrap_mapObj_refcount_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_refcount_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_refcount_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->refcount);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27899,7 +27916,7 @@ XS(_wrap_mapObj_refcount_get) {
 
 XS(_wrap_mapObj_numlayers_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27911,9 +27928,9 @@ XS(_wrap_mapObj_numlayers_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numlayers_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numlayers_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->numlayers);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27927,7 +27944,7 @@ XS(_wrap_mapObj_numlayers_get) {
 
 XS(_wrap_mapObj_maxlayers_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27939,9 +27956,9 @@ XS(_wrap_mapObj_maxlayers_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxlayers_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxlayers_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->maxlayers);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -27955,7 +27972,7 @@ XS(_wrap_mapObj_maxlayers_get) {
 
 XS(_wrap_mapObj_symbolset_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27967,9 +27984,9 @@ XS(_wrap_mapObj_symbolset_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_symbolset_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_symbolset_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (symbolSetObj *)& ((arg1)->symbolset);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_symbolSetObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -27983,7 +28000,7 @@ XS(_wrap_mapObj_symbolset_get) {
 
 XS(_wrap_mapObj_fontset_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -27995,9 +28012,9 @@ XS(_wrap_mapObj_fontset_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_fontset_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_fontset_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (fontSetObj *)& ((arg1)->fontset);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fontSetObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28011,7 +28028,7 @@ XS(_wrap_mapObj_fontset_get) {
 
 XS(_wrap_mapObj_labelcache_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28023,9 +28040,9 @@ XS(_wrap_mapObj_labelcache_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_labelcache_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_labelcache_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (labelCacheObj *)& ((arg1)->labelcache);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_labelCacheObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28039,7 +28056,7 @@ XS(_wrap_mapObj_labelcache_get) {
 
 XS(_wrap_mapObj_transparent_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28053,9 +28070,9 @@ XS(_wrap_mapObj_transparent_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_transparent_set" "', argument " "2"" of type '" "int""'");
@@ -28076,7 +28093,7 @@ XS(_wrap_mapObj_transparent_set) {
 
 XS(_wrap_mapObj_transparent_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28088,9 +28105,9 @@ XS(_wrap_mapObj_transparent_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->transparent);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -28104,7 +28121,7 @@ XS(_wrap_mapObj_transparent_get) {
 
 XS(_wrap_mapObj_interlace_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28118,9 +28135,9 @@ XS(_wrap_mapObj_interlace_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_interlace_set" "', argument " "2"" of type '" "int""'");
@@ -28141,7 +28158,7 @@ XS(_wrap_mapObj_interlace_set) {
 
 XS(_wrap_mapObj_interlace_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28153,9 +28170,9 @@ XS(_wrap_mapObj_interlace_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->interlace);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -28169,7 +28186,7 @@ XS(_wrap_mapObj_interlace_get) {
 
 XS(_wrap_mapObj_imagequality_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28183,9 +28200,9 @@ XS(_wrap_mapObj_imagequality_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_imagequality_set" "', argument " "2"" of type '" "int""'");
@@ -28206,7 +28223,7 @@ XS(_wrap_mapObj_imagequality_set) {
 
 XS(_wrap_mapObj_imagequality_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28218,9 +28235,9 @@ XS(_wrap_mapObj_imagequality_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->imagequality);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -28234,7 +28251,7 @@ XS(_wrap_mapObj_imagequality_get) {
 
 XS(_wrap_mapObj_extent_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     rectObj *arg2 = (rectObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28248,9 +28265,9 @@ XS(_wrap_mapObj_extent_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_rectObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_extent_set" "', argument " "2"" of type '" "rectObj *""'"); 
@@ -28271,7 +28288,7 @@ XS(_wrap_mapObj_extent_set) {
 
 XS(_wrap_mapObj_extent_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28283,9 +28300,9 @@ XS(_wrap_mapObj_extent_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (rectObj *)& ((arg1)->extent);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28299,7 +28316,7 @@ XS(_wrap_mapObj_extent_get) {
 
 XS(_wrap_mapObj_cellsize_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28313,9 +28330,9 @@ XS(_wrap_mapObj_cellsize_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_cellsize_set" "', argument " "2"" of type '" "double""'");
@@ -28336,7 +28353,7 @@ XS(_wrap_mapObj_cellsize_set) {
 
 XS(_wrap_mapObj_cellsize_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28348,9 +28365,9 @@ XS(_wrap_mapObj_cellsize_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (double) ((arg1)->cellsize);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -28364,7 +28381,7 @@ XS(_wrap_mapObj_cellsize_get) {
 
 XS(_wrap_mapObj_units_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     enum MS_UNITS arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28378,9 +28395,9 @@ XS(_wrap_mapObj_units_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_units_set" "', argument " "2"" of type '" "enum MS_UNITS""'");
@@ -28401,7 +28418,7 @@ XS(_wrap_mapObj_units_set) {
 
 XS(_wrap_mapObj_units_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28413,9 +28430,9 @@ XS(_wrap_mapObj_units_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (enum MS_UNITS) ((arg1)->units);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -28429,7 +28446,7 @@ XS(_wrap_mapObj_units_get) {
 
 XS(_wrap_mapObj_scaledenom_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28443,9 +28460,9 @@ XS(_wrap_mapObj_scaledenom_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_scaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -28466,7 +28483,7 @@ XS(_wrap_mapObj_scaledenom_set) {
 
 XS(_wrap_mapObj_scaledenom_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28478,9 +28495,9 @@ XS(_wrap_mapObj_scaledenom_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (double) ((arg1)->scaledenom);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -28494,7 +28511,7 @@ XS(_wrap_mapObj_scaledenom_get) {
 
 XS(_wrap_mapObj_resolution_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28508,9 +28525,9 @@ XS(_wrap_mapObj_resolution_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_resolution_set" "', argument " "2"" of type '" "double""'");
@@ -28531,7 +28548,7 @@ XS(_wrap_mapObj_resolution_set) {
 
 XS(_wrap_mapObj_resolution_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28543,9 +28560,9 @@ XS(_wrap_mapObj_resolution_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (double) ((arg1)->resolution);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -28559,7 +28576,7 @@ XS(_wrap_mapObj_resolution_get) {
 
 XS(_wrap_mapObj_defresolution_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28573,9 +28590,9 @@ XS(_wrap_mapObj_defresolution_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_defresolution_set" "', argument " "2"" of type '" "double""'");
@@ -28596,7 +28613,7 @@ XS(_wrap_mapObj_defresolution_set) {
 
 XS(_wrap_mapObj_defresolution_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28608,9 +28625,9 @@ XS(_wrap_mapObj_defresolution_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (double) ((arg1)->defresolution);
     ST(argvi) = SWIG_From_double  SWIG_PERL_CALL_ARGS_1((double)(result)); argvi++ ;
     
@@ -28624,7 +28641,7 @@ XS(_wrap_mapObj_defresolution_get) {
 
 XS(_wrap_mapObj_shapepath_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28639,9 +28656,9 @@ XS(_wrap_mapObj_shapepath_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_shapepath_set" "', argument " "2"" of type '" "char *""'");
@@ -28670,7 +28687,7 @@ XS(_wrap_mapObj_shapepath_set) {
 
 XS(_wrap_mapObj_shapepath_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28682,9 +28699,9 @@ XS(_wrap_mapObj_shapepath_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->shapepath);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -28698,7 +28715,7 @@ XS(_wrap_mapObj_shapepath_get) {
 
 XS(_wrap_mapObj_mappath_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28713,9 +28730,9 @@ XS(_wrap_mapObj_mappath_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_mappath_set" "', argument " "2"" of type '" "char *""'");
@@ -28744,7 +28761,7 @@ XS(_wrap_mapObj_mappath_set) {
 
 XS(_wrap_mapObj_mappath_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28756,9 +28773,9 @@ XS(_wrap_mapObj_mappath_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->mappath);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -28772,7 +28789,7 @@ XS(_wrap_mapObj_mappath_get) {
 
 XS(_wrap_mapObj_imagecolor_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     colorObj *arg2 = (colorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -28786,9 +28803,9 @@ XS(_wrap_mapObj_imagecolor_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_colorObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_imagecolor_set" "', argument " "2"" of type '" "colorObj *""'"); 
@@ -28809,7 +28826,7 @@ XS(_wrap_mapObj_imagecolor_set) {
 
 XS(_wrap_mapObj_imagecolor_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28821,9 +28838,9 @@ XS(_wrap_mapObj_imagecolor_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (colorObj *)& ((arg1)->imagecolor);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_colorObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28837,7 +28854,7 @@ XS(_wrap_mapObj_imagecolor_get) {
 
 XS(_wrap_mapObj_numoutputformats_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28849,9 +28866,9 @@ XS(_wrap_mapObj_numoutputformats_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numoutputformats_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numoutputformats_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->numoutputformats);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -28865,7 +28882,7 @@ XS(_wrap_mapObj_numoutputformats_get) {
 
 XS(_wrap_mapObj_outputformatlist_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28877,9 +28894,9 @@ XS(_wrap_mapObj_outputformatlist_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformatlist_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformatlist_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (outputFormatObj **) ((arg1)->outputformatlist);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_outputFormatObj, 0 | 0); argvi++ ;
     
@@ -28893,7 +28910,7 @@ XS(_wrap_mapObj_outputformatlist_get) {
 
 XS(_wrap_mapObj_outputformat_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28905,9 +28922,9 @@ XS(_wrap_mapObj_outputformat_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformat_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformat_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (outputFormatObj *) ((arg1)->outputformat);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_outputFormatObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28921,7 +28938,7 @@ XS(_wrap_mapObj_outputformat_get) {
 
 XS(_wrap_mapObj_imagetype_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28933,9 +28950,9 @@ XS(_wrap_mapObj_imagetype_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagetype_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagetype_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->imagetype);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -28949,7 +28966,7 @@ XS(_wrap_mapObj_imagetype_get) {
 
 XS(_wrap_mapObj_reference_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28961,9 +28978,9 @@ XS(_wrap_mapObj_reference_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_reference_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_reference_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (referenceMapObj *)& ((arg1)->reference);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_referenceMapObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -28977,7 +28994,7 @@ XS(_wrap_mapObj_reference_get) {
 
 XS(_wrap_mapObj_scalebar_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -28989,9 +29006,9 @@ XS(_wrap_mapObj_scalebar_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scalebar_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scalebar_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (scalebarObj *)& ((arg1)->scalebar);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_scalebarObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -29005,7 +29022,7 @@ XS(_wrap_mapObj_scalebar_get) {
 
 XS(_wrap_mapObj_legend_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29017,9 +29034,9 @@ XS(_wrap_mapObj_legend_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_legend_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_legend_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (legendObj *)& ((arg1)->legend);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_legendObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -29033,7 +29050,7 @@ XS(_wrap_mapObj_legend_get) {
 
 XS(_wrap_mapObj_querymap_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29045,9 +29062,9 @@ XS(_wrap_mapObj_querymap_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_querymap_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_querymap_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (queryMapObj *)& ((arg1)->querymap);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_queryMapObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -29061,7 +29078,7 @@ XS(_wrap_mapObj_querymap_get) {
 
 XS(_wrap_mapObj_web_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29073,9 +29090,9 @@ XS(_wrap_mapObj_web_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_web_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_web_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (webObj *)& ((arg1)->web);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_webObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -29089,7 +29106,7 @@ XS(_wrap_mapObj_web_get) {
 
 XS(_wrap_mapObj_layerorder_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int *arg2 = (int *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29103,9 +29120,9 @@ XS(_wrap_mapObj_layerorder_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_layerorder_set" "', argument " "2"" of type '" "int *""'"); 
@@ -29126,7 +29143,7 @@ XS(_wrap_mapObj_layerorder_set) {
 
 XS(_wrap_mapObj_layerorder_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29138,9 +29155,9 @@ XS(_wrap_mapObj_layerorder_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int *) ((arg1)->layerorder);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 | 0); argvi++ ;
     
@@ -29154,7 +29171,7 @@ XS(_wrap_mapObj_layerorder_get) {
 
 XS(_wrap_mapObj_debug_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29168,9 +29185,9 @@ XS(_wrap_mapObj_debug_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -29191,7 +29208,7 @@ XS(_wrap_mapObj_debug_set) {
 
 XS(_wrap_mapObj_debug_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29203,9 +29220,9 @@ XS(_wrap_mapObj_debug_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int) ((arg1)->debug);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -29219,7 +29236,7 @@ XS(_wrap_mapObj_debug_get) {
 
 XS(_wrap_mapObj_datapattern_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29234,9 +29251,9 @@ XS(_wrap_mapObj_datapattern_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_datapattern_set" "', argument " "2"" of type '" "char *""'");
@@ -29265,7 +29282,7 @@ XS(_wrap_mapObj_datapattern_set) {
 
 XS(_wrap_mapObj_datapattern_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29277,9 +29294,9 @@ XS(_wrap_mapObj_datapattern_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->datapattern);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -29293,7 +29310,7 @@ XS(_wrap_mapObj_datapattern_get) {
 
 XS(_wrap_mapObj_templatepattern_set) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29308,9 +29325,9 @@ XS(_wrap_mapObj_templatepattern_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_set" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_templatepattern_set" "', argument " "2"" of type '" "char *""'");
@@ -29339,7 +29356,7 @@ XS(_wrap_mapObj_templatepattern_set) {
 
 XS(_wrap_mapObj_templatepattern_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29351,9 +29368,9 @@ XS(_wrap_mapObj_templatepattern_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *) ((arg1)->templatepattern);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -29367,7 +29384,7 @@ XS(_wrap_mapObj_templatepattern_get) {
 
 XS(_wrap_mapObj_configoptions_get) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29379,9 +29396,9 @@ XS(_wrap_mapObj_configoptions_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_configoptions_get" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_configoptions_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (hashTableObj *)& ((arg1)->configoptions);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -29400,7 +29417,7 @@ XS(_wrap_new_mapObj) {
     char *buf1 = 0 ;
     int alloc1 = 0 ;
     int argvi = 0;
-    mapObj *result = 0 ;
+    struct mapObj *result = 0 ;
     dXSARGS;
     
     if ((items < 0) || (items > 1)) {
@@ -29413,7 +29430,7 @@ XS(_wrap_new_mapObj) {
       }
       arg1 = (char *)(buf1);
     }
-    result = (mapObj *)new_mapObj(arg1);
+    result = (struct mapObj *)new_mapObj(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_mapObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     XSRETURN(argvi);
@@ -29426,7 +29443,7 @@ XS(_wrap_new_mapObj) {
 
 XS(_wrap_delete_mapObj) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29437,9 +29454,9 @@ XS(_wrap_delete_mapObj) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_mapObj" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_mapObj" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     delete_mapObj(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -29453,7 +29470,7 @@ XS(_wrap_delete_mapObj) {
 
 XS(_wrap_mapObj_clone) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29465,9 +29482,9 @@ XS(_wrap_mapObj_clone) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_clone" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_clone" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (mapObj *)mapObj_clone(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_mapObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -29481,7 +29498,7 @@ XS(_wrap_mapObj_clone) {
 
 XS(_wrap_mapObj_insertLayer) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     layerObj *arg2 = (layerObj *) 0 ;
     int arg3 = (int) -1 ;
     void *argp1 = 0 ;
@@ -29499,9 +29516,9 @@ XS(_wrap_mapObj_insertLayer) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_insertLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_insertLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_layerObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_insertLayer" "', argument " "2"" of type '" "layerObj *""'"); 
@@ -29531,7 +29548,7 @@ XS(_wrap_mapObj_insertLayer) {
 
 XS(_wrap_mapObj_removeLayer) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29546,9 +29563,9 @@ XS(_wrap_mapObj_removeLayer) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_removeLayer" "', argument " "2"" of type '" "int""'");
@@ -29569,7 +29586,7 @@ XS(_wrap_mapObj_removeLayer) {
 
 XS(_wrap_mapObj_setExtent) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     double arg3 ;
     double arg4 ;
@@ -29593,9 +29610,9 @@ XS(_wrap_mapObj_setExtent) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setExtent" "', argument " "2"" of type '" "double""'");
@@ -29637,7 +29654,7 @@ XS(_wrap_mapObj_setExtent) {
 
 XS(_wrap_mapObj_offsetExtent) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     double arg3 ;
     void *argp1 = 0 ;
@@ -29655,9 +29672,9 @@ XS(_wrap_mapObj_offsetExtent) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_offsetExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_offsetExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_offsetExtent" "', argument " "2"" of type '" "double""'");
@@ -29685,7 +29702,7 @@ XS(_wrap_mapObj_offsetExtent) {
 
 XS(_wrap_mapObj_scaleExtent) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     double arg3 ;
     double arg4 ;
@@ -29706,9 +29723,9 @@ XS(_wrap_mapObj_scaleExtent) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaleExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaleExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_scaleExtent" "', argument " "2"" of type '" "double""'");
@@ -29743,7 +29760,7 @@ XS(_wrap_mapObj_scaleExtent) {
 
 XS(_wrap_mapObj_setCenter) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     pointObj *arg2 = (pointObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29758,9 +29775,9 @@ XS(_wrap_mapObj_setCenter) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setCenter" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setCenter" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_pointObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setCenter" "', argument " "2"" of type '" "pointObj *""'"); 
@@ -29781,7 +29798,7 @@ XS(_wrap_mapObj_setCenter) {
 
 XS(_wrap_mapObj_setSize) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     int arg3 ;
     void *argp1 = 0 ;
@@ -29799,9 +29816,9 @@ XS(_wrap_mapObj_setSize) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSize" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSize" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setSize" "', argument " "2"" of type '" "int""'");
@@ -29829,7 +29846,7 @@ XS(_wrap_mapObj_setSize) {
 
 XS(_wrap_mapObj_setRotation) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29844,9 +29861,9 @@ XS(_wrap_mapObj_setRotation) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setRotation" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setRotation" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setRotation" "', argument " "2"" of type '" "double""'");
@@ -29867,7 +29884,7 @@ XS(_wrap_mapObj_setRotation) {
 
 XS(_wrap_mapObj_getLayer) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29882,9 +29899,9 @@ XS(_wrap_mapObj_getLayer) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_getLayer" "', argument " "2"" of type '" "int""'");
@@ -29905,7 +29922,7 @@ XS(_wrap_mapObj_getLayer) {
 
 XS(_wrap_mapObj_getLayerByName) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29921,9 +29938,9 @@ XS(_wrap_mapObj_getLayerByName) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerByName" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getLayerByName" "', argument " "2"" of type '" "char *""'");
@@ -29944,7 +29961,7 @@ XS(_wrap_mapObj_getLayerByName) {
 
 XS(_wrap_mapObj_getSymbolByName) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -29960,9 +29977,9 @@ XS(_wrap_mapObj_getSymbolByName) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSymbolByName" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSymbolByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getSymbolByName" "', argument " "2"" of type '" "char *""'");
@@ -29983,7 +30000,7 @@ XS(_wrap_mapObj_getSymbolByName) {
 
 XS(_wrap_mapObj_prepareQuery) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -29994,9 +30011,9 @@ XS(_wrap_mapObj_prepareQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     mapObj_prepareQuery(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -30010,7 +30027,7 @@ XS(_wrap_mapObj_prepareQuery) {
 
 XS(_wrap_mapObj_prepareImage) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30022,9 +30039,9 @@ XS(_wrap_mapObj_prepareImage) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareImage" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareImage" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_prepareImage(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30038,7 +30055,7 @@ XS(_wrap_mapObj_prepareImage) {
 
 XS(_wrap_mapObj_setImageType) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30053,9 +30070,9 @@ XS(_wrap_mapObj_setImageType) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setImageType" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setImageType" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setImageType" "', argument " "2"" of type '" "char *""'");
@@ -30076,7 +30093,7 @@ XS(_wrap_mapObj_setImageType) {
 
 XS(_wrap_mapObj_selectOutputFormat) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30091,9 +30108,9 @@ XS(_wrap_mapObj_selectOutputFormat) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_selectOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_selectOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_selectOutputFormat" "', argument " "2"" of type '" "char *""'");
@@ -30114,7 +30131,7 @@ XS(_wrap_mapObj_selectOutputFormat) {
 
 XS(_wrap_mapObj_setOutputFormat) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     outputFormatObj *arg2 = (outputFormatObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30128,9 +30145,9 @@ XS(_wrap_mapObj_setOutputFormat) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_outputFormatObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setOutputFormat" "', argument " "2"" of type '" "outputFormatObj *""'"); 
@@ -30151,7 +30168,7 @@ XS(_wrap_mapObj_setOutputFormat) {
 
 XS(_wrap_mapObj_draw) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30163,9 +30180,9 @@ XS(_wrap_mapObj_draw) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_draw" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_draw" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_draw(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30179,7 +30196,7 @@ XS(_wrap_mapObj_draw) {
 
 XS(_wrap_mapObj_drawQuery) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30191,9 +30208,9 @@ XS(_wrap_mapObj_drawQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_drawQuery(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30207,7 +30224,7 @@ XS(_wrap_mapObj_drawQuery) {
 
 XS(_wrap_mapObj_drawLegend) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30219,9 +30236,9 @@ XS(_wrap_mapObj_drawLegend) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLegend" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLegend" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_drawLegend(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30235,7 +30252,7 @@ XS(_wrap_mapObj_drawLegend) {
 
 XS(_wrap_mapObj_drawScalebar) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30247,9 +30264,9 @@ XS(_wrap_mapObj_drawScalebar) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawScalebar" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawScalebar" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_drawScalebar(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30263,7 +30280,7 @@ XS(_wrap_mapObj_drawScalebar) {
 
 XS(_wrap_mapObj_drawReferenceMap) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30275,9 +30292,9 @@ XS(_wrap_mapObj_drawReferenceMap) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawReferenceMap" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawReferenceMap" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (imageObj *)mapObj_drawReferenceMap(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_imageObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -30291,7 +30308,7 @@ XS(_wrap_mapObj_drawReferenceMap) {
 
 XS(_wrap_mapObj_embedScalebar) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     imageObj *arg2 = (imageObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30306,9 +30323,9 @@ XS(_wrap_mapObj_embedScalebar) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedScalebar" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedScalebar" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_embedScalebar" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30329,7 +30346,7 @@ XS(_wrap_mapObj_embedScalebar) {
 
 XS(_wrap_mapObj_embedLegend) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     imageObj *arg2 = (imageObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30344,9 +30361,9 @@ XS(_wrap_mapObj_embedLegend) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedLegend" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedLegend" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_embedLegend" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30367,7 +30384,7 @@ XS(_wrap_mapObj_embedLegend) {
 
 XS(_wrap_mapObj_drawLabelCache) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     imageObj *arg2 = (imageObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30382,9 +30399,9 @@ XS(_wrap_mapObj_drawLabelCache) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLabelCache" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLabelCache" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_drawLabelCache" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30405,7 +30422,7 @@ XS(_wrap_mapObj_drawLabelCache) {
 
 XS(_wrap_mapObj_getLabel) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30420,9 +30437,9 @@ XS(_wrap_mapObj_getLabel) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLabel" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLabel" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_getLabel" "', argument " "2"" of type '" "int""'");
@@ -30443,7 +30460,7 @@ XS(_wrap_mapObj_getLabel) {
 
 XS(_wrap_mapObj_nextLabel) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30455,9 +30472,9 @@ XS(_wrap_mapObj_nextLabel) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_nextLabel" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_nextLabel" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (labelCacheMemberObj *)mapObj_nextLabel(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_labelCacheMemberObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -30471,7 +30488,7 @@ XS(_wrap_mapObj_nextLabel) {
 
 XS(_wrap_mapObj_queryByFilter) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30487,9 +30504,9 @@ XS(_wrap_mapObj_queryByFilter) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFilter" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFilter" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_queryByFilter" "', argument " "2"" of type '" "char *""'");
@@ -30510,7 +30527,7 @@ XS(_wrap_mapObj_queryByFilter) {
 
 XS(_wrap_mapObj_queryByPoint) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     pointObj *arg2 = (pointObj *) 0 ;
     int arg3 ;
     double arg4 ;
@@ -30531,9 +30548,9 @@ XS(_wrap_mapObj_queryByPoint) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByPoint" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByPoint" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_pointObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_queryByPoint" "', argument " "2"" of type '" "pointObj *""'"); 
@@ -30568,7 +30585,7 @@ XS(_wrap_mapObj_queryByPoint) {
 
 XS(_wrap_mapObj_queryByRect) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     rectObj arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30583,9 +30600,9 @@ XS(_wrap_mapObj_queryByRect) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByRect" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByRect" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     {
       res2 = SWIG_ConvertPtr(ST(1), &argp2, SWIGTYPE_p_rectObj,  0 );
       if (!SWIG_IsOK(res2)) {
@@ -30610,7 +30627,7 @@ XS(_wrap_mapObj_queryByRect) {
 
 XS(_wrap_mapObj_queryByFeatures) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30625,9 +30642,9 @@ XS(_wrap_mapObj_queryByFeatures) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFeatures" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFeatures" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_queryByFeatures" "', argument " "2"" of type '" "int""'");
@@ -30648,7 +30665,7 @@ XS(_wrap_mapObj_queryByFeatures) {
 
 XS(_wrap_mapObj_queryByShape) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     shapeObj *arg2 = (shapeObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30663,9 +30680,9 @@ XS(_wrap_mapObj_queryByShape) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByShape" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByShape" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_shapeObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_queryByShape" "', argument " "2"" of type '" "shapeObj *""'"); 
@@ -30686,7 +30703,7 @@ XS(_wrap_mapObj_queryByShape) {
 
 XS(_wrap_mapObj_setWKTProjection) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30702,9 +30719,9 @@ XS(_wrap_mapObj_setWKTProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setWKTProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setWKTProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setWKTProjection" "', argument " "2"" of type '" "char *""'");
@@ -30725,7 +30742,7 @@ XS(_wrap_mapObj_setWKTProjection) {
 
 XS(_wrap_mapObj_getProjection) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -30737,9 +30754,9 @@ XS(_wrap_mapObj_getProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *)mapObj_getProjection(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -30754,7 +30771,7 @@ XS(_wrap_mapObj_getProjection) {
 
 XS(_wrap_mapObj_setProjection) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30770,9 +30787,9 @@ XS(_wrap_mapObj_setProjection) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setProjection" "', argument " "2"" of type '" "char *""'");
@@ -30793,7 +30810,7 @@ XS(_wrap_mapObj_setProjection) {
 
 XS(_wrap_mapObj_save) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30809,9 +30826,9 @@ XS(_wrap_mapObj_save) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_save" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_save" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_save" "', argument " "2"" of type '" "char *""'");
@@ -30832,7 +30849,7 @@ XS(_wrap_mapObj_save) {
 
 XS(_wrap_mapObj_saveQuery) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     int arg3 = (int) 0 ;
     void *argp1 = 0 ;
@@ -30851,9 +30868,9 @@ XS(_wrap_mapObj_saveQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_saveQuery" "', argument " "2"" of type '" "char *""'");
@@ -30883,7 +30900,7 @@ XS(_wrap_mapObj_saveQuery) {
 
 XS(_wrap_mapObj_loadQuery) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30899,9 +30916,9 @@ XS(_wrap_mapObj_loadQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_loadQuery" "', argument " "2"" of type '" "char *""'");
@@ -30922,7 +30939,7 @@ XS(_wrap_mapObj_loadQuery) {
 
 XS(_wrap_mapObj_freeQuery) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 = (int) -1 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -30936,9 +30953,9 @@ XS(_wrap_mapObj_freeQuery) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_freeQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_freeQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     if (items > 1) {
       ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
       if (!SWIG_IsOK(ecode2)) {
@@ -30961,7 +30978,7 @@ XS(_wrap_mapObj_freeQuery) {
 
 XS(_wrap_mapObj_saveQueryAsGML) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) "GOMF" ;
     void *argp1 = 0 ;
@@ -30981,9 +30998,9 @@ XS(_wrap_mapObj_saveQueryAsGML) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQueryAsGML" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQueryAsGML" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_saveQueryAsGML" "', argument " "2"" of type '" "char *""'");
@@ -31013,7 +31030,7 @@ XS(_wrap_mapObj_saveQueryAsGML) {
 
 XS(_wrap_mapObj_getMetaData) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31029,9 +31046,9 @@ XS(_wrap_mapObj_getMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getMetaData" "', argument " "2"" of type '" "char *""'");
@@ -31052,7 +31069,7 @@ XS(_wrap_mapObj_getMetaData) {
 
 XS(_wrap_mapObj_setMetaData) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -31072,9 +31089,9 @@ XS(_wrap_mapObj_setMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setMetaData" "', argument " "2"" of type '" "char *""'");
@@ -31102,7 +31119,7 @@ XS(_wrap_mapObj_setMetaData) {
 
 XS(_wrap_mapObj_removeMetaData) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31118,9 +31135,9 @@ XS(_wrap_mapObj_removeMetaData) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_removeMetaData" "', argument " "2"" of type '" "char *""'");
@@ -31141,7 +31158,7 @@ XS(_wrap_mapObj_removeMetaData) {
 
 XS(_wrap_mapObj_getFirstMetaDataKey) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -31153,9 +31170,9 @@ XS(_wrap_mapObj_getFirstMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getFirstMetaDataKey" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *)mapObj_getFirstMetaDataKey(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -31169,7 +31186,7 @@ XS(_wrap_mapObj_getFirstMetaDataKey) {
 
 XS(_wrap_mapObj_getNextMetaDataKey) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31185,9 +31202,9 @@ XS(_wrap_mapObj_getNextMetaDataKey) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNextMetaDataKey" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getNextMetaDataKey" "', argument " "2"" of type '" "char *""'");
@@ -31208,7 +31225,7 @@ XS(_wrap_mapObj_getNextMetaDataKey) {
 
 XS(_wrap_mapObj_setSymbolSet) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31224,9 +31241,9 @@ XS(_wrap_mapObj_setSymbolSet) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSymbolSet" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSymbolSet" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setSymbolSet" "', argument " "2"" of type '" "char *""'");
@@ -31247,7 +31264,7 @@ XS(_wrap_mapObj_setSymbolSet) {
 
 XS(_wrap_mapObj_getNumSymbols) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -31259,9 +31276,9 @@ XS(_wrap_mapObj_getNumSymbols) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNumSymbols" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNumSymbols" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (int)mapObj_getNumSymbols(arg1);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -31275,7 +31292,7 @@ XS(_wrap_mapObj_getNumSymbols) {
 
 XS(_wrap_mapObj_setFontSet) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31291,9 +31308,9 @@ XS(_wrap_mapObj_setFontSet) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setFontSet" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setFontSet" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setFontSet" "', argument " "2"" of type '" "char *""'");
@@ -31314,7 +31331,7 @@ XS(_wrap_mapObj_setFontSet) {
 
 XS(_wrap_mapObj_saveMapContext) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31330,9 +31347,9 @@ XS(_wrap_mapObj_saveMapContext) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveMapContext" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveMapContext" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_saveMapContext" "', argument " "2"" of type '" "char *""'");
@@ -31353,7 +31370,7 @@ XS(_wrap_mapObj_saveMapContext) {
 
 XS(_wrap_mapObj_loadMapContext) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     int arg3 = (int) 0 ;
     void *argp1 = 0 ;
@@ -31372,9 +31389,9 @@ XS(_wrap_mapObj_loadMapContext) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadMapContext" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadMapContext" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_loadMapContext" "', argument " "2"" of type '" "char *""'");
@@ -31404,7 +31421,7 @@ XS(_wrap_mapObj_loadMapContext) {
 
 XS(_wrap_mapObj_moveLayerUp) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31419,9 +31436,9 @@ XS(_wrap_mapObj_moveLayerUp) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerUp" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerUp" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_moveLayerUp" "', argument " "2"" of type '" "int""'");
@@ -31442,7 +31459,7 @@ XS(_wrap_mapObj_moveLayerUp) {
 
 XS(_wrap_mapObj_moveLayerDown) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31457,9 +31474,9 @@ XS(_wrap_mapObj_moveLayerDown) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerDown" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerDown" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_moveLayerDown" "', argument " "2"" of type '" "int""'");
@@ -31480,7 +31497,7 @@ XS(_wrap_mapObj_moveLayerDown) {
 
 XS(_wrap_mapObj_getLayersDrawingOrder) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -31492,9 +31509,9 @@ XS(_wrap_mapObj_getLayersDrawingOrder) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayersDrawingOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayersDrawingOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (intarray *)mapObj_getLayersDrawingOrder(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_intarray, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     
@@ -31508,7 +31525,7 @@ XS(_wrap_mapObj_getLayersDrawingOrder) {
 
 XS(_wrap_mapObj_setLayersDrawingOrder) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int *arg2 = (int *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31523,9 +31540,9 @@ XS(_wrap_mapObj_setLayersDrawingOrder) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_int, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "2"" of type '" "int *""'"); 
@@ -31546,7 +31563,7 @@ XS(_wrap_mapObj_setLayersDrawingOrder) {
 
 XS(_wrap_mapObj_setConfigOption) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     char *arg3 = (char *) 0 ;
     void *argp1 = 0 ;
@@ -31565,9 +31582,9 @@ XS(_wrap_mapObj_setConfigOption) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setConfigOption" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setConfigOption" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setConfigOption" "', argument " "2"" of type '" "char *""'");
@@ -31595,7 +31612,7 @@ XS(_wrap_mapObj_setConfigOption) {
 
 XS(_wrap_mapObj_getConfigOption) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31611,9 +31628,9 @@ XS(_wrap_mapObj_getConfigOption) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getConfigOption" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getConfigOption" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getConfigOption" "', argument " "2"" of type '" "char *""'");
@@ -31634,7 +31651,7 @@ XS(_wrap_mapObj_getConfigOption) {
 
 XS(_wrap_mapObj_applyConfigOptions) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -31645,9 +31662,9 @@ XS(_wrap_mapObj_applyConfigOptions) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applyConfigOptions" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applyConfigOptions" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     mapObj_applyConfigOptions(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -31661,7 +31678,7 @@ XS(_wrap_mapObj_applyConfigOptions) {
 
 XS(_wrap_mapObj_applySLD) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31677,9 +31694,9 @@ XS(_wrap_mapObj_applySLD) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLD" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLD" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_applySLD" "', argument " "2"" of type '" "char *""'");
@@ -31700,7 +31717,7 @@ XS(_wrap_mapObj_applySLD) {
 
 XS(_wrap_mapObj_applySLDURL) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31716,9 +31733,9 @@ XS(_wrap_mapObj_applySLDURL) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLDURL" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLDURL" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_applySLDURL" "', argument " "2"" of type '" "char *""'");
@@ -31739,7 +31756,7 @@ XS(_wrap_mapObj_applySLDURL) {
 
 XS(_wrap_mapObj_generateSLD) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -31751,9 +31768,9 @@ XS(_wrap_mapObj_generateSLD) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_generateSLD" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_generateSLD" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     result = (char *)mapObj_generateSLD(arg1);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -31768,7 +31785,7 @@ XS(_wrap_mapObj_generateSLD) {
 
 XS(_wrap_mapObj_processTemplate) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     char **arg3 = (char **) 0 ;
     char **arg4 = (char **) 0 ;
@@ -31792,9 +31809,9 @@ XS(_wrap_mapObj_processTemplate) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_processTemplate" "', argument " "2"" of type '" "int""'");
@@ -31837,7 +31854,7 @@ XS(_wrap_mapObj_processTemplate) {
 
 XS(_wrap_mapObj_processLegendTemplate) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char **arg2 = (char **) 0 ;
     char **arg3 = (char **) 0 ;
     int arg4 ;
@@ -31858,9 +31875,9 @@ XS(_wrap_mapObj_processLegendTemplate) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processLegendTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processLegendTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_processLegendTemplate" "', argument " "2"" of type '" "char **""'"); 
@@ -31896,7 +31913,7 @@ XS(_wrap_mapObj_processLegendTemplate) {
 
 XS(_wrap_mapObj_processQueryTemplate) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char **arg2 = (char **) 0 ;
     char **arg3 = (char **) 0 ;
     int arg4 ;
@@ -31917,9 +31934,9 @@ XS(_wrap_mapObj_processQueryTemplate) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processQueryTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processQueryTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_p_char, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_processQueryTemplate" "', argument " "2"" of type '" "char **""'"); 
@@ -31955,7 +31972,7 @@ XS(_wrap_mapObj_processQueryTemplate) {
 
 XS(_wrap_mapObj_getOutputFormatByName) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -31971,9 +31988,9 @@ XS(_wrap_mapObj_getOutputFormatByName) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getOutputFormatByName" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getOutputFormatByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_getOutputFormatByName" "', argument " "2"" of type '" "char *""'");
@@ -31994,7 +32011,7 @@ XS(_wrap_mapObj_getOutputFormatByName) {
 
 XS(_wrap_mapObj_appendOutputFormat) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     outputFormatObj *arg2 = (outputFormatObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -32009,9 +32026,9 @@ XS(_wrap_mapObj_appendOutputFormat) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_appendOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_appendOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_outputFormatObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_appendOutputFormat" "', argument " "2"" of type '" "outputFormatObj *""'"); 
@@ -32032,7 +32049,7 @@ XS(_wrap_mapObj_appendOutputFormat) {
 
 XS(_wrap_mapObj_removeOutputFormat) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     char *arg2 = (char *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -32048,9 +32065,9 @@ XS(_wrap_mapObj_removeOutputFormat) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_removeOutputFormat" "', argument " "2"" of type '" "char *""'");
@@ -32071,7 +32088,7 @@ XS(_wrap_mapObj_removeOutputFormat) {
 
 XS(_wrap_mapObj_loadOWSParameters) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
     char *arg3 = (char *) "1.1.1" ;
     void *argp1 = 0 ;
@@ -32090,9 +32107,9 @@ XS(_wrap_mapObj_loadOWSParameters) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadOWSParameters" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadOWSParameters" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_cgiRequestObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_loadOWSParameters" "', argument " "2"" of type '" "cgiRequestObj *""'"); 
@@ -32122,7 +32139,7 @@ XS(_wrap_mapObj_loadOWSParameters) {
 
 XS(_wrap_mapObj_OWSDispatch) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -32137,9 +32154,9 @@ XS(_wrap_mapObj_OWSDispatch) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_OWSDispatch" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_OWSDispatch" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_cgiRequestObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_OWSDispatch" "', argument " "2"" of type '" "cgiRequestObj *""'"); 
@@ -32160,7 +32177,7 @@ XS(_wrap_mapObj_OWSDispatch) {
 
 XS(_wrap_mapObj_zoomPoint) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     int arg2 ;
     pointObj *arg3 = (pointObj *) 0 ;
     int arg4 ;
@@ -32190,9 +32207,9 @@ XS(_wrap_mapObj_zoomPoint) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomPoint" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomPoint" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_zoomPoint" "', argument " "2"" of type '" "int""'");
@@ -32248,7 +32265,7 @@ XS(_wrap_mapObj_zoomPoint) {
 
 XS(_wrap_mapObj_zoomRectangle) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     rectObj *arg2 = (rectObj *) 0 ;
     int arg3 ;
     int arg4 ;
@@ -32275,9 +32292,9 @@ XS(_wrap_mapObj_zoomRectangle) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomRectangle" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomRectangle" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_rectObj, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_zoomRectangle" "', argument " "2"" of type '" "rectObj *""'"); 
@@ -32326,7 +32343,7 @@ XS(_wrap_mapObj_zoomRectangle) {
 
 XS(_wrap_mapObj_zoomScale) {
   {
-    mapObj *arg1 = (mapObj *) 0 ;
+    struct mapObj *arg1 = (struct mapObj *) 0 ;
     double arg2 ;
     pointObj *arg3 = (pointObj *) 0 ;
     int arg4 ;
@@ -32356,9 +32373,9 @@ XS(_wrap_mapObj_zoomScale) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomScale" "', argument " "1"" of type '" "mapObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomScale" "', argument " "1"" of type '" "struct mapObj *""'"); 
     }
-    arg1 = (mapObj *)(argp1);
+    arg1 = (struct mapObj *)(argp1);
     ecode2 = SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_zoomScale" "', argument " "2"" of type '" "double""'");
@@ -38471,9 +38488,9 @@ XS(_wrap_shapeObj_contains) {
   dispatch:
     switch(_index) {
     case 1:
-      ++PL_markstack_ptr; SWIG_CALLXS(_wrap_shapeObj_contains__SWIG_0); return;
+      PUSHMARK(MARK); SWIG_CALLXS(_wrap_shapeObj_contains__SWIG_0); return;
     case 2:
-      ++PL_markstack_ptr; SWIG_CALLXS(_wrap_shapeObj_contains__SWIG_1); return;
+      PUSHMARK(MARK); SWIG_CALLXS(_wrap_shapeObj_contains__SWIG_1); return;
     }
   }
   
@@ -42248,7 +42265,7 @@ XS(_wrap_symbolObj_setImage) {
 
 XS(_wrap_errorObj_code_set) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -42262,9 +42279,9 @@ XS(_wrap_errorObj_code_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_set" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "errorObj_code_set" "', argument " "2"" of type '" "int""'");
@@ -42285,7 +42302,7 @@ XS(_wrap_errorObj_code_set) {
 
 XS(_wrap_errorObj_code_get) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42297,9 +42314,9 @@ XS(_wrap_errorObj_code_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_get" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     result = (int) ((arg1)->code);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -42313,7 +42330,7 @@ XS(_wrap_errorObj_code_get) {
 
 XS(_wrap_errorObj_routine_set) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     char *arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -42327,9 +42344,9 @@ XS(_wrap_errorObj_routine_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_set" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     res2 = SWIG_AsCharArray(ST(1), temp2, 64);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "errorObj_routine_set" "', argument " "2"" of type '" "char [64]""'");
@@ -42351,7 +42368,7 @@ XS(_wrap_errorObj_routine_set) {
 
 XS(_wrap_errorObj_routine_get) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42363,9 +42380,9 @@ XS(_wrap_errorObj_routine_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_get" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     result = (char *)(char *) ((arg1)->routine);
     {
       ST(argvi) = newSVpvn(result, strlen(result));
@@ -42382,7 +42399,7 @@ XS(_wrap_errorObj_routine_get) {
 
 XS(_wrap_errorObj_message_set) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     char *arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -42396,9 +42413,9 @@ XS(_wrap_errorObj_message_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_set" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     res2 = SWIG_AsCharArray(ST(1), temp2, 2048);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "errorObj_message_set" "', argument " "2"" of type '" "char [2048]""'");
@@ -42420,7 +42437,7 @@ XS(_wrap_errorObj_message_set) {
 
 XS(_wrap_errorObj_message_get) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42432,9 +42449,9 @@ XS(_wrap_errorObj_message_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_get" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     result = (char *)(char *) ((arg1)->message);
     {
       ST(argvi) = newSVpvn(result, strlen(result));
@@ -42451,7 +42468,7 @@ XS(_wrap_errorObj_message_get) {
 
 XS(_wrap_errorObj_isreported_set) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     int arg2 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
@@ -42465,9 +42482,9 @@ XS(_wrap_errorObj_isreported_set) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_set" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
       SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "errorObj_isreported_set" "', argument " "2"" of type '" "int""'");
@@ -42488,7 +42505,7 @@ XS(_wrap_errorObj_isreported_set) {
 
 XS(_wrap_errorObj_isreported_get) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42500,9 +42517,9 @@ XS(_wrap_errorObj_isreported_get) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_get" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     result = (int) ((arg1)->isreported);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     
@@ -42517,13 +42534,13 @@ XS(_wrap_errorObj_isreported_get) {
 XS(_wrap_new_errorObj) {
   {
     int argvi = 0;
-    errorObj *result = 0 ;
+    struct errorObj *result = 0 ;
     dXSARGS;
     
     if ((items < 0) || (items > 0)) {
       SWIG_croak("Usage: new_errorObj();");
     }
-    result = (errorObj *)new_errorObj();
+    result = (struct errorObj *)new_errorObj();
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_errorObj, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
     XSRETURN(argvi);
   fail:
@@ -42534,7 +42551,7 @@ XS(_wrap_new_errorObj) {
 
 XS(_wrap_delete_errorObj) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42545,9 +42562,9 @@ XS(_wrap_delete_errorObj) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, SWIG_POINTER_DISOWN |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_errorObj" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_errorObj" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     delete_errorObj(arg1);
     ST(argvi) = sv_newmortal();
     
@@ -42561,7 +42578,7 @@ XS(_wrap_delete_errorObj) {
 
 XS(_wrap_errorObj_next) {
   {
-    errorObj *arg1 = (errorObj *) 0 ;
+    struct errorObj *arg1 = (struct errorObj *) 0 ;
     void *argp1 = 0 ;
     int res1 = 0 ;
     int argvi = 0;
@@ -42573,9 +42590,9 @@ XS(_wrap_errorObj_next) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_next" "', argument " "1"" of type '" "errorObj *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_next" "', argument " "1"" of type '" "struct errorObj *""'"); 
     }
-    arg1 = (errorObj *)(argp1);
+    arg1 = (struct errorObj *)(argp1);
     result = (errorObj *)errorObj_next(arg1);
     ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_errorObj, 0 | SWIG_SHADOW); argvi++ ;
     
@@ -43783,7 +43800,7 @@ static swig_type_info _swigt__p_hashTableObj = {"_p_hashTableObj", "hashTableObj
 static swig_type_info _swigt__p_imageObj = {"_p_imageObj", "imageObj *", 0, 0, (void*)"mapscript::imageObj", 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int32_t = {"_p_int32_t", "int32_t *|ms_int32 *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_intarray = {"_p_intarray", "struct intarray *|intarray *", 0, 0, (void*)"mapscript::intarray", 0};
+static swig_type_info _swigt__p_intarray = {"_p_intarray", "intarray *", 0, 0, (void*)"mapscript::intarray", 0};
 static swig_type_info _swigt__p_labelCacheMemberObj = {"_p_labelCacheMemberObj", "labelCacheMemberObj *", 0, 0, (void*)"mapscript::labelCacheMemberObj", 0};
 static swig_type_info _swigt__p_labelCacheObj = {"_p_labelCacheObj", "labelCacheObj *", 0, 0, (void*)"mapscript::labelCacheObj", 0};
 static swig_type_info _swigt__p_labelCacheSlotObj = {"_p_labelCacheSlotObj", "labelCacheSlotObj *", 0, 0, (void*)"mapscript::labelCacheSlotObj", 0};
@@ -45375,25 +45392,30 @@ XS(SWIG_init) {
   
   /* Install commands */
   for (i = 0; swig_commands[i].name; i++) {
-    newXS((char*) swig_commands[i].name,swig_commands[i].wrapper, (char*)__FILE__);
+    // Casts only needed for Perl < 5.10.
+#ifdef __cplusplus
+    newXS(const_cast<char*>(swig_commands[i].name), swig_commands[i].wrapper, const_cast<char*>(__FILE__));
+#else
+    newXS((char*)swig_commands[i].name, swig_commands[i].wrapper, (char*)__FILE__);
+#endif
   }
   
   /* Install variables */
   for (i = 0; swig_variables[i].name; i++) {
     SV *sv;
-    sv = get_sv((char*) swig_variables[i].name, TRUE | 0x2 | GV_ADDMULTI);
+    sv = get_sv(swig_variables[i].name, TRUE | 0x2 | GV_ADDMULTI);
     if (swig_variables[i].type) {
       SWIG_MakePtr(sv,(void *)1, *swig_variables[i].type,0);
     } else {
       sv_setiv(sv,(IV) 0);
     }
-    swig_create_magic(sv, (char *) swig_variables[i].name, swig_variables[i].set, swig_variables[i].get); 
+    swig_create_magic(sv, swig_variables[i].name, swig_variables[i].set, swig_variables[i].get); 
   }
   
   /* Install constant */
   for (i = 0; swig_constants[i].type; i++) {
     SV *sv;
-    sv = get_sv((char*)swig_constants[i].name, TRUE | 0x2 | GV_ADDMULTI);
+    sv = get_sv(swig_constants[i].name, TRUE | 0x2 | GV_ADDMULTI);
     switch(swig_constants[i].type) {
     case SWIG_INT:
       sv_setiv(sv, (IV) swig_constants[i].lvalue);
@@ -45402,7 +45424,7 @@ XS(SWIG_init) {
       sv_setnv(sv, (double) swig_constants[i].dvalue);
       break;
     case SWIG_STRING:
-      sv_setpv(sv, (char *) swig_constants[i].pvalue);
+      sv_setpv(sv, (const char *) swig_constants[i].pvalue);
       break;
     case SWIG_POINTER:
       SWIG_MakePtr(sv, swig_constants[i].pvalue, *(swig_constants[i].ptype),0);
@@ -45422,1125 +45444,1125 @@ XS(SWIG_init) {
     msSetError(MS_MISCERR, "Error initializing MapServer/Mapscript.", "msSetup()");
   }
   
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_VERSION", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("6.2.1"));
+    sv_setsv(sv, SWIG_FromCharPtr("6.2.2"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_VERSION_MAJOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(6)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_VERSION_MINOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_VERSION_REV", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_VERSION_NUM", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)((6*10000+2*100+1))));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)((6*10000+2*100+2))));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FALSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(-1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ON", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_OFF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEFAULT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_EMBED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DELETE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(4)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_YES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GD_ALPHA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1000)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_ALLOCSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(64)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CLASS_ALLOCSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(8)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_ALLOCSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(4)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_ALLOCSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MAX_LABEL_PRIORITY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(10)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MAX_LABEL_FONTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEFAULT_LABEL_PRIORITY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_FORCE_GROUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_SWF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_RAWDATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_IMAGEMAP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_TEMPLATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(8)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_OGR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(16)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_PLUGIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(100)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_CAIRO_RASTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(101)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_CAIRO_PDF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(102)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_CAIRO_SVG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(103)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_OGL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(104)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_AGG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(105)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_GD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(106)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDER_WITH_KML", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(107)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FILE_MAP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_FILE_MAP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FILE_SYMBOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_FILE_SYMBOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_INCHES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_INCHES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FEET", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_FEET)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MILES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_MILES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_METERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_METERS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_KILOMETERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_KILOMETERS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PIXELS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PIXELS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PERCENTAGES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PERCENTAGES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NAUTICALMILES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_NAUTICALMILES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPE_POINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SHAPE_POINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPE_LINE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SHAPE_LINE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPE_POLYGON", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SHAPE_POLYGON)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPE_NULL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SHAPE_NULL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_POINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_POINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_LINE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_LINE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_POLYGON", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_POLYGON)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_RASTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_RASTER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_ANNOTATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_ANNOTATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_QUERY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_QUERY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_CIRCLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_CIRCLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_TILEINDEX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_TILEINDEX)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LAYER_CHART", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LAYER_CHART)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRUETYPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRUETYPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_BITMAP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_BITMAP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_POSITIONS_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(14)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UC)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LC)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CC)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_AUTO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_AUTO)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_XY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_XY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FOLLOW", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_FOLLOW)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_NONE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_AUTO2", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_AUTO2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TINY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TINY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SMALL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SMALL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MEDIUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_MEDIUM)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LARGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LARGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GIANT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GIANT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NORMAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_NORMAL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_HILITE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_HILITE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SELECTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SELECTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_INLINE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_INLINE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPEFILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SHAPEFILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TILED_SHAPEFILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TILED_SHAPEFILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SDE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SDE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_OGR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_OGR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UNUSED_1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UNUSED_1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_POSTGIS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_POSTGIS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WMS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_WMS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ORACLESPATIAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_ORACLESPATIAL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WFS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_WFS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GRATICULE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GRATICULE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MYSQL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_MYSQL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RASTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_RASTER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PLUGIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PLUGIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UNION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UNION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_UVRASTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_UVRASTER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DB_XBASE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DB_XBASE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DB_CSV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DB_CSV)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DB_MYSQL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DB_MYSQL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DB_ORACLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DB_ORACLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DB_POSTGRES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DB_POSTGRES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_JOIN_ONE_TO_ONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_JOIN_ONE_TO_ONE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_JOIN_ONE_TO_MANY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_JOIN_ONE_TO_MANY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SINGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MULTIPLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_SINGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_SINGLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_MULTIPLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_MULTIPLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_IS_NULL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_IS_NULL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_POINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_POINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_RECT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_RECT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_SHAPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_SHAPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_ATTRIBUTE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_ATTRIBUTE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_INDEX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_INDEX)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERY_BY_FILTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_QUERY_BY_FILTER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ALIGN_LEFT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_ALIGN_LEFT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ALIGN_CENTER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_ALIGN_CENTER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ALIGN_RIGHT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_ALIGN_RIGHT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_NONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_NONE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_BEVEL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_BEVEL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_BUTT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_BUTT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_MITER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_MITER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_ROUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_ROUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_SQUARE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_SQUARE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_TRIANGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_CJC_TRIANGLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CJC_DEFAULT_JOIN_MAXSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SUCCESS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SUCCESS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DONE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_PC256", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_PC256)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_RGB", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_RGB)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_RGBA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_RGBA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_INT16", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_INT16)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_FLOAT32", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_FLOAT32)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_BYTE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_BYTE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_FEATURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_FEATURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGEMODE_NULL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_IMAGEMODE_NULL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_EQUALS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_EQUALS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_DISJOINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_DISJOINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_TOUCHES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_TOUCHES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_OVERLAPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_OVERLAPS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_CROSSES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_CROSSES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_INTERSECTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_INTERSECTS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_WITHIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_WITHIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_CONTAINS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_CONTAINS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_BEYOND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_BEYOND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOS_DWITHIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GEOS_DWITHIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRANSFORM_NONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRANSFORM_NONE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRANSFORM_ROUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRANSFORM_ROUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRANSFORM_SNAPTOGRID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRANSFORM_SNAPTOGRID)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRANSFORM_FULLRESOLUTION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRANSFORM_FULLRESOLUTION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TRANSFORM_SIMPLIFY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TRANSFORM_SIMPLIFY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(12)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_SIZE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_WIDTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_WIDTH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_ANGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_ANGLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_COLOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_COLOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_OUTLINECOLOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_OUTLINECOLOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_SYMBOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_SYMBOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_OUTLINEWIDTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_OUTLINEWIDTH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_OPACITY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_OPACITY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_OFFSET_X", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_OFFSET_X)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_OFFSET_Y", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_OFFSET_Y)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_POLAROFFSET_PIXEL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_POLAROFFSET_PIXEL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_STYLE_BINDING_POLAROFFSET_ANGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_STYLE_BINDING_POLAROFFSET_ANGLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(9)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_SIZE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_ANGLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_ANGLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_COLOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_COLOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_OUTLINECOLOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_OUTLINECOLOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_FONT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_FONT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_PRIORITY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_PRIORITY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_POSITION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_POSITION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_SHADOWSIZEX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_SHADOWSIZEX)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_LABEL_BINDING_SHADOWSIZEY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_LABEL_BINDING_SHADOWSIZEY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_fontSetObj, (void*) "mapscript::fontSetObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LOGICAL_AND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LOGICAL_AND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LOGICAL_OR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LOGICAL_OR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LOGICAL_NOT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LOGICAL_NOT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LITERAL_NUMBER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LITERAL_NUMBER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LITERAL_STRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LITERAL_STRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LITERAL_TIME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LITERAL_TIME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_LITERAL_SHAPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_LITERAL_SHAPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_EQ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_EQ)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_NE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_NE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_GT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_GT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_LT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_LT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_LE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_LE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_GE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_GE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_IEQ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_IEQ)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_RE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_RE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_IRE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_IRE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_IN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_IN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_LIKE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_LIKE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_INTERSECTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_INTERSECTS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_DISJOINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_DISJOINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_TOUCHES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_TOUCHES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_OVERLAPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_OVERLAPS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_CROSSES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_CROSSES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_WITHIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_WITHIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_CONTAINS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_CONTAINS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_BEYOND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_BEYOND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_COMPARISON_DWITHIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_COMPARISON_DWITHIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_LENGTH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_TOSTRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_TOSTRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_COMMIFY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_COMMIFY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_AREA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_AREA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_ROUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_ROUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_FROMTEXT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_FROMTEXT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_BUFFER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_BUFFER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_FUNCTION_DIFFERENCE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_FUNCTION_DIFFERENCE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_BINDING_DOUBLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_BINDING_DOUBLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_BINDING_INTEGER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_BINDING_INTEGER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_BINDING_STRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_BINDING_STRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_BINDING_TIME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_BINDING_TIME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TOKEN_BINDING_SHAPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_TOKEN_BINDING_SHAPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PARSE_TYPE_BOOLEAN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PARSE_TYPE_BOOLEAN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PARSE_TYPE_STRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PARSE_TYPE_STRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PARSE_TYPE_SHAPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_PARSE_TYPE_SHAPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_clusterObj, (void*) "mapscript::clusterObj");
   SWIG_TypeClientData(SWIGTYPE_p_outputFormatObj, (void*) "mapscript::outputFormatObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NOOVERRIDE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(-1111)));
     SvREADONLY_on(sv);
@@ -46572,449 +46594,449 @@ XS(SWIG_init) {
   SWIG_TypeClientData(SWIGTYPE_p_pointObj, (void*) "mapscript::pointObj");
   SWIG_TypeClientData(SWIGTYPE_p_lineObj, (void*) "mapscript::lineObj");
   SWIG_TypeClientData(SWIGTYPE_p_shapeObj, (void*) "mapscript::shapeObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SHX_BUFFER_PAGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1024)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPEFILE_POINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPEFILE_ARC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPEFILE_POLYGON", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHAPEFILE_MULTIPOINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(8)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_POINTZ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(11)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_ARCZ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(13)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_POLYGONZ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(15)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_MULTIPOINTZ", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(18)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_POINTM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(21)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_ARCM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(23)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_POLYGONM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(25)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHP_MULTIPOINTM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(28)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_DBFInfo, (void*) "mapscript::DBFInfo");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "FTString", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(FTString)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "FTInteger", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(FTInteger)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "FTDouble", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(FTDouble)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "FTInvalid", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(FTInvalid)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_shapefileObj, (void*) "mapscript::shapefileObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "wkp_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "wkp_lonlat", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "wkp_gmerc", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_projectionObj, (void*) "mapscript::projectionObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_SIMPLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_SIMPLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_VECTOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_VECTOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_ELLIPSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_ELLIPSE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_PIXMAP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_PIXMAP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_TRUETYPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_TRUETYPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_HATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_HATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_SVG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_SYMBOL_SVG)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMBOL_ALLOCSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(64)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MAXVECTORPOINTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(100)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MAXPATTERNLENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(10)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMAGECACHESIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(6)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_colorObj, (void*) "mapscript::colorObj");
   SWIG_TypeClientData(SWIGTYPE_p_symbolObj, (void*) "mapscript::symbolObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NOERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IOERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MEMERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TYPEERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SYMERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(4)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_REGEXERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TTFERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(6)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DBFERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(7)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GDERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(8)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IDENTERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(9)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_EOFERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(10)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PROJERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(11)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MISCERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(12)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CGIERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(13)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WEBERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(14)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_IMGERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(15)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_HASHERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(16)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_JOINERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(17)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NOTFOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(18)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SHPERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(19)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_PARSEERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(20)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SDEERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(21)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_OGRERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(22)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_QUERYERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(23)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WMSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(24)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WMSCONNERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(25)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ORACLESPATIALERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(26)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WFSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(27)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WFSCONNERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(28)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_MAPCONTEXTERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(29)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_HTTPERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(30)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_CHILDERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(31)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_WCSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(32)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GEOSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(33)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RECTERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(34)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_TIMEERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(35)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GMLERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(36)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_SOSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(37)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NULLPARENTERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(38)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_AGGERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(39)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_OWSERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(40)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_OGLERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(42)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_RENDERERERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(43)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_NUMERRORCODES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(44)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MESSAGELENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2048)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "ROUTINELENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(64)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_ERROR_LANGUAGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("en-US"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_errorObj, (void*) "mapscript::errorObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_ERRORSONLY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_ERRORSONLY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_DEBUG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_DEBUG)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_TUNING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_TUNING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_V", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_V)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_VV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_VV)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEBUGLEVEL_VVV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_DEBUGLEVEL_VVV)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_HASHSIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(41)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   SWIG_TypeClientData(SWIGTYPE_p_hashTableObj, (void*) "mapscript::hashTableObj");
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_DEFAULT_CGI_PARAMS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(100)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_GET_REQUEST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_GET_REQUEST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig1.3/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/usr/share/swig2.0/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "MS_POST_REQUEST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(MS_POST_REQUEST)));
     SvREADONLY_on(sv);
diff --git a/mapscript/php/php_mapscript.c b/mapscript/php/php_mapscript.c
index f757d9f..f1bd327 100644
--- a/mapscript/php/php_mapscript.c
+++ b/mapscript/php/php_mapscript.c
@@ -169,7 +169,7 @@ PHP_FUNCTION(ms_newMapObjFromString)
   map = mapObj_newFromString(string, path);
 
   if (map == NULL) {
-    mapscript_throw_mapserver_exception("Failed to open map file \"%s\", or map file error." TSRMLS_CC,  string);
+    mapscript_throw_mapserver_exception("Error while loading map file from string." TSRMLS_CC);
     return;
   }
 
diff --git a/mapscript/python/mapscript.py b/mapscript/python/mapscript.py
index 6b43c81..cc8414d 100644
--- a/mapscript/python/mapscript.py
+++ b/mapscript/python/mapscript.py
@@ -1,9 +1,10 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.40
+# Version 2.0.7
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
-# This file is compatible with both classic and new-style classes.
+
+
 
 from sys import version_info
 if version_info >= (2,6,0):
@@ -39,7 +40,7 @@ def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static) or hasattr(self,name):
+    if (not static):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -644,7 +645,7 @@ class styleObj(_object):
     __swig_setmethods__["maxscaledenom"] = _mapscript.styleObj_maxscaledenom_set
     __swig_getmethods__["maxscaledenom"] = _mapscript.styleObj_maxscaledenom_get
     if _newclass:maxscaledenom = _swig_property(_mapscript.styleObj_maxscaledenom_get, _mapscript.styleObj_maxscaledenom_set)
-    def __init__(self, parent_class = None): 
+    def __init__(self, parent_class=None): 
         this = _mapscript.new_styleObj(parent_class)
         try: self.this.append(this)
         except: self.this = this
@@ -889,7 +890,7 @@ class classObj(_object):
     __swig_setmethods__["leader"] = _mapscript.classObj_leader_set
     __swig_getmethods__["leader"] = _mapscript.classObj_leader_get
     if _newclass:leader = _swig_property(_mapscript.classObj_leader_get, _mapscript.classObj_leader_set)
-    def __init__(self, layer = None): 
+    def __init__(self, layer=None): 
         this = _mapscript.new_classObj(layer)
         try: self.this.append(this)
         except: self.this = this
@@ -1104,7 +1105,7 @@ class symbolSetObj(_object):
     if _newclass:numsymbols = _swig_property(_mapscript.symbolSetObj_numsymbols_get)
     __swig_getmethods__["maxsymbols"] = _mapscript.symbolSetObj_maxsymbols_get
     if _newclass:maxsymbols = _swig_property(_mapscript.symbolSetObj_maxsymbols_get)
-    def __init__(self, symbolfile = None): 
+    def __init__(self, symbolfile=None): 
         this = _mapscript.new_symbolSetObj(symbolfile)
         try: self.this.append(this)
         except: self.this = this
@@ -1485,7 +1486,7 @@ class layerObj(_object):
     __swig_setmethods__["mask"] = _mapscript.layerObj_mask_set
     __swig_getmethods__["mask"] = _mapscript.layerObj_mask_get
     if _newclass:mask = _swig_property(_mapscript.layerObj_mask_get, _mapscript.layerObj_mask_set)
-    def __init__(self, map = None): 
+    def __init__(self, map=None): 
         this = _mapscript.new_layerObj(map)
         try: self.this.append(this)
         except: self.this = this
@@ -1675,7 +1676,7 @@ class mapObj(_object):
     if _newclass:templatepattern = _swig_property(_mapscript.mapObj_templatepattern_get, _mapscript.mapObj_templatepattern_set)
     __swig_getmethods__["configoptions"] = _mapscript.mapObj_configoptions_get
     if _newclass:configoptions = _swig_property(_mapscript.mapObj_configoptions_get)
-    def __init__(self, filename = ""): 
+    def __init__(self, filename=""): 
         this = _mapscript.new_mapObj(filename)
         try: self.this.append(this)
         except: self.this = this
@@ -2540,7 +2541,7 @@ class hashTableObj(_object):
     def get(self, *args): return _mapscript.hashTableObj_get(self, *args)
     def remove(self, *args): return _mapscript.hashTableObj_remove(self, *args)
     def clear(self, *args): return _mapscript.hashTableObj_clear(self, *args)
-    def nextKey(self, prevkey = None): return _mapscript.hashTableObj_nextKey(self, prevkey)
+    def nextKey(self, prevkey=None): return _mapscript.hashTableObj_nextKey(self, prevkey)
 hashTableObj_swigregister = _mapscript.hashTableObj_swigregister
 hashTableObj_swigregister(hashTableObj)
 
@@ -2649,5 +2650,6 @@ def fromstring(data, mappath=None):
     else:
         raise ValueError, "No map, layer, class, or style found. Can not load from provided string"
 
+# This file is compatible with both classic and new-style classes.
 
 
diff --git a/mapscript/python/mapscript_wrap.c b/mapscript/python/mapscript_wrap.c
index 23b718d..8c80260 100644
--- a/mapscript/python/mapscript_wrap.c
+++ b/mapscript/python/mapscript_wrap.c
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 2.0.7
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -177,7 +177,7 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -732,7 +732,16 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define PyInt_Check(x) PyLong_Check(x)
 #define PyInt_AsLong(x) PyLong_AsLong(x)
 #define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
+#define PyString_Check(name) PyBytes_Check(name)
+#define PyString_FromString(x) PyUnicode_FromString(x)
 #define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
+#define PyString_AsString(str) PyBytes_AsString(str)
+#define PyString_Size(str) PyBytes_Size(str)	
+#define PyString_InternFromString(key) PyUnicode_InternFromString(key)
+#define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE
+#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x)
+#define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x)
 
 #endif
 
@@ -872,6 +881,63 @@ PyObject *PyBool_FromLong(long ok)
 typedef int Py_ssize_t;
 # define PY_SSIZE_T_MAX INT_MAX
 # define PY_SSIZE_T_MIN INT_MIN
+typedef inquiry lenfunc;
+typedef intargfunc ssizeargfunc;
+typedef intintargfunc ssizessizeargfunc;
+typedef intobjargproc ssizeobjargproc;
+typedef intintobjargproc ssizessizeobjargproc;
+typedef getreadbufferproc readbufferproc;
+typedef getwritebufferproc writebufferproc;
+typedef getsegcountproc segcountproc;
+typedef getcharbufferproc charbufferproc;
+static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
+{
+  long result = 0;
+  PyObject *i = PyNumber_Int(x);
+  if (i) {
+    result = PyInt_AsLong(i);
+    Py_DECREF(i);
+  }
+  return result;
+}
+#endif
+
+#if PY_VERSION_HEX < 0x02040000
+#define Py_VISIT(op)				\
+  do { 						\
+    if (op) {					\
+      int vret = visit((op), arg);		\
+      if (vret)					\
+        return vret;				\
+    }						\
+  } while (0)
+#endif
+
+#if PY_VERSION_HEX < 0x02030000
+typedef struct {
+  PyTypeObject type;
+  PyNumberMethods as_number;
+  PyMappingMethods as_mapping;
+  PySequenceMethods as_sequence;
+  PyBufferProcs as_buffer;
+  PyObject *name, *slots;
+} PyHeapTypeObject;
+#endif
+
+#if PY_VERSION_HEX < 0x02030000
+typedef destructor freefunc;
+#endif
+
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
+     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
+     (PY_MAJOR_VERSION > 3))
+# define SWIGPY_USE_CAPSULE
+# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
+#endif
+
+#if PY_VERSION_HEX < 0x03020000
+#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
+#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -1018,9 +1084,6 @@ SWIG_Python_AddErrorMsg(const char* mesg)
 
 #ifdef __cplusplus
 extern "C" {
-#if 0
-} /* cc-mode */
-#endif
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -1046,27 +1109,24 @@ typedef struct swig_const_info {
  * Wrapper of PyInstanceMethod_New() used in Python 3
  * It is exported to the generated module, used for -fastproxy
  * ----------------------------------------------------------------------------- */
-SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
-{
 #if PY_VERSION_HEX >= 0x03000000
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
+{
   return PyInstanceMethod_New(func);
+}
 #else
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
+{
   return NULL;
-#endif
 }
+#endif
 
 #ifdef __cplusplus
-#if 0
-{ /* cc-mode */
-#endif
 }
 #endif
 
 
 /* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
  * pyrun.swg
  *
  * This file contains the runtime support for Python modules
@@ -1081,7 +1141,15 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
 #define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
 #define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
 #define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(ptr, type, flags)
+
+#ifdef SWIGPYTHON_BUILTIN
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(self, ptr, type, flags)
+#else
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
+#endif
+
+#define SWIG_InternalNewPointerObj(ptr, type, flags)	SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
+
 #define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
 #define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
 #define swig_owntype                                    int
@@ -1096,7 +1164,7 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)
 
 /* for C or C++ function pointers */
 #define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
-#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(ptr, type, 0)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(NULL, ptr, type, 0)
 
 /* for C++ member pointers, ie, member methods */
 #define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
@@ -1131,7 +1199,7 @@ SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
 SWIGINTERN void 
 SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
   SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-  PyErr_SetString(errtype, (char *) msg);
+  PyErr_SetString(errtype, msg);
   SWIG_PYTHON_THREAD_END_BLOCK;
 }
 
@@ -1139,12 +1207,41 @@ SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
 
 /* Set a constant value */
 
+#if defined(SWIGPYTHON_BUILTIN)
+
+SWIGINTERN void
+SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
+  PyObject *s = PyString_InternFromString(key);
+  PyList_Append(seq, s);
+  Py_DECREF(s);
+}
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
+#if PY_VERSION_HEX < 0x02030000
+  PyDict_SetItemString(d, (char *)name, obj);
+#else
+  PyDict_SetItemString(d, name, obj);
+#endif
+  Py_DECREF(obj);
+  if (public_interface)
+    SwigPyBuiltin_AddPublicSymbol(public_interface, name);
+}
+
+#else
+
 SWIGINTERN void
 SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
-  PyDict_SetItemString(d, (char*) name, obj);
+#if PY_VERSION_HEX < 0x02030000
+  PyDict_SetItemString(d, (char *)name, obj);
+#else
+  PyDict_SetItemString(d, name, obj);
+#endif
   Py_DECREF(obj);                            
 }
 
+#endif
+
 /* Append a value to the result obj */
 
 SWIGINTERN PyObject*
@@ -1205,6 +1302,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
     }
   }  
   if (!PyTuple_Check(args)) {
+    if (min <= 1 && max >= 1) {
+      register int i;
+      objs[0] = args;
+      for (i = 1; i < max; ++i) {
+	objs[i] = 0;
+      }
+      return 2;
+    }
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
@@ -1257,11 +1362,11 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
 
 #define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
 
+#define SWIG_BUILTIN_TP_INIT	    (SWIG_POINTER_OWN << 2)
+#define SWIG_BUILTIN_INIT	    (SWIG_BUILTIN_TP_INIT | SWIG_POINTER_OWN)
+
 #ifdef __cplusplus
 extern "C" {
-#if 0
-} /* cc-mode */
-#endif
 #endif
 
 /*  How to access Py_None */
@@ -1312,6 +1417,7 @@ typedef struct {
   PyObject *destroy;
   int delargs;
   int implicitconv;
+  PyTypeObject *pytype;
 } SwigPyClientData;
 
 SWIGRUNTIMEINLINE int 
@@ -1378,13 +1484,13 @@ SwigPyClientData_New(PyObject* obj)
       data->delargs = 0;
     }
     data->implicitconv = 0;
+    data->pytype = 0;
     return data;
   }
 }
 
 SWIGRUNTIME void 
-SwigPyClientData_Del(SwigPyClientData* data)
-{
+SwigPyClientData_Del(SwigPyClientData *data) {
   Py_XDECREF(data->newraw);
   Py_XDECREF(data->newargs);
   Py_XDECREF(data->destroy);
@@ -1398,6 +1504,9 @@ typedef struct {
   swig_type_info *ty;
   int own;
   PyObject *next;
+#ifdef SWIGPYTHON_BUILTIN
+  PyObject *dict;
+#endif
 } SwigPyObject;
 
 SWIGRUNTIME PyObject *
@@ -1448,21 +1557,21 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 #endif
 {
   const char *name = SWIG_TypePrettyName(v->ty);
-  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", name, v);
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
   if (v->next) {
-#ifdef METH_NOARGS
+# ifdef METH_NOARGS
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
-#else
+# else
     PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
-#endif
-#if PY_VERSION_HEX >= 0x03000000
+# endif
+# if PY_VERSION_HEX >= 0x03000000
     PyObject *joined = PyUnicode_Concat(repr, nrep);
     Py_DecRef(repr);
     Py_DecRef(nrep);
     repr = joined;
-#else
+# else
     PyString_ConcatAndDel(&repr,nrep);
-#endif
+# endif
   }
   return repr;  
 }
@@ -1512,27 +1621,43 @@ SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
     Py_INCREF(Py_NotImplemented);
     return Py_NotImplemented;
   }
-  if( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) )
-    res = Py_True;
-  else
-    res = Py_False;
-  Py_INCREF(res);
+  res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0);
   return res;  
 }
 
 
-SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
+SWIGRUNTIME PyTypeObject* SwigPyObject_TypeOnce(void);
 
+#ifdef SWIGPYTHON_BUILTIN
+static swig_type_info *SwigPyObject_stype = 0;
 SWIGRUNTIME PyTypeObject*
 SwigPyObject_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
+    SwigPyClientData *cd;
+    assert(SwigPyObject_stype);
+    cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
+    assert(cd);
+    assert(cd->pytype);
+    return cd->pytype;
+}
+#else
+SWIGRUNTIME PyTypeObject*
+SwigPyObject_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyObject_TypeOnce();
   return type;
 }
+#endif
 
 SWIGRUNTIMEINLINE int
 SwigPyObject_Check(PyObject *op) {
+#ifdef SWIGPYTHON_BUILTIN
+  PyTypeObject *target_tp = SwigPyObject_type();
+  if (PyType_IsSubtype(op->ob_type, target_tp))
+    return 1;
+  return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0);
+#else
   return (Py_TYPE(op) == SwigPyObject_type())
     || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
+#endif
 }
 
 SWIGRUNTIME PyObject *
@@ -1636,8 +1761,10 @@ SwigPyObject_own(PyObject *v, PyObject *args)
   PyObject *val = 0;
 #if (PY_VERSION_HEX < 0x02020000)
   if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
-#else
+#elif (PY_VERSION_HEX < 0x02050000)
   if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
+#else
+  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
 #endif
     {
       return NULL;
@@ -1698,9 +1825,9 @@ SwigPyObject_getattr(SwigPyObject *sobj,char *name)
 #endif
 
 SWIGRUNTIME PyTypeObject*
-_PySwigObject_type(void) {
+SwigPyObject_TypeOnce(void) {
   static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
-  
+
   static PyNumberMethods SwigPyObject_as_number = {
     (binaryfunc)0, /*nb_add*/
     (binaryfunc)0, /*nb_subtract*/
@@ -1747,85 +1874,89 @@ _PySwigObject_type(void) {
 #endif
   };
 
-  static PyTypeObject swigpyobject_type;  
+  static PyTypeObject swigpyobject_type;
   static int type_init = 0;
   if (!type_init) {
-    const PyTypeObject tmp
-      = {
-	/* PyObject header changed in Python 3 */
+    const PyTypeObject tmp = {
+      /* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX >= 0x03000000
-	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-#else    
-	PyObject_HEAD_INIT(NULL)
-	0,				    /* ob_size */
+      PyVarObject_HEAD_INIT(NULL, 0)
+#else
+      PyObject_HEAD_INIT(NULL)
+      0,                                    /* ob_size */
 #endif
-	(char *)"SwigPyObject",		    /* tp_name */
-	sizeof(SwigPyObject),		    /* tp_basicsize */
-	0,			            /* tp_itemsize */
-	(destructor)SwigPyObject_dealloc,   /* tp_dealloc */
-	(printfunc)SwigPyObject_print,	    /* tp_print */
+      (char *)"SwigPyObject",               /* tp_name */
+      sizeof(SwigPyObject),                 /* tp_basicsize */
+      0,                                    /* tp_itemsize */
+      (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
+      (printfunc)SwigPyObject_print,        /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
-	(getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
+      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
-	(getattrfunc)0,			    /* tp_getattr */ 
+      (getattrfunc)0,                       /* tp_getattr */
 #endif
-	(setattrfunc)0,			    /* tp_setattr */ 
+      (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX >= 0x03000000
     0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
 #else
-	(cmpfunc)SwigPyObject_compare,	    /* tp_compare */
+      (cmpfunc)SwigPyObject_compare,        /* tp_compare */
 #endif
-	(reprfunc)SwigPyObject_repr,	    /* tp_repr */    
-	&SwigPyObject_as_number,	    /* tp_as_number */
-	0,				    /* tp_as_sequence */
-	0,				    /* tp_as_mapping */
-	(hashfunc)0,			    /* tp_hash */
-	(ternaryfunc)0,			    /* tp_call */
-	(reprfunc)SwigPyObject_str,	    /* tp_str */
-	PyObject_GenericGetAttr,            /* tp_getattro */
-	0,				    /* tp_setattro */
-	0,		                    /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
-	swigobject_doc, 	            /* tp_doc */        
-	0,                                  /* tp_traverse */
-	0,                                  /* tp_clear */
-	(richcmpfunc)SwigPyObject_richcompare,           /* tp_richcompare */
-	0,                                  /* tp_weaklistoffset */
+      (reprfunc)SwigPyObject_repr,          /* tp_repr */
+      &SwigPyObject_as_number,              /* tp_as_number */
+      0,                                    /* tp_as_sequence */
+      0,                                    /* tp_as_mapping */
+      (hashfunc)0,                          /* tp_hash */
+      (ternaryfunc)0,                       /* tp_call */
+      (reprfunc)SwigPyObject_str,           /* tp_str */
+      PyObject_GenericGetAttr,              /* tp_getattro */
+      0,                                    /* tp_setattro */
+      0,                                    /* tp_as_buffer */
+      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
+      swigobject_doc,                       /* tp_doc */
+      0,                                    /* tp_traverse */
+      0,                                    /* tp_clear */
+      (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
+      0,                                    /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
-	0,                                  /* tp_iter */
-	0,                                  /* tp_iternext */
-	swigobject_methods,		    /* tp_methods */ 
-	0,			            /* tp_members */
-	0,				    /* tp_getset */	    	
-	0,			            /* tp_base */	        
-	0,				    /* tp_dict */	    	
-	0,				    /* tp_descr_get */  	
-	0,				    /* tp_descr_set */  	
-	0,				    /* tp_dictoffset */ 	
-	0,				    /* tp_init */	    	
-	0,				    /* tp_alloc */	    	
-	0,			            /* tp_new */	    	
-	0,	                            /* tp_free */	   
-	0,                                  /* tp_is_gc */  
-	0,				    /* tp_bases */   
-	0,				    /* tp_mro */
-	0,				    /* tp_cache */   
-	0,				    /* tp_subclasses */
-	0,				    /* tp_weaklist */
+      0,                                    /* tp_iter */
+      0,                                    /* tp_iternext */
+      swigobject_methods,                   /* tp_methods */
+      0,                                    /* tp_members */
+      0,                                    /* tp_getset */
+      0,                                    /* tp_base */
+      0,                                    /* tp_dict */
+      0,                                    /* tp_descr_get */
+      0,                                    /* tp_descr_set */
+      0,                                    /* tp_dictoffset */
+      0,                                    /* tp_init */
+      0,                                    /* tp_alloc */
+      0,                                    /* tp_new */
+      0,                                    /* tp_free */
+      0,                                    /* tp_is_gc */
+      0,                                    /* tp_bases */
+      0,                                    /* tp_mro */
+      0,                                    /* tp_cache */
+      0,                                    /* tp_subclasses */
+      0,                                    /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
-	0,                                  /* tp_del */
+      0,                                    /* tp_del */
+#endif
+#if PY_VERSION_HEX >= 0x02060000
+      0,                                    /* tp_version */
 #endif
 #ifdef COUNT_ALLOCS
-	0,0,0,0                             /* tp_alloc -> tp_next */
+      0,0,0,0                               /* tp_alloc -> tp_next */
 #endif
-      };
+    };
     swigpyobject_type = tmp;
-    /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
+    type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
     swigpyobject_type.ob_type = &PyType_Type;
+#else
+    if (PyType_Ready(&swigpyobject_type) < 0)
+      return NULL;
 #endif
-    type_init = 1;
   }
   return &swigpyobject_type;
 }
@@ -1899,17 +2030,17 @@ SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
   return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
 }
 
-SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
+SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
 
 SWIGRUNTIME PyTypeObject*
 SwigPyPacked_type(void) {
-  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyPacked_TypeOnce();
   return type;
 }
 
 SWIGRUNTIMEINLINE int
 SwigPyPacked_Check(PyObject *op) {
-  return ((op)->ob_type == _PySwigPacked_type()) 
+  return ((op)->ob_type == SwigPyPacked_TypeOnce()) 
     || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
 }
 
@@ -1924,83 +2055,87 @@ SwigPyPacked_dealloc(PyObject *v)
 }
 
 SWIGRUNTIME PyTypeObject*
-_PySwigPacked_type(void) {
+SwigPyPacked_TypeOnce(void) {
   static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
   static PyTypeObject swigpypacked_type;
-  static int type_init = 0;  
+  static int type_init = 0;
   if (!type_init) {
-    const PyTypeObject tmp
-      = {
-    /* PyObject header changed in Python 3 */
+    const PyTypeObject tmp = {
+      /* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX>=0x03000000
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+      PyVarObject_HEAD_INIT(NULL, 0)
 #else
-	PyObject_HEAD_INIT(NULL)
-    0,				    /* ob_size */	
+      PyObject_HEAD_INIT(NULL)
+      0,                                    /* ob_size */
 #endif
-	(char *)"SwigPyPacked",		    /* tp_name */	
-	sizeof(SwigPyPacked),		    /* tp_basicsize */	
-	0,				    /* tp_itemsize */	
-	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */	
-	(printfunc)SwigPyPacked_print,	    /* tp_print */   	
-	(getattrfunc)0,			    /* tp_getattr */ 	
-	(setattrfunc)0,			    /* tp_setattr */ 	
+      (char *)"SwigPyPacked",               /* tp_name */
+      sizeof(SwigPyPacked),                 /* tp_basicsize */
+      0,                                    /* tp_itemsize */
+      (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
+      (printfunc)SwigPyPacked_print,        /* tp_print */
+      (getattrfunc)0,                       /* tp_getattr */
+      (setattrfunc)0,                       /* tp_setattr */
 #if PY_VERSION_HEX>=0x03000000
-    0, /* tp_reserved in 3.0.1 */
+      0, /* tp_reserved in 3.0.1 */
 #else
-    (cmpfunc)SwigPyPacked_compare,	    /* tp_compare */
+      (cmpfunc)SwigPyPacked_compare,        /* tp_compare */
 #endif
-	(reprfunc)SwigPyPacked_repr,	    /* tp_repr */
-	0,	                            /* tp_as_number */
-	0,				    /* tp_as_sequence */
-	0,				    /* tp_as_mapping */
-	(hashfunc)0,			    /* tp_hash */
-	(ternaryfunc)0,			    /* tp_call */
-	(reprfunc)SwigPyPacked_str,	    /* tp_str */
-	PyObject_GenericGetAttr,            /* tp_getattro */
-	0,				    /* tp_setattro */
-	0,		                    /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
-	swigpacked_doc, 	            /* tp_doc */
-	0,                                  /* tp_traverse */
-	0,                                  /* tp_clear */
-	0,                                  /* tp_richcompare */
-	0,                                  /* tp_weaklistoffset */
+      (reprfunc)SwigPyPacked_repr,          /* tp_repr */
+      0,                                    /* tp_as_number */
+      0,                                    /* tp_as_sequence */
+      0,                                    /* tp_as_mapping */
+      (hashfunc)0,                          /* tp_hash */
+      (ternaryfunc)0,                       /* tp_call */
+      (reprfunc)SwigPyPacked_str,           /* tp_str */
+      PyObject_GenericGetAttr,              /* tp_getattro */
+      0,                                    /* tp_setattro */
+      0,                                    /* tp_as_buffer */
+      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
+      swigpacked_doc,                       /* tp_doc */
+      0,                                    /* tp_traverse */
+      0,                                    /* tp_clear */
+      0,                                    /* tp_richcompare */
+      0,                                    /* tp_weaklistoffset */
 #if PY_VERSION_HEX >= 0x02020000
-	0,                                  /* tp_iter */
-	0,                                  /* tp_iternext */
-	0,		                    /* tp_methods */ 
-	0,			            /* tp_members */
-	0,				    /* tp_getset */	    	
-	0,			            /* tp_base */	        
-	0,				    /* tp_dict */	    	
-	0,				    /* tp_descr_get */  	
-	0,				    /* tp_descr_set */  	
-	0,				    /* tp_dictoffset */ 	
-	0,				    /* tp_init */	    	
-	0,				    /* tp_alloc */	    	
-	0,			            /* tp_new */	    	
-	0, 	                            /* tp_free */	   
-        0,                                  /* tp_is_gc */  
-	0,				    /* tp_bases */   
-	0,				    /* tp_mro */
-	0,				    /* tp_cache */   
- 	0,				    /* tp_subclasses */
-	0,				    /* tp_weaklist */
+      0,                                    /* tp_iter */
+      0,                                    /* tp_iternext */
+      0,                                    /* tp_methods */
+      0,                                    /* tp_members */
+      0,                                    /* tp_getset */
+      0,                                    /* tp_base */
+      0,                                    /* tp_dict */
+      0,                                    /* tp_descr_get */
+      0,                                    /* tp_descr_set */
+      0,                                    /* tp_dictoffset */
+      0,                                    /* tp_init */
+      0,                                    /* tp_alloc */
+      0,                                    /* tp_new */
+      0,                                    /* tp_free */
+      0,                                    /* tp_is_gc */
+      0,                                    /* tp_bases */
+      0,                                    /* tp_mro */
+      0,                                    /* tp_cache */
+      0,                                    /* tp_subclasses */
+      0,                                    /* tp_weaklist */
 #endif
 #if PY_VERSION_HEX >= 0x02030000
-	0,                                  /* tp_del */
+      0,                                    /* tp_del */
+#endif
+#if PY_VERSION_HEX >= 0x02060000
+      0,                                    /* tp_version */
 #endif
 #ifdef COUNT_ALLOCS
-	0,0,0,0                             /* tp_alloc -> tp_next */
+      0,0,0,0                               /* tp_alloc -> tp_next */
 #endif
-      };
+    };
     swigpypacked_type = tmp;
-    /* for Python 3 the ob_type already assigned in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
+    type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
     swigpypacked_type.ob_type = &PyType_Type;
+#else
+    if (PyType_Ready(&swigpypacked_type) < 0)
+      return NULL;
 #endif
-    type_init = 1;
   }
   return &swigpypacked_type;
 }
@@ -2047,10 +2182,13 @@ _SWIG_This(void)
     return SWIG_Python_str_FromChar("this");
 }
 
+static PyObject *swig_this = NULL;
+
 SWIGRUNTIME PyObject *
 SWIG_This(void)
 {
-  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();
+  if (swig_this == NULL)
+    swig_this = _SWIG_This();
   return swig_this;
 }
 
@@ -2064,50 +2202,65 @@ SWIG_This(void)
 SWIGRUNTIME SwigPyObject *
 SWIG_Python_GetSwigThis(PyObject *pyobj) 
 {
-  if (SwigPyObject_Check(pyobj)) {
+  PyObject *obj;
+
+  if (SwigPyObject_Check(pyobj))
     return (SwigPyObject *) pyobj;
-  } else {
-    PyObject *obj = 0;
+
+#ifdef SWIGPYTHON_BUILTIN
+  (void)obj;
+# ifdef PyWeakref_CheckProxy
+  if (PyWeakref_CheckProxy(pyobj)) {
+    pyobj = PyWeakref_GET_OBJECT(pyobj);
+    if (pyobj && SwigPyObject_Check(pyobj))
+      return (SwigPyObject*) pyobj;
+  }
+# endif
+  return NULL;
+#else
+
+  obj = 0;
+
 #if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
-    if (PyInstance_Check(pyobj)) {
-      obj = _PyInstance_Lookup(pyobj, SWIG_This());      
+  if (PyInstance_Check(pyobj)) {
+    obj = _PyInstance_Lookup(pyobj, SWIG_This());      
+  } else {
+    PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
+    if (dictptr != NULL) {
+      PyObject *dict = *dictptr;
+      obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
     } else {
-      PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
-      if (dictptr != NULL) {
-	PyObject *dict = *dictptr;
-	obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
-      } else {
 #ifdef PyWeakref_CheckProxy
-	if (PyWeakref_CheckProxy(pyobj)) {
-	  PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
-	  return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
-	}
+      if (PyWeakref_CheckProxy(pyobj)) {
+	PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
+	return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
+      }
 #endif
-	obj = PyObject_GetAttr(pyobj,SWIG_This());
-	if (obj) {
-	  Py_DECREF(obj);
-	} else {
-	  if (PyErr_Occurred()) PyErr_Clear();
-	  return 0;
-	}
+      obj = PyObject_GetAttr(pyobj,SWIG_This());
+      if (obj) {
+	Py_DECREF(obj);
+      } else {
+	if (PyErr_Occurred()) PyErr_Clear();
+	return 0;
       }
     }
+  }
 #else
-    obj = PyObject_GetAttr(pyobj,SWIG_This());
-    if (obj) {
-      Py_DECREF(obj);
-    } else {
-      if (PyErr_Occurred()) PyErr_Clear();
-      return 0;
-    }
+  obj = PyObject_GetAttr(pyobj,SWIG_This());
+  if (obj) {
+    Py_DECREF(obj);
+  } else {
+    if (PyErr_Occurred()) PyErr_Clear();
+    return 0;
+  }
 #endif
-    if (obj && !SwigPyObject_Check(obj)) {
-      /* a PyObject is called 'this', try to get the 'real this'
-	 SwigPyObject from it */ 
-      return SWIG_Python_GetSwigThis(obj);
-    }
-    return (SwigPyObject *)obj;
+  if (obj && !SwigPyObject_Check(obj)) {
+    /* a PyObject is called 'this', try to get the 'real this'
+       SwigPyObject from it */ 
+    return SWIG_Python_GetSwigThis(obj);
   }
+  return (SwigPyObject *)obj;
+#endif
 }
 
 /* Acquire a pointer value */
@@ -2129,91 +2282,97 @@ SWIG_Python_AcquirePtr(PyObject *obj, int own) {
 
 SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
-  if (!obj) return SWIG_ERROR;
+  int res;
+  SwigPyObject *sobj;
+
+  if (!obj)
+    return SWIG_ERROR;
   if (obj == Py_None) {
-    if (ptr) *ptr = 0;
+    if (ptr)
+      *ptr = 0;
     return SWIG_OK;
-  } else {
-    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (own)
-      *own = 0;
-    while (sobj) {
-      void *vptr = sobj->ptr;
-      if (ty) {
-	swig_type_info *to = sobj->ty;
-	if (to == ty) {
-	  /* no type cast needed */
-	  if (ptr) *ptr = vptr;
-	  break;
-	} else {
-	  swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
-	  if (!tc) {
-	    sobj = (SwigPyObject *)sobj->next;
-	  } else {
-	    if (ptr) {
-              int newmemory = 0;
-              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-              if (newmemory == SWIG_CAST_NEW_MEMORY) {
-                assert(own);
-                if (own)
-                  *own = *own | SWIG_CAST_NEW_MEMORY;
-              }
-            }
-	    break;
-	  }
-	}
+  }
+
+  res = SWIG_ERROR;
+
+  sobj = SWIG_Python_GetSwigThis(obj);
+  if (own)
+    *own = 0;
+  while (sobj) {
+    void *vptr = sobj->ptr;
+    if (ty) {
+      swig_type_info *to = sobj->ty;
+      if (to == ty) {
+        /* no type cast needed */
+        if (ptr) *ptr = vptr;
+        break;
       } else {
-	if (ptr) *ptr = vptr;
-	break;
-      }
-    }
-    if (sobj) {
-      if (own)
-        *own = *own | sobj->own;
-      if (flags & SWIG_POINTER_DISOWN) {
-	sobj->own = 0;
+        swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+        if (!tc) {
+          sobj = (SwigPyObject *)sobj->next;
+        } else {
+          if (ptr) {
+            int newmemory = 0;
+            *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+            if (newmemory == SWIG_CAST_NEW_MEMORY) {
+              assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
+              if (own)
+                *own = *own | SWIG_CAST_NEW_MEMORY;
+            }
+          }
+          break;
+        }
       }
-      return SWIG_OK;
     } else {
-      int res = SWIG_ERROR;
-      if (flags & SWIG_POINTER_IMPLICIT_CONV) {
-	SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
-	if (data && !data->implicitconv) {
-	  PyObject *klass = data->klass;
-	  if (klass) {
-	    PyObject *impconv;
-	    data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
-	    impconv = SWIG_Python_CallFunctor(klass, obj);
-	    data->implicitconv = 0;
-	    if (PyErr_Occurred()) {
-	      PyErr_Clear();
-	      impconv = 0;
-	    }
-	    if (impconv) {
-	      SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
-	      if (iobj) {
-		void *vptr;
-		res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
-		if (SWIG_IsOK(res)) {
-		  if (ptr) {
-		    *ptr = vptr;
-		    /* transfer the ownership to 'ptr' */
-		    iobj->own = 0;
-		    res = SWIG_AddCast(res);
-		    res = SWIG_AddNewMask(res);
-		  } else {
-		    res = SWIG_AddCast(res);		    
-		  }
-		}
-	      }
-	      Py_DECREF(impconv);
-	    }
-	  }
-	}
+      if (ptr) *ptr = vptr;
+      break;
+    }
+  }
+  if (sobj) {
+    if (own)
+      *own = *own | sobj->own;
+    if (flags & SWIG_POINTER_DISOWN) {
+      sobj->own = 0;
+    }
+    res = SWIG_OK;
+  } else {
+    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+      SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
+      if (data && !data->implicitconv) {
+        PyObject *klass = data->klass;
+        if (klass) {
+          PyObject *impconv;
+          data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
+          impconv = SWIG_Python_CallFunctor(klass, obj);
+          data->implicitconv = 0;
+          if (PyErr_Occurred()) {
+            PyErr_Clear();
+            impconv = 0;
+          }
+          if (impconv) {
+            SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
+            if (iobj) {
+              void *vptr;
+              res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
+              if (SWIG_IsOK(res)) {
+                if (ptr) {
+                  *ptr = vptr;
+                  /* transfer the ownership to 'ptr' */
+                  iobj->own = 0;
+                  res = SWIG_AddCast(res);
+                  res = SWIG_AddNewMask(res);
+                } else {
+                  res = SWIG_AddCast(res);		    
+                }
+              }
+            }
+            Py_DECREF(impconv);
+          }
+        }
       }
-      return res;
     }
   }
+  return res;
 }
 
 /* Convert a function ptr value */
@@ -2367,7 +2526,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
 SWIGINTERN PyObject *
 SWIG_Python_InitShadowInstance(PyObject *args) {
   PyObject *obj[2];
-  if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
+  if (!SWIG_Python_UnpackTuple(args, "swiginit", 2, 2, obj)) {
     return NULL;
   } else {
     SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
@@ -2383,22 +2542,54 @@ SWIG_Python_InitShadowInstance(PyObject *args) {
 /* Create a new pointer object */
 
 SWIGRUNTIME PyObject *
-SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
-  if (!ptr) {
+SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int flags) {
+  SwigPyClientData *clientdata;
+  PyObject * robj;
+  int own;
+
+  if (!ptr)
     return SWIG_Py_Void();
-  } else {
-    int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
-    PyObject *robj = SwigPyObject_New(ptr, type, own);
-    SwigPyClientData *clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
-    if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
-      PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
-      if (inst) {
-	Py_DECREF(robj);
-	robj = inst;
+
+  clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
+  own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
+  if (clientdata && clientdata->pytype) {
+    SwigPyObject *newobj;
+    if (flags & SWIG_BUILTIN_TP_INIT) {
+      newobj = (SwigPyObject*) self;
+      if (newobj->ptr) {
+        PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0);
+        while (newobj->next)
+	  newobj = (SwigPyObject *) newobj->next;
+        newobj->next = next_self;
+        newobj = (SwigPyObject *)next_self;
       }
+    } else {
+      newobj = PyObject_New(SwigPyObject, clientdata->pytype);
+    }
+    if (newobj) {
+      newobj->ptr = ptr;
+      newobj->ty = type;
+      newobj->own = own;
+      newobj->next = 0;
+#ifdef SWIGPYTHON_BUILTIN
+      newobj->dict = 0;
+#endif
+      return (PyObject*) newobj;
+    }
+    return SWIG_Py_Void();
+  }
+
+  assert(!(flags & SWIG_BUILTIN_TP_INIT));
+
+  robj = SwigPyObject_New(ptr, type, own);
+  if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+    PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
+    if (inst) {
+      Py_DECREF(robj);
+      robj = inst;
     }
-    return robj;
   }
+  return robj;
 }
 
 /* Create a new packed object */
@@ -2424,8 +2615,12 @@ SWIG_Python_GetModule(void) {
 #ifdef SWIG_LINK_RUNTIME
     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
 #else
+# ifdef SWIGPY_USE_CAPSULE
+    type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
+# else
     type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
 				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+# endif
     if (PyErr_Occurred()) {
       PyErr_Clear();
       type_pointer = (void *)0;
@@ -2468,9 +2663,17 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o)
 #endif
 
 SWIGRUNTIME void
+#ifdef SWIGPY_USE_CAPSULE
+SWIG_Python_DestroyModule(PyObject *obj)
+#else
 SWIG_Python_DestroyModule(void *vptr)
+#endif
 {
+#ifdef SWIGPY_USE_CAPSULE
+  swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
+#else
   swig_module_info *swig_module = (swig_module_info *) vptr;
+#endif
   swig_type_info **types = swig_module->types;
   size_t i;
   for (i =0; i < swig_module->size; ++i) {
@@ -2481,25 +2684,33 @@ SWIG_Python_DestroyModule(void *vptr)
     }
   }
   Py_DECREF(SWIG_This());
+  swig_this = NULL;
 }
 
 SWIGRUNTIME void
 SWIG_Python_SetModule(swig_module_info *swig_module) {
-  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
-
 #if PY_VERSION_HEX >= 0x03000000
  /* Add a dummy module object into sys.modules */
   PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
 #else
-  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
-				   swig_empty_runtime_method_table);
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
 #endif
+#ifdef SWIGPY_USE_CAPSULE
+  PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
+  } else {
+    Py_XDECREF(pointer);
+  }
+#else
   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
   if (pointer && module) {
     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
   } else {
     Py_XDECREF(pointer);
   }
+#endif
 }
 
 /* The python cached type query */
@@ -2517,12 +2728,20 @@ SWIG_Python_TypeQuery(const char *type)
   PyObject *obj = PyDict_GetItem(cache, key);
   swig_type_info *descriptor;
   if (obj) {
+#ifdef SWIGPY_USE_CAPSULE
+    descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
+#else
     descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
+#endif
   } else {
     swig_module_info *swig_module = SWIG_Python_GetModule();
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
+#ifdef SWIGPY_USE_CAPSULE
+      obj = PyCapsule_New((void*) descriptor, NULL, NULL);
+#else
       obj = PyCObject_FromVoidPtr(descriptor, NULL);
+#endif
       PyDict_SetItem(cache, key, obj);
       Py_DECREF(obj);
     }
@@ -2583,7 +2802,7 @@ SwigPyObject_GetDesc(PyObject *self)
 {
   SwigPyObject *v = (SwigPyObject *)self;
   swig_type_info *ty = v ? v->ty : 0;
-  return ty ? ty->str : (char*)"";
+  return ty ? ty->str : "";
 }
 
 SWIGRUNTIME void
@@ -2626,7 +2845,7 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
 
 /* Convert a pointer value, signal an exception on a type mismatch */
 SWIGRUNTIME void *
-SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(argnum), int flags) {
   void *result;
   if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
     PyErr_Clear();
@@ -2640,11 +2859,62 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
   return result;
 }
 
+#ifdef SWIGPYTHON_BUILTIN
+SWIGRUNTIME int
+SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
+  PyTypeObject *tp = obj->ob_type;
+  PyObject *descr;
+  PyObject *encoded_name;
+  descrsetfunc f;
+  int res;
 
-#ifdef __cplusplus
-#if 0
-{ /* cc-mode */
+# ifdef Py_USING_UNICODE
+  if (PyString_Check(name)) {
+    name = PyUnicode_Decode(PyString_AsString(name), PyString_Size(name), NULL, NULL);
+    if (!name)
+      return -1;
+  } else if (!PyUnicode_Check(name))
+# else
+  if (!PyString_Check(name))
+# endif
+  {
+    PyErr_Format(PyExc_TypeError, "attribute name must be string, not '%.200s'", name->ob_type->tp_name);
+    return -1;
+  } else {
+    Py_INCREF(name);
+  }
+
+  if (!tp->tp_dict) {
+    if (PyType_Ready(tp) < 0)
+      goto done;
+  }
+
+  res = -1;
+  descr = _PyType_Lookup(tp, name);
+  f = NULL;
+  if (descr != NULL)
+    f = descr->ob_type->tp_descr_set;
+  if (!f) {
+    if (PyString_Check(name)) {
+      encoded_name = name;
+      Py_INCREF(name);
+    } else {
+      encoded_name = PyUnicode_AsUTF8String(name);
+    }
+    PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
+    Py_DECREF(encoded_name);
+  } else {
+    res = f(descr, obj, value);
+  }
+  
+  done:
+  Py_DECREF(name);
+  return res;
+}
 #endif
+
+
+#ifdef __cplusplus
 }
 #endif
 
@@ -2737,7 +3007,7 @@ static swig_module_info swig_module = {swig_types, 51, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_mapscript"
 
-#define SWIGVERSION 0x010340 
+#define SWIGVERSION 0x020007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2907,13 +3177,10 @@ SWIGINTERN int intarray___getitem__(intarray *self,size_t index){
     return self[index];
   }
 
-  #define SWIG_From_long   PyInt_FromLong 
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
+SWIGINTERNINLINE PyObject*
+  SWIG_From_int  (int value)
+{
+  return PyInt_FromLong((long) value);
 }
 
 
@@ -3067,7 +3334,7 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
     if (size > INT_MAX) {
       swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
       return pchar_descriptor ? 
-	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
+	SWIG_InternalNewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
     } else {
 #if PY_VERSION_HEX >= 0x03000000
       return PyUnicode_FromStringAndSize(carray, (int)(size));
@@ -3515,7 +3782,7 @@ SWIGINTERN int labelObj_moveStyleUp(labelObj *self,int index){
 SWIGINTERN int labelObj_moveStyleDown(labelObj *self,int index){
        return msMoveLabelStyleDown(self, index);
     }
-SWIGINTERN classObj *new_classObj(layerObj *layer){
+SWIGINTERN struct classObj *new_classObj(layerObj *layer){
         classObj *new_class=NULL;
         
         if (!layer)
@@ -3547,7 +3814,7 @@ SWIGINTERN classObj *new_classObj(layerObj *layer){
 
         return NULL;
     }
-SWIGINTERN void delete_classObj(classObj *self){
+SWIGINTERN void delete_classObj(struct classObj *self){
         if (self)
         {
             if (freeClass(self)==MS_SUCCESS) {
@@ -3556,10 +3823,10 @@ SWIGINTERN void delete_classObj(classObj *self){
 	    }
         }
     }
-SWIGINTERN int classObj_updateFromString(classObj *self,char *snippet){
+SWIGINTERN int classObj_updateFromString(struct classObj *self,char *snippet){
         return msUpdateClassFromString(self, snippet, 0);
     }
-SWIGINTERN classObj *classObj_clone(classObj *self){
+SWIGINTERN classObj *classObj_clone(struct classObj *self){
         classObj *new_class;
 
         new_class = (classObj *) malloc(sizeof(classObj));
@@ -3586,27 +3853,27 @@ SWIGINTERN classObj *classObj_clone(classObj *self){
         
         return new_class;
     }
-SWIGINTERN int classObj_setExpression(classObj *self,char *expression){
+SWIGINTERN int classObj_setExpression(struct classObj *self,char *expression){
     if (!expression || strlen(expression) == 0) {
        freeExpression(&self->expression);
        return MS_SUCCESS;
     }
     else return msLoadExpressionString(&self->expression, expression);
   }
-SWIGINTERN char *classObj_getExpressionString(classObj *self){
+SWIGINTERN char *classObj_getExpressionString(struct classObj *self){
     return msGetExpressionString(&(self->expression));
   }
-SWIGINTERN int classObj_setText(classObj *self,char *text){
+SWIGINTERN int classObj_setText(struct classObj *self,char *text){
     if (!text || strlen(text) == 0) {
       freeExpression(&self->text);
       return MS_SUCCESS;
     }	
     else return msLoadExpressionString(&self->text, text);
   }
-SWIGINTERN char *classObj_getTextString(classObj *self){
+SWIGINTERN char *classObj_getTextString(struct classObj *self){
     return msGetExpressionString(&(self->text));
   }
-SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
+SWIGINTERN char *classObj_getMetaData(struct classObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -3619,24 +3886,24 @@ SWIGINTERN char *classObj_getMetaData(classObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int classObj_setMetaData(classObj *self,char *name,char *value){
+SWIGINTERN int classObj_setMetaData(struct classObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN char *classObj_getFirstMetaDataKey(classObj *self){
+SWIGINTERN char *classObj_getFirstMetaDataKey(struct classObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->metadata));
   }
-SWIGINTERN char *classObj_getNextMetaDataKey(classObj *self,char *lastkey){
+SWIGINTERN char *classObj_getNextMetaDataKey(struct classObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
   }
-SWIGINTERN int classObj_drawLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
+SWIGINTERN int classObj_drawLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height,imageObj *dstImage,int dstX,int dstY){
     return msDrawLegendIcon(map, layer, self, width, height, dstImage, dstX, dstY);
   }
-SWIGINTERN imageObj *classObj_createLegendIcon(classObj *self,mapObj *map,layerObj *layer,int width,int height){
+SWIGINTERN imageObj *classObj_createLegendIcon(struct classObj *self,mapObj *map,layerObj *layer,int width,int height){
     return msCreateLegendIcon(map, layer, self, width, height);
   }
-SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
+SWIGINTERN labelObj *classObj_getLabel(struct classObj *self,int i){
     if (i >= 0 && i < self->numlabels) {
       MS_REFCNT_INCR(self->labels[i]);
       return self->labels[i];
@@ -3645,15 +3912,15 @@ SWIGINTERN labelObj *classObj_getLabel(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_addLabel(classObj *self,labelObj *label){
+SWIGINTERN int classObj_addLabel(struct classObj *self,labelObj *label){
     return msAddLabelToClass(self, label);
   }
-SWIGINTERN labelObj *classObj_removeLabel(classObj *self,int index){
+SWIGINTERN labelObj *classObj_removeLabel(struct classObj *self,int index){
     labelObj* label = (labelObj *) msRemoveLabelFromClass(self, index);
     if (label) MS_REFCNT_INCR(label);
     return label;
   }
-SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
+SWIGINTERN styleObj *classObj_getStyle(struct classObj *self,int i){
     if (i >= 0 && i < self->numstyles) {
       MS_REFCNT_INCR(self->styles[i]);
       return self->styles[i];
@@ -3662,23 +3929,26 @@ SWIGINTERN styleObj *classObj_getStyle(classObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN int classObj_insertStyle(classObj *self,styleObj *style,int index){
+SWIGINTERN int classObj_insertStyle(struct classObj *self,styleObj *style,int index){
     return msInsertStyle(self, style, index);
   }
-SWIGINTERN styleObj *classObj_removeStyle(classObj *self,int index){
+SWIGINTERN styleObj *classObj_removeStyle(struct classObj *self,int index){
     styleObj* style = (styleObj *) msRemoveStyle(self, index);
     if (style) MS_REFCNT_INCR(style);
     return style;
   }
-SWIGINTERN int classObj_moveStyleUp(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleUp(struct classObj *self,int index){
     return msMoveStyleUp(self, index);
   }
-SWIGINTERN int classObj_moveStyleDown(classObj *self,int index){
+SWIGINTERN int classObj_moveStyleDown(struct classObj *self,int index){
     return msMoveStyleDown(self, index);
   }
 SWIGINTERN void labelCacheObj_freeCache(labelCacheObj *self){
         msFreeLabelCache(self);    
     }
+
+  #define SWIG_From_long   PyLong_FromLong 
+
 SWIGINTERN resultObj *new_resultObj(long shapeindex){
         resultObj *result = (resultObj *) msSmallMalloc(sizeof(resultObj));
 
@@ -4016,7 +4286,7 @@ SWIGINTERN PyObject *imageObj_saveToString(imageObj *self){
         free(imgbytes);
         return imgstring;
     }
-SWIGINTERN layerObj *new_layerObj(mapObj *map){
+SWIGINTERN struct layerObj *new_layerObj(mapObj *map){
         layerObj *layer;
         int result;
         
@@ -4053,7 +4323,7 @@ SWIGINTERN layerObj *new_layerObj(mapObj *map){
             return (map->layers[map->numlayers-1]);
         }
     }
-SWIGINTERN void delete_layerObj(layerObj *self){
+SWIGINTERN void delete_layerObj(struct layerObj *self){
         /*if (!self->map) {*/
         if (self) {
             if(freeLayer(self)==MS_SUCCESS) {
@@ -4061,7 +4331,7 @@ SWIGINTERN void delete_layerObj(layerObj *self){
 	    }
         }
     }
-SWIGINTERN layerObj *layerObj_clone(layerObj *self){
+SWIGINTERN layerObj *layerObj_clone(struct layerObj *self){
         layerObj *layer;
         int result;
 
@@ -4088,20 +4358,20 @@ SWIGINTERN layerObj *layerObj_clone(layerObj *self){
         
         return layer;
     }
-SWIGINTERN int layerObj_updateFromString(layerObj *self,char *snippet){
+SWIGINTERN int layerObj_updateFromString(struct layerObj *self,char *snippet){
         return msUpdateLayerFromString(self, snippet, 0);
     }
-SWIGINTERN int layerObj_insertClass(layerObj *self,classObj *classobj,int index){
+SWIGINTERN int layerObj_insertClass(struct layerObj *self,classObj *classobj,int index){
         return msInsertClass(self, classobj, index);
     }
-SWIGINTERN classObj *layerObj_removeClass(layerObj *self,int index){
+SWIGINTERN classObj *layerObj_removeClass(struct layerObj *self,int index){
         classObj* c = msRemoveClass(self, index);
 	if (c != NULL) {
 		MS_REFCNT_INCR(c);
 	}
 	return c;
     }
-SWIGINTERN int layerObj_open(layerObj *self){
+SWIGINTERN int layerObj_open(struct layerObj *self){
         int status;
         status =  msLayerOpen(self);
         if (status == MS_SUCCESS) {
@@ -4109,7 +4379,7 @@ SWIGINTERN int layerObj_open(layerObj *self){
         }
         return status;
     }
-SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
+SWIGINTERN int layerObj_whichShapes(struct layerObj *self,rectObj rect){
         int oldconnectiontype = self->connectiontype;
         self->connectiontype = MS_INLINE;
 
@@ -4121,7 +4391,7 @@ SWIGINTERN int layerObj_whichShapes(layerObj *self,rectObj rect){
 
         return msLayerWhichShapes(self, rect, 0);
     }
-SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
+SWIGINTERN shapeObj *layerObj_nextShape(struct layerObj *self){
        int status;
        shapeObj *shape;
 
@@ -4137,10 +4407,10 @@ SWIGINTERN shapeObj *layerObj_nextShape(layerObj *self){
        } else
          return shape;
     }
-SWIGINTERN void layerObj_close(layerObj *self){
+SWIGINTERN void layerObj_close(struct layerObj *self){
         msLayerClose(self);
     }
-SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
+SWIGINTERN shapeObj *layerObj_getShape(struct layerObj *self,resultObj *record){
         int retval;
         shapeObj *shape;
 
@@ -4155,25 +4425,25 @@ SWIGINTERN shapeObj *layerObj_getShape(layerObj *self,resultObj *record){
         retval = msLayerGetShape(self, shape, record);
         return shape;
     }
-SWIGINTERN int layerObj_getNumResults(layerObj *self){
+SWIGINTERN int layerObj_getNumResults(struct layerObj *self){
         if (!self->resultcache) return 0;
         return self->resultcache->numresults;
     }
-SWIGINTERN rectObj *layerObj_getResultsBounds(layerObj *self){
+SWIGINTERN rectObj *layerObj_getResultsBounds(struct layerObj *self){
         rectObj *bounds;
         if (!self->resultcache) return NULL;
         bounds = (rectObj *) malloc(sizeof(rectObj));
         MS_COPYRECT(bounds, &self->resultcache->bounds);
         return bounds;
     }
-SWIGINTERN resultObj *layerObj_getResult(layerObj *self,int i){
+SWIGINTERN resultObj *layerObj_getResult(struct layerObj *self,int i){
         if (!self->resultcache) return NULL;
         if (i >= 0 && i < self->resultcache->numresults)
             return &self->resultcache->results[i]; 
         else
             return NULL;
     }
-SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
+SWIGINTERN classObj *layerObj_getClass(struct layerObj *self,int i){
 	classObj *result=NULL;
         if (i >= 0 && i < self->numclasses) {
             result=self->class[i]; 
@@ -4181,23 +4451,23 @@ SWIGINTERN classObj *layerObj_getClass(layerObj *self,int i){
 	}
 	return result;
     }
-SWIGINTERN char *layerObj_getItem(layerObj *self,int i){
+SWIGINTERN char *layerObj_getItem(struct layerObj *self,int i){
   
         if (i >= 0 && i < self->numitems)
             return (char *) (self->items[i]);
         else
             return NULL;
     }
-SWIGINTERN int layerObj_setItems(layerObj *self,char **items,int numitems){
+SWIGINTERN int layerObj_setItems(struct layerObj *self,char **items,int numitems){
         return msLayerSetItems(self, items, numitems);
     }
-SWIGINTERN int layerObj_draw(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_draw(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_drawQuery(layerObj *self,mapObj *map,imageObj *image){
+SWIGINTERN int layerObj_drawQuery(struct layerObj *self,mapObj *map,imageObj *image){
         return msDrawQueryLayer(map, self, image);    
     }
-SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
+SWIGINTERN int layerObj_queryByFilter(struct layerObj *self,mapObj *map,char *string){
         int status;
         int retval;
 
@@ -4221,7 +4491,7 @@ SWIGINTERN int layerObj_queryByFilter(layerObj *self,mapObj *map,char *string){
         self->status = status;
 	return retval;
     }
-SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
+SWIGINTERN int layerObj_queryByAttributes(struct layerObj *self,mapObj *map,char *qitem,char *qstring,int mode){
         int status;
         int retval;
 
@@ -4241,7 +4511,7 @@ SWIGINTERN int layerObj_queryByAttributes(layerObj *self,mapObj *map,char *qitem
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
+SWIGINTERN int layerObj_queryByPoint(struct layerObj *self,mapObj *map,pointObj *point,int mode,double buffer){
         int status;
         int retval;
 
@@ -4260,7 +4530,7 @@ SWIGINTERN int layerObj_queryByPoint(layerObj *self,mapObj *map,pointObj *point,
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
+SWIGINTERN int layerObj_queryByRect(struct layerObj *self,mapObj *map,rectObj rect){
         int status;
         int retval;
 
@@ -4278,7 +4548,7 @@ SWIGINTERN int layerObj_queryByRect(layerObj *self,mapObj *map,rectObj rect){
 
         return retval;
     }
-SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
+SWIGINTERN int layerObj_queryByFeatures(struct layerObj *self,mapObj *map,int slayer){
         int status;
         int retval;
 
@@ -4291,7 +4561,7 @@ SWIGINTERN int layerObj_queryByFeatures(layerObj *self,mapObj *map,int slayer){
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape){
+SWIGINTERN int layerObj_queryByShape(struct layerObj *self,mapObj *map,shapeObj *shape){
         int status;
         int retval;
         
@@ -4310,7 +4580,7 @@ SWIGINTERN int layerObj_queryByShape(layerObj *self,mapObj *map,shapeObj *shape)
         self->status = status;
         return retval;
     }
-SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
+SWIGINTERN int layerObj_queryByIndex(struct layerObj *self,mapObj *map,int tileindex,int shapeindex,int bAddToQuery){
         int status;
         int retval;
         
@@ -4329,31 +4599,31 @@ SWIGINTERN int layerObj_queryByIndex(layerObj *self,mapObj *map,int tileindex,in
         self->status = status;
         return retval;
     }
-SWIGINTERN resultCacheObj *layerObj_getResults(layerObj *self){
+SWIGINTERN resultCacheObj *layerObj_getResults(struct layerObj *self){
         return self->resultcache;
     }
-SWIGINTERN int layerObj_setFilter(layerObj *self,char *filter){
+SWIGINTERN int layerObj_setFilter(struct layerObj *self,char *filter){
         if (!filter || strlen(filter) == 0) {
             freeExpression(&self->filter);
             return MS_SUCCESS;
         }
         else return msLoadExpressionString(&self->filter, filter);
     }
-SWIGINTERN char *layerObj_getFilterString(layerObj *self){
+SWIGINTERN char *layerObj_getFilterString(struct layerObj *self){
         return msGetExpressionString(&(self->filter));
     }
-SWIGINTERN int layerObj_setWKTProjection(layerObj *self,char *wkt){
+SWIGINTERN int layerObj_setWKTProjection(struct layerObj *self,char *wkt){
         self->project = 1;
         return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
     }
-SWIGINTERN char *layerObj_getProjection(layerObj *self){    
+SWIGINTERN char *layerObj_getProjection(struct layerObj *self){    
         return (char *) msGetProjectionString(&(self->projection));
     }
-SWIGINTERN int layerObj_setProjection(layerObj *self,char *proj4){
+SWIGINTERN int layerObj_setProjection(struct layerObj *self,char *proj4){
         self->project = 1;
         return msLoadProjectionString(&(self->projection), proj4);
     }
-SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){    
+SWIGINTERN int layerObj_addFeature(struct layerObj *self,shapeObj *shape){    
         self->connectiontype = MS_INLINE;
         if(self->features != NULL && self->features->tailifhead != NULL) 
             shape->index = self->features->tailifhead->shape.index + 1;
@@ -4363,16 +4633,16 @@ SWIGINTERN int layerObj_addFeature(layerObj *self,shapeObj *shape){
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_getNumFeatures(layerObj *self){
+SWIGINTERN int layerObj_getNumFeatures(struct layerObj *self){
         return msLayerGetNumFeatures(self);
     }
-SWIGINTERN rectObj *layerObj_getExtent(layerObj *self){
+SWIGINTERN rectObj *layerObj_getExtent(struct layerObj *self){
         rectObj *extent;
         extent = (rectObj *) malloc(sizeof(rectObj));
         msLayerGetExtent(self, extent);
         return extent;
     }
-SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double maxx,double maxy){
+SWIGINTERN int layerObj_setExtent(struct layerObj *self,double minx,double miny,double maxx,double maxy){
         if (minx > maxx || miny > maxy) {
             msSetError(34,
                 "{ 'minx': %f , 'miny': %f , 'maxx': %f , 'maxy': %f }",
@@ -4382,7 +4652,7 @@ SWIGINTERN int layerObj_setExtent(layerObj *self,double minx,double miny,double
 
         return msLayerSetExtent(self, minx, miny, maxx, maxy);
     }
-SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
+SWIGINTERN char *layerObj_getMetaData(struct layerObj *self,char *name){
         char *value = NULL;
         if (!name) {
             msSetError(16, "NULL key", "getMetaData");
@@ -4403,37 +4673,37 @@ SWIGINTERN char *layerObj_getMetaData(layerObj *self,char *name){
 
         return value;
     }
-SWIGINTERN int layerObj_setMetaData(layerObj *self,char *name,char *value){
+SWIGINTERN int layerObj_setMetaData(struct layerObj *self,char *name,char *value){
         if (msInsertHashTable(&(self->metadata), name, value) == NULL)
         return MS_FAILURE;
         return MS_SUCCESS;
     }
-SWIGINTERN int layerObj_removeMetaData(layerObj *self,char *name){
+SWIGINTERN int layerObj_removeMetaData(struct layerObj *self,char *name){
         return(msRemoveHashTable(&(self->metadata), name));
     }
-SWIGINTERN char *layerObj_getFirstMetaDataKey(layerObj *self){
+SWIGINTERN char *layerObj_getFirstMetaDataKey(struct layerObj *self){
         return (char *) msFirstKeyFromHashTable(&(self->metadata));
     }
-SWIGINTERN char *layerObj_getNextMetaDataKey(layerObj *self,char *lastkey){
+SWIGINTERN char *layerObj_getNextMetaDataKey(struct layerObj *self,char *lastkey){
         return (char *) msNextKeyFromHashTable(&(self->metadata), lastkey);
     }
-SWIGINTERN char *layerObj_getWMSFeatureInfoURL(layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
+SWIGINTERN char *layerObj_getWMSFeatureInfoURL(struct layerObj *self,mapObj *map,int click_x,int click_y,int feature_count,char *info_format){
         return (char *) msWMSGetFeatureInfoURL(map, self, click_x, click_y,
                feature_count, info_format);
     }
-SWIGINTERN char *layerObj_executeWFSGetFeature(layerObj *self,layerObj *layer){
+SWIGINTERN char *layerObj_executeWFSGetFeature(struct layerObj *self,layerObj *layer){
         return (char *) msWFSExecuteGetFeature(layer);
     }
-SWIGINTERN int layerObj_applySLD(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLD(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLD(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN int layerObj_applySLDURL(layerObj *self,char *sld,char *stylelayer){
+SWIGINTERN int layerObj_applySLDURL(struct layerObj *self,char *sld,char *stylelayer){
       return msSLDApplySLDURL(self->map, sld, self->index, stylelayer, NULL);
     }
-SWIGINTERN char *layerObj_generateSLD(layerObj *self){
+SWIGINTERN char *layerObj_generateSLD(struct layerObj *self){
         return (char *) msSLDGenerateSLD(self->map, self->index, NULL);
     }
-SWIGINTERN int layerObj_isVisible(layerObj *self){
+SWIGINTERN int layerObj_isVisible(struct layerObj *self){
         if (!self->map)
         {
             msSetError(12,
@@ -4443,31 +4713,31 @@ SWIGINTERN int layerObj_isVisible(layerObj *self){
         }
         return msLayerIsVisible(self->map, self);
     }
-SWIGINTERN int layerObj_moveClassUp(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassUp(struct layerObj *self,int index){
         return msMoveClassUp(self, index);
     }
-SWIGINTERN int layerObj_moveClassDown(layerObj *self,int index){
+SWIGINTERN int layerObj_moveClassDown(struct layerObj *self,int index){
         return msMoveClassDown(self, index);
     }
-SWIGINTERN void layerObj_setProcessingKey(layerObj *self,char const *key,char const *value){
+SWIGINTERN void layerObj_setProcessingKey(struct layerObj *self,char const *key,char const *value){
 	   msLayerSetProcessingKey( self, key, value );
     }
-SWIGINTERN void layerObj_setProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_setProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN void layerObj_addProcessing(layerObj *self,char const *directive){
+SWIGINTERN void layerObj_addProcessing(struct layerObj *self,char const *directive){
         msLayerAddProcessing( self, directive );
     }
-SWIGINTERN char *layerObj_getProcessing(layerObj *self,int index){
+SWIGINTERN char *layerObj_getProcessing(struct layerObj *self,int index){
         return (char *) msLayerGetProcessing(self, index);
     }
-SWIGINTERN char *layerObj_getProcessingKey(layerObj *self,char const *key){
+SWIGINTERN char *layerObj_getProcessingKey(struct layerObj *self,char const *key){
       return (char *) msLayerGetProcessingKey(self, key);
     }
-SWIGINTERN int layerObj_clearProcessing(layerObj *self){
+SWIGINTERN int layerObj_clearProcessing(struct layerObj *self){
         return msLayerClearProcessing(self);
     }
-SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char const *library_str){    
+SWIGINTERN int layerObj_setConnectionType(struct layerObj *self,int connectiontype,char const *library_str){    
         /* Caller is responsible to close previous layer correctly before
          * calling msConnectLayer() 
          */
@@ -4475,20 +4745,20 @@ SWIGINTERN int layerObj_setConnectionType(layerObj *self,int connectiontype,char
           msLayerClose(self);
         return msConnectLayer(self, connectiontype, library_str);
     }
-SWIGINTERN int layerObj_getClassIndex(layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
+SWIGINTERN int layerObj_getClassIndex(struct layerObj *self,mapObj *map,shapeObj *shape,int *classgroup,int numclasses){
         return msShapeGetClass(self, map, shape, classgroup, numclasses);
     }
-SWIGINTERN mapObj *new_mapObj(char *filename){
+SWIGINTERN struct mapObj *new_mapObj(char *filename){
         if (filename && strlen(filename))
             return msLoadMap(filename, NULL);
         else { /* create an empty map, no layers etc... */
             return msNewMapObj();
         }      
     }
-SWIGINTERN void delete_mapObj(mapObj *self){
+SWIGINTERN void delete_mapObj(struct mapObj *self){
         msFreeMap(self);
     }
-SWIGINTERN mapObj *mapObj_clone(mapObj *self){
+SWIGINTERN mapObj *mapObj_clone(struct mapObj *self){
         mapObj *dstMap;
         dstMap = msNewMapObj();
         if (msCopyMap(dstMap, self) != MS_SUCCESS) {
@@ -4497,33 +4767,33 @@ SWIGINTERN mapObj *mapObj_clone(mapObj *self){
         }
         return dstMap;
     }
-SWIGINTERN int mapObj_insertLayer(mapObj *self,layerObj *layer,int index){
+SWIGINTERN int mapObj_insertLayer(struct mapObj *self,layerObj *layer,int index){
         return msInsertLayer(self, layer, index);  
     }
-SWIGINTERN layerObj *mapObj_removeLayer(mapObj *self,int index){
+SWIGINTERN layerObj *mapObj_removeLayer(struct mapObj *self,int index){
     	layerObj *layer=msRemoveLayer(self, index);
 	MS_REFCNT_INCR(layer);
         return layer;
     }
-SWIGINTERN int mapObj_setExtent(mapObj *self,double minx,double miny,double maxx,double maxy){	
+SWIGINTERN int mapObj_setExtent(struct mapObj *self,double minx,double miny,double maxx,double maxy){	
 	return msMapSetExtent( self, minx, miny, maxx, maxy );
     }
-SWIGINTERN int mapObj_offsetExtent(mapObj *self,double x,double y){	
+SWIGINTERN int mapObj_offsetExtent(struct mapObj *self,double x,double y){	
 	return msMapOffsetExtent( self, x, y );
     }
-SWIGINTERN int mapObj_scaleExtent(mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
+SWIGINTERN int mapObj_scaleExtent(struct mapObj *self,double zoomfactor,double minscaledenom,double maxscaledenom){	
 	return msMapScaleExtent( self, zoomfactor, minscaledenom, maxscaledenom );
     }
-SWIGINTERN int mapObj_setCenter(mapObj *self,pointObj *center){	
+SWIGINTERN int mapObj_setCenter(struct mapObj *self,pointObj *center){	
 	return msMapSetCenter( self, center );
     }
-SWIGINTERN int mapObj_setSize(mapObj *self,int width,int height){
+SWIGINTERN int mapObj_setSize(struct mapObj *self,int width,int height){
         return msMapSetSize(self, width, height);
     }
-SWIGINTERN int mapObj_setRotation(mapObj *self,double rotation_angle){
+SWIGINTERN int mapObj_setRotation(struct mapObj *self,double rotation_angle){
         return msMapSetRotation( self, rotation_angle );
     }
-SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
+SWIGINTERN layerObj *mapObj_getLayer(struct mapObj *self,int i){
     if(i >= 0 && i < self->numlayers) {
     	MS_REFCNT_INCR(self->layers[i]);
       	return (self->layers[i]); /* returns an EXISTING layer */
@@ -4531,7 +4801,7 @@ SWIGINTERN layerObj *mapObj_getLayer(mapObj *self,int i){
       return NULL;
     }
   }
-SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
+SWIGINTERN layerObj *mapObj_getLayerByName(struct mapObj *self,char *name){
     int i;
 
     i = msGetLayerIndex(self, name);
@@ -4543,19 +4813,19 @@ SWIGINTERN layerObj *mapObj_getLayerByName(mapObj *self,char *name){
     else
       return NULL;
   }
-SWIGINTERN int mapObj_getSymbolByName(mapObj *self,char *name){
+SWIGINTERN int mapObj_getSymbolByName(struct mapObj *self,char *name){
     return msGetSymbolIndex(&self->symbolset, name, 1);
   }
-SWIGINTERN void mapObj_prepareQuery(mapObj *self){
+SWIGINTERN void mapObj_prepareQuery(struct mapObj *self){
     int status;
 
     status = msCalculateScale(self->extent, self->units, self->width, self->height, self->resolution, &self->scaledenom);
     if(status != MS_SUCCESS) self->scaledenom = -1;
   }
-SWIGINTERN imageObj *mapObj_prepareImage(mapObj *self){
+SWIGINTERN imageObj *mapObj_prepareImage(struct mapObj *self){
     return msPrepareImage(self, 0);
   }
-SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_setImageType(struct mapObj *self,char *imagetype){
       outputFormatObj *format;
 
       format = msSelectOutputFormat( self, imagetype );
@@ -4570,7 +4840,7 @@ SWIGINTERN void mapObj_setImageType(mapObj *self,char *imagetype){
                                -1111, -1111 );
       }
   }
-SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
+SWIGINTERN void mapObj_selectOutputFormat(struct mapObj *self,char *imagetype){
         outputFormatObj *format;
 
         format = msSelectOutputFormat( self, imagetype );
@@ -4585,38 +4855,38 @@ SWIGINTERN void mapObj_selectOutputFormat(mapObj *self,char *imagetype){
                                  -1111, -1111 );
         }
     }
-SWIGINTERN void mapObj_setOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN void mapObj_setOutputFormat(struct mapObj *self,outputFormatObj *format){
       msApplyOutputFormat( &(self->outputformat), format, -1111, 
                            -1111, -1111 );
   }
-SWIGINTERN imageObj *mapObj_draw(mapObj *self){
+SWIGINTERN imageObj *mapObj_draw(struct mapObj *self){
     return msDrawMap(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawQuery(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawQuery(struct mapObj *self){
     return msDrawMap(self, 1);
   }
-SWIGINTERN imageObj *mapObj_drawLegend(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawLegend(struct mapObj *self){
     return msDrawLegend(self, 0);
   }
-SWIGINTERN imageObj *mapObj_drawScalebar(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawScalebar(struct mapObj *self){
     return msDrawScalebar(self);
   }
-SWIGINTERN imageObj *mapObj_drawReferenceMap(mapObj *self){
+SWIGINTERN imageObj *mapObj_drawReferenceMap(struct mapObj *self){
     return msDrawReferenceMap(self);
   }
-SWIGINTERN int mapObj_embedScalebar(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedScalebar(struct mapObj *self,imageObj *image){	
     return msEmbedScalebar(self, image);
   }
-SWIGINTERN int mapObj_embedLegend(mapObj *self,imageObj *image){	
+SWIGINTERN int mapObj_embedLegend(struct mapObj *self,imageObj *image){	
     return msEmbedLegend(self, image);
   }
-SWIGINTERN int mapObj_drawLabelCache(mapObj *self,imageObj *image){
+SWIGINTERN int mapObj_drawLabelCache(struct mapObj *self,imageObj *image){
     return msDrawLabelCache(image, self);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_getLabel(mapObj *self,int i){
+SWIGINTERN labelCacheMemberObj *mapObj_getLabel(struct mapObj *self,int i){
     return msGetLabelCacheMember(&(self->labelcache), i);
   }
-SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
+SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(struct mapObj *self){
     static int i=0;
 
     if(i<self->labelcache.numlabels)
@@ -4624,7 +4894,7 @@ SWIGINTERN labelCacheMemberObj *mapObj_nextLabel(mapObj *self){
     else
       return NULL;	
   }
-SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
+SWIGINTERN int mapObj_queryByFilter(struct mapObj *self,char *string){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_FILTER;
@@ -4640,7 +4910,7 @@ SWIGINTERN int mapObj_queryByFilter(mapObj *self,char *string){
 
     return msQueryByFilter(self);
   }
-SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double buffer){
+SWIGINTERN int mapObj_queryByPoint(struct mapObj *self,pointObj *point,int mode,double buffer){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_POINT;
@@ -4650,7 +4920,7 @@ SWIGINTERN int mapObj_queryByPoint(mapObj *self,pointObj *point,int mode,double
 
     return msQueryByPoint(self);
   }
-SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
+SWIGINTERN int mapObj_queryByRect(struct mapObj *self,rectObj rect){
     msInitQuery(&(self->query));
 
     self->query.type = MS_QUERY_BY_RECT;
@@ -4659,11 +4929,11 @@ SWIGINTERN int mapObj_queryByRect(mapObj *self,rectObj rect){
 
     return msQueryByRect(self);
   }
-SWIGINTERN int mapObj_queryByFeatures(mapObj *self,int slayer){
+SWIGINTERN int mapObj_queryByFeatures(struct mapObj *self,int slayer){
     self->query.slayer = slayer;
     return msQueryByFeatures(self);
   }
-SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
+SWIGINTERN int mapObj_queryByShape(struct mapObj *self,shapeObj *shape){
     msInitQuery(&(self->query));
     
     self->query.type = MS_QUERY_BY_SHAPE;
@@ -4674,31 +4944,31 @@ SWIGINTERN int mapObj_queryByShape(mapObj *self,shapeObj *shape){
 
     return msQueryByShape(self);
   }
-SWIGINTERN int mapObj_setWKTProjection(mapObj *self,char *wkt){
+SWIGINTERN int mapObj_setWKTProjection(struct mapObj *self,char *wkt){
     return msOGCWKT2ProjectionObj(wkt, &(self->projection), self->debug);
   }
-SWIGINTERN char *mapObj_getProjection(mapObj *self){
+SWIGINTERN char *mapObj_getProjection(struct mapObj *self){
     return msGetProjectionString(&(self->projection));
   }
-SWIGINTERN int mapObj_setProjection(mapObj *self,char *proj4){
+SWIGINTERN int mapObj_setProjection(struct mapObj *self,char *proj4){
     return msLoadProjectionString(&(self->projection), proj4);
   }
-SWIGINTERN int mapObj_save(mapObj *self,char *filename){
+SWIGINTERN int mapObj_save(struct mapObj *self,char *filename){
     return msSaveMap(self, filename);
   }
-SWIGINTERN int mapObj_saveQuery(mapObj *self,char *filename,int results){
+SWIGINTERN int mapObj_saveQuery(struct mapObj *self,char *filename,int results){
     return msSaveQuery(self, filename, results);
   }
-SWIGINTERN int mapObj_loadQuery(mapObj *self,char *filename){
+SWIGINTERN int mapObj_loadQuery(struct mapObj *self,char *filename){
     return msLoadQuery(self, filename);
   }
-SWIGINTERN void mapObj_freeQuery(mapObj *self,int qlayer){
+SWIGINTERN void mapObj_freeQuery(struct mapObj *self,int qlayer){
     msQueryFree(self, qlayer);
   }
-SWIGINTERN int mapObj_saveQueryAsGML(mapObj *self,char *filename,char const *ns){
+SWIGINTERN int mapObj_saveQueryAsGML(struct mapObj *self,char *filename,char const *ns){
     return msGMLWriteQuery(self, filename, ns);
   }
-SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
+SWIGINTERN char *mapObj_getMetaData(struct mapObj *self,char *name){
     char *value = NULL;
     if (!name) {
       msSetError(16, "NULL key", "getMetaData");
@@ -4711,21 +4981,21 @@ SWIGINTERN char *mapObj_getMetaData(mapObj *self,char *name){
     }
     return value;
   }
-SWIGINTERN int mapObj_setMetaData(mapObj *self,char *name,char *value){
+SWIGINTERN int mapObj_setMetaData(struct mapObj *self,char *name,char *value){
     if (msInsertHashTable(&(self->web.metadata), name, value) == NULL)
 	return MS_FAILURE;
     return MS_SUCCESS;
   }
-SWIGINTERN int mapObj_removeMetaData(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeMetaData(struct mapObj *self,char *name){
     return(msRemoveHashTable(&(self->web.metadata), name));
   }
-SWIGINTERN char *mapObj_getFirstMetaDataKey(mapObj *self){
+SWIGINTERN char *mapObj_getFirstMetaDataKey(struct mapObj *self){
     return (char *) msFirstKeyFromHashTable(&(self->web.metadata));
   }
-SWIGINTERN char *mapObj_getNextMetaDataKey(mapObj *self,char *lastkey){
+SWIGINTERN char *mapObj_getNextMetaDataKey(struct mapObj *self,char *lastkey){
     return (char *) msNextKeyFromHashTable(&(self->web.metadata), lastkey);
   }
-SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_setSymbolSet(struct mapObj *self,char *szFileName){
     msFreeSymbolSet(&self->symbolset);
     msInitSymbolSet(&self->symbolset);
    
@@ -4736,10 +5006,10 @@ SWIGINTERN int mapObj_setSymbolSet(mapObj *self,char *szFileName){
 
     return msLoadSymbolSet(&self->symbolset, self);
   }
-SWIGINTERN int mapObj_getNumSymbols(mapObj *self){
+SWIGINTERN int mapObj_getNumSymbols(struct mapObj *self){
     return self->symbolset.numsymbols;
   }
-SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
+SWIGINTERN int mapObj_setFontSet(struct mapObj *self,char *filename){
     msFreeFontSet(&(self->fontset));
     msInitFontSet(&(self->fontset));
    
@@ -4747,19 +5017,19 @@ SWIGINTERN int mapObj_setFontSet(mapObj *self,char *filename){
 
     return msLoadFontSet(&(self->fontset), self);
   }
-SWIGINTERN int mapObj_saveMapContext(mapObj *self,char *szFileName){
+SWIGINTERN int mapObj_saveMapContext(struct mapObj *self,char *szFileName){
     return msSaveMapContext(self, szFileName);
   }
-SWIGINTERN int mapObj_loadMapContext(mapObj *self,char *szFileName,int useUniqueNames){
+SWIGINTERN int mapObj_loadMapContext(struct mapObj *self,char *szFileName,int useUniqueNames){
     return msLoadMapContext(self, szFileName, useUniqueNames);
   }
-SWIGINTERN int mapObj_moveLayerUp(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerUp(struct mapObj *self,int layerindex){
     return msMoveLayerUp(self, layerindex);
   }
-SWIGINTERN int mapObj_moveLayerDown(mapObj *self,int layerindex){
+SWIGINTERN int mapObj_moveLayerDown(struct mapObj *self,int layerindex){
     return msMoveLayerDown(self, layerindex);
   }
-SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
+SWIGINTERN intarray *mapObj_getLayersDrawingOrder(struct mapObj *self){
     int i;
     intarray *order;
     order = new_intarray(self->numlayers);
@@ -4771,53 +5041,53 @@ SWIGINTERN intarray *mapObj_getLayersDrawingOrder(mapObj *self){
 
     return order;
   }
-SWIGINTERN int mapObj_setLayersDrawingOrder(mapObj *self,int *panIndexes){
+SWIGINTERN int mapObj_setLayersDrawingOrder(struct mapObj *self,int *panIndexes){
     return  msSetLayersdrawingOrder(self, panIndexes); 
   }
-SWIGINTERN void mapObj_setConfigOption(mapObj *self,char *key,char *value){
+SWIGINTERN void mapObj_setConfigOption(struct mapObj *self,char *key,char *value){
     msSetConfigOption(self,key,value);
   }
-SWIGINTERN char *mapObj_getConfigOption(mapObj *self,char *key){
+SWIGINTERN char *mapObj_getConfigOption(struct mapObj *self,char *key){
     return (char *) msGetConfigOption(self,key);
   }
-SWIGINTERN void mapObj_applyConfigOptions(mapObj *self){
+SWIGINTERN void mapObj_applyConfigOptions(struct mapObj *self){
     msApplyMapConfigOptions( self );
   }
-SWIGINTERN int mapObj_applySLD(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLD(struct mapObj *self,char *sld){
       return msSLDApplySLD(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN int mapObj_applySLDURL(mapObj *self,char *sld){
+SWIGINTERN int mapObj_applySLDURL(struct mapObj *self,char *sld){
       return msSLDApplySLDURL(self, sld, -1, NULL, NULL);
     }
-SWIGINTERN char *mapObj_generateSLD(mapObj *self){
+SWIGINTERN char *mapObj_generateSLD(struct mapObj *self){
         return (char *) msSLDGenerateSLD(self, -1, NULL);
     }
-SWIGINTERN char *mapObj_processTemplate(mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processTemplate(struct mapObj *self,int bGenerateImages,char **names,char **values,int numentries){
         return msProcessTemplate(self, bGenerateImages, names, values,
                                  numentries);
     }
-SWIGINTERN char *mapObj_processLegendTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processLegendTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessLegendTemplate(self, names, values, numentries);
     }
-SWIGINTERN char *mapObj_processQueryTemplate(mapObj *self,char **names,char **values,int numentries){
+SWIGINTERN char *mapObj_processQueryTemplate(struct mapObj *self,char **names,char **values,int numentries){
         return msProcessQueryTemplate(self, 1, names, values, numentries);
     }
-SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(mapObj *self,char *name){
+SWIGINTERN outputFormatObj *mapObj_getOutputFormatByName(struct mapObj *self,char *name){
         return msSelectOutputFormat(self, name); 
     }
-SWIGINTERN int mapObj_appendOutputFormat(mapObj *self,outputFormatObj *format){
+SWIGINTERN int mapObj_appendOutputFormat(struct mapObj *self,outputFormatObj *format){
         return msAppendOutputFormat(self, format);
     }
-SWIGINTERN int mapObj_removeOutputFormat(mapObj *self,char *name){
+SWIGINTERN int mapObj_removeOutputFormat(struct mapObj *self,char *name){
         return msRemoveOutputFormat(self, name);
     }
-SWIGINTERN int mapObj_loadOWSParameters(mapObj *self,cgiRequestObj *request,char *wmtver_string){
+SWIGINTERN int mapObj_loadOWSParameters(struct mapObj *self,cgiRequestObj *request,char *wmtver_string){
         return msMapLoadOWSParameters(self, request, wmtver_string);
     }
-SWIGINTERN int mapObj_OWSDispatch(mapObj *self,cgiRequestObj *req){
+SWIGINTERN int mapObj_OWSDispatch(struct mapObj *self,cgiRequestObj *req){
 	return msOWSDispatch( self, req, 1 );
     }
-SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomPoint(struct mapObj *self,int zoomfactor,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -4993,7 +5263,7 @@ SWIGINTERN int mapObj_zoomPoint(mapObj *self,int zoomfactor,pointObj *poPixPos,i
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomRectangle(struct mapObj *self,rectObj *poPixRect,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
         double      dfNewScale;
@@ -5158,7 +5428,7 @@ SWIGINTERN int mapObj_zoomRectangle(mapObj *self,rectObj *poPixRect,int width,in
 
         return MS_SUCCESS;
     }
-SWIGINTERN int mapObj_zoomScale(mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
+SWIGINTERN int mapObj_zoomScale(struct mapObj *self,double scale,pointObj *poPixPos,int width,int height,rectObj *poGeorefExt,rectObj *poMaxGeorefExt){
         double      dfGeoPosX, dfGeoPosY;
         double      dfDeltaX, dfDeltaY;
         rectObj     oNewGeorefExt;    
@@ -5343,7 +5613,7 @@ SWIGINTERN int mapObj_zoomScale(mapObj *self,double scale,pointObj *poPixPos,int
 
         return MS_SUCCESS;
     }
-SWIGINTERN PyObject *mapObj_getLayerOrder(mapObj *self){
+SWIGINTERN PyObject *mapObj_getLayerOrder(struct mapObj *self){
         int i;
         PyObject *order;
         order = PyTuple_New(self->numlayers);
@@ -5352,7 +5622,7 @@ SWIGINTERN PyObject *mapObj_getLayerOrder(mapObj *self){
         }
         return order;
     }
-SWIGINTERN int mapObj_setLayerOrder(mapObj *self,PyObject *order){
+SWIGINTERN int mapObj_setLayerOrder(struct mapObj *self,PyObject *order){
         int i, size;
         size = PyTuple_Size(order);
         for (i = 0; i < size; i++) {
@@ -5360,7 +5630,7 @@ SWIGINTERN int mapObj_setLayerOrder(mapObj *self,PyObject *order){
         }
         return MS_SUCCESS;
     }
-SWIGINTERN PyObject *mapObj_getSize(mapObj *self){
+SWIGINTERN PyObject *mapObj_getSize(struct mapObj *self){
         PyObject* output ;
         output = PyTuple_New(2);
         PyTuple_SetItem(output,0,PyInt_FromLong((long)self->width));
@@ -5776,18 +6046,10 @@ SWIGINTERN void shapeObj_initValues(shapeObj *self,int numvalues){
         }
     }
 
-SWIGINTERNINLINE PyObject* 
-SWIG_From_unsigned_SS_long  (unsigned long value)
+SWIGINTERNINLINE PyObject*
+  SWIG_From_unsigned_SS_int  (unsigned int value)
 {
-  return (value > LONG_MAX) ?
-    PyLong_FromUnsignedLong(value) : PyInt_FromLong((long)(value)); 
-}
-
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_int  (unsigned int value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
+  return PyInt_FromSize_t((size_t) value);
 }
 
 SWIGINTERN char *DBFInfo_getFieldName(DBFInfo *self,int iField){
@@ -6111,11 +6373,11 @@ SWIGINTERN int symbolObj_setImage(symbolObj *self,imageObj *image){
 
         return MS_SUCCESS;
     }
-SWIGINTERN errorObj *new_errorObj(){    
+SWIGINTERN struct errorObj *new_errorObj(){    
         return msGetErrorObj();
     }
-SWIGINTERN void delete_errorObj(errorObj *self){}
-SWIGINTERN errorObj *errorObj_next(errorObj *self){
+SWIGINTERN void delete_errorObj(struct errorObj *self){}
+SWIGINTERN errorObj *errorObj_next(struct errorObj *self){
         errorObj *ep;	
 
         if (self == NULL || self->next == NULL) return NULL;
@@ -15229,7 +15491,7 @@ SWIGINTERN PyObject *labelObj_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObj
 
 SWIGINTERN PyObject *_wrap_classObj_status_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15241,9 +15503,9 @@ SWIGINTERN PyObject *_wrap_classObj_status_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_status_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -15259,7 +15521,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_status_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15268,9 +15530,9 @@ SWIGINTERN PyObject *_wrap_classObj_status_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_status_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_status_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->status);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15281,7 +15543,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_numstyles_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15290,9 +15552,9 @@ SWIGINTERN PyObject *_wrap_classObj_numstyles_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_numstyles_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numstyles_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numstyles_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->numstyles);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15303,7 +15565,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_numlabels_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15315,9 +15577,9 @@ SWIGINTERN PyObject *_wrap_classObj_numlabels_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_numlabels_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_numlabels_set" "', argument " "2"" of type '" "int""'");
@@ -15333,7 +15595,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_numlabels_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15342,9 +15604,9 @@ SWIGINTERN PyObject *_wrap_classObj_numlabels_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_numlabels_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_numlabels_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->numlabels);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15355,7 +15617,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15364,9 +15626,9 @@ SWIGINTERN PyObject *_wrap_classObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_name_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     if (arg1->name) free((char*)arg1->name);
     if (arg2) {
@@ -15385,7 +15647,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15394,9 +15656,9 @@ SWIGINTERN PyObject *_wrap_classObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_name_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_name_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (char *) ((arg1)->name);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -15407,7 +15669,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_title_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15416,9 +15678,9 @@ SWIGINTERN PyObject *_wrap_classObj_title_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_title_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     if (arg1->title) free((char*)arg1->title);
     if (arg2) {
@@ -15437,7 +15699,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_title_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15446,9 +15708,9 @@ SWIGINTERN PyObject *_wrap_classObj_title_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_title_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_title_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (char *) ((arg1)->title);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -15459,7 +15721,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_template_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15468,9 +15730,9 @@ SWIGINTERN PyObject *_wrap_classObj_template_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_template_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     if (arg1->template) free((char*)arg1->template);
     if (arg2) {
@@ -15489,7 +15751,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_template_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15498,9 +15760,9 @@ SWIGINTERN PyObject *_wrap_classObj_template_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_template_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_template_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (char *) ((arg1)->template);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -15511,7 +15773,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15523,9 +15785,9 @@ SWIGINTERN PyObject *_wrap_classObj_type_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_type_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_type_set" "', argument " "2"" of type '" "int""'");
@@ -15541,7 +15803,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15550,9 +15812,9 @@ SWIGINTERN PyObject *_wrap_classObj_type_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_type_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->type);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15563,7 +15825,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_metadata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15572,9 +15834,9 @@ SWIGINTERN PyObject *_wrap_classObj_metadata_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_metadata_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_metadata_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_metadata_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->metadata);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -15585,7 +15847,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_validation_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15594,9 +15856,9 @@ SWIGINTERN PyObject *_wrap_classObj_validation_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_validation_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_validation_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_validation_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->validation);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -15607,7 +15869,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_minscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15619,9 +15881,9 @@ SWIGINTERN PyObject *_wrap_classObj_minscaledenom_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_minscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_minscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -15637,7 +15899,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_minscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15646,9 +15908,9 @@ SWIGINTERN PyObject *_wrap_classObj_minscaledenom_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_minscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minscaledenom_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (double) ((arg1)->minscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -15659,7 +15921,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_maxscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15671,9 +15933,9 @@ SWIGINTERN PyObject *_wrap_classObj_maxscaledenom_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_maxscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_maxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -15689,7 +15951,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_maxscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15698,9 +15960,9 @@ SWIGINTERN PyObject *_wrap_classObj_maxscaledenom_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_maxscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_maxscaledenom_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (double) ((arg1)->maxscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -15711,7 +15973,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_minfeaturesize_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15723,9 +15985,9 @@ SWIGINTERN PyObject *_wrap_classObj_minfeaturesize_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_minfeaturesize_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_minfeaturesize_set" "', argument " "2"" of type '" "int""'");
@@ -15741,7 +16003,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_minfeaturesize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15750,9 +16012,9 @@ SWIGINTERN PyObject *_wrap_classObj_minfeaturesize_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_minfeaturesize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_minfeaturesize_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->minfeaturesize);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15763,7 +16025,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15772,9 +16034,9 @@ SWIGINTERN PyObject *_wrap_classObj_refcount_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_refcount_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_refcount_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->refcount);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15785,7 +16047,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_layer_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15794,9 +16056,9 @@ SWIGINTERN PyObject *_wrap_classObj_layer_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_layer_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_layer_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_layer_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (struct layerObj *) ((arg1)->layer);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_layerObj, 0 |  0 );
   return resultobj;
@@ -15807,7 +16069,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_debug_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15819,9 +16081,9 @@ SWIGINTERN PyObject *_wrap_classObj_debug_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_debug_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -15837,7 +16099,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_debug_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15846,9 +16108,9 @@ SWIGINTERN PyObject *_wrap_classObj_debug_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_debug_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_debug_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (int) ((arg1)->debug);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -15859,7 +16121,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_keyimage_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15868,9 +16130,9 @@ SWIGINTERN PyObject *_wrap_classObj_keyimage_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_keyimage_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     if (arg1->keyimage) free((char*)arg1->keyimage);
     if (arg2) {
@@ -15889,7 +16151,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_keyimage_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15898,9 +16160,9 @@ SWIGINTERN PyObject *_wrap_classObj_keyimage_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_keyimage_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_keyimage_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (char *) ((arg1)->keyimage);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -15911,7 +16173,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_group_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15920,9 +16182,9 @@ SWIGINTERN PyObject *_wrap_classObj_group_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_group_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     if (arg1->group) free((char*)arg1->group);
     if (arg2) {
@@ -15941,7 +16203,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_group_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15950,9 +16212,9 @@ SWIGINTERN PyObject *_wrap_classObj_group_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_group_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_group_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (char *) ((arg1)->group);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -15963,7 +16225,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_leader_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   labelLeaderObj *arg2 = (labelLeaderObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -15975,9 +16237,9 @@ SWIGINTERN PyObject *_wrap_classObj_leader_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_leader_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_set" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_set" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_labelLeaderObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_leader_set" "', argument " "2"" of type '" "labelLeaderObj *""'"); 
@@ -15993,7 +16255,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_leader_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16002,9 +16264,9 @@ SWIGINTERN PyObject *_wrap_classObj_leader_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_leader_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_get" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_leader_get" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   result = (labelLeaderObj *)& ((arg1)->leader);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_labelLeaderObj, 0 |  0 );
   return resultobj;
@@ -16019,7 +16281,7 @@ SWIGINTERN PyObject *_wrap_new_classObj(PyObject *SWIGUNUSEDPARM(self), PyObject
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
-  classObj *result = 0 ;
+  struct classObj *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"|O:new_classObj",&obj0)) SWIG_fail;
   if (obj0) {
@@ -16030,7 +16292,7 @@ SWIGINTERN PyObject *_wrap_new_classObj(PyObject *SWIGUNUSEDPARM(self), PyObject
     arg1 = (layerObj *)(argp1);
   }
   {
-    result = (classObj *)new_classObj(arg1); {
+    result = (struct classObj *)new_classObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
       
       switch(ms_error->code) {
@@ -16064,7 +16326,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_classObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16072,9 +16334,9 @@ SWIGINTERN PyObject *_wrap_delete_classObj(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"O:delete_classObj",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_classObj" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_classObj" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     delete_classObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -16110,7 +16372,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_updateFromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16120,9 +16382,9 @@ SWIGINTERN PyObject *_wrap_classObj_updateFromString(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_updateFromString",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_updateFromString" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_updateFromString" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (int)classObj_updateFromString(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -16158,7 +16420,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16167,9 +16429,9 @@ SWIGINTERN PyObject *_wrap_classObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_clone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_clone" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_clone" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (classObj *)classObj_clone(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -16205,7 +16467,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_setExpression(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16215,9 +16477,9 @@ SWIGINTERN PyObject *_wrap_classObj_setExpression(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_setExpression",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setExpression" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setExpression" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (int)classObj_setExpression(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -16253,7 +16515,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getExpressionString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16262,9 +16524,9 @@ SWIGINTERN PyObject *_wrap_classObj_getExpressionString(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_getExpressionString",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getExpressionString" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getExpressionString" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (char *)classObj_getExpressionString(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -16301,7 +16563,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_setText(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16311,9 +16573,9 @@ SWIGINTERN PyObject *_wrap_classObj_setText(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_setText",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setText" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setText" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (int)classObj_setText(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -16349,7 +16611,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getTextString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16358,9 +16620,9 @@ SWIGINTERN PyObject *_wrap_classObj_getTextString(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_getTextString",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getTextString" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getTextString" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (char *)classObj_getTextString(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -16397,7 +16659,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16407,9 +16669,9 @@ SWIGINTERN PyObject *_wrap_classObj_getMetaData(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_getMetaData",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getMetaData" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getMetaData" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (char *)classObj_getMetaData(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -16445,7 +16707,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_setMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -16456,9 +16718,9 @@ SWIGINTERN PyObject *_wrap_classObj_setMetaData(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Ozz:classObj_setMetaData",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setMetaData" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_setMetaData" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (int)classObj_setMetaData(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -16494,7 +16756,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -16503,9 +16765,9 @@ SWIGINTERN PyObject *_wrap_classObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:classObj_getFirstMetaDataKey",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getFirstMetaDataKey" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (char *)classObj_getFirstMetaDataKey(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -16541,7 +16803,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16551,9 +16813,9 @@ SWIGINTERN PyObject *_wrap_classObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"Oz:classObj_getNextMetaDataKey",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getNextMetaDataKey" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   {
     result = (char *)classObj_getNextMetaDataKey(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -16589,7 +16851,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_drawLegendIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   layerObj *arg3 = (layerObj *) 0 ;
   int arg4 ;
@@ -16626,9 +16888,9 @@ SWIGINTERN PyObject *_wrap_classObj_drawLegendIcon(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:classObj_drawLegendIcon",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_drawLegendIcon" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_drawLegendIcon" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_drawLegendIcon" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -16699,7 +16961,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_createLegendIcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   layerObj *arg3 = (layerObj *) 0 ;
   int arg4 ;
@@ -16724,9 +16986,9 @@ SWIGINTERN PyObject *_wrap_classObj_createLegendIcon(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:classObj_createLegendIcon",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_createLegendIcon" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_createLegendIcon" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_createLegendIcon" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -16782,7 +17044,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16795,9 +17057,9 @@ SWIGINTERN PyObject *_wrap_classObj_getLabel(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_getLabel",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getLabel" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_getLabel" "', argument " "2"" of type '" "int""'");
@@ -16838,7 +17100,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_addLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   labelObj *arg2 = (labelObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16851,9 +17113,9 @@ SWIGINTERN PyObject *_wrap_classObj_addLabel(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_addLabel",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_addLabel" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_addLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_labelObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_addLabel" "', argument " "2"" of type '" "labelObj *""'"); 
@@ -16894,7 +17156,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_removeLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16907,9 +17169,9 @@ SWIGINTERN PyObject *_wrap_classObj_removeLabel(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_removeLabel",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeLabel" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeLabel" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_removeLabel" "', argument " "2"" of type '" "int""'");
@@ -16950,7 +17212,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_getStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16963,9 +17225,9 @@ SWIGINTERN PyObject *_wrap_classObj_getStyle(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_getStyle",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getStyle" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_getStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_getStyle" "', argument " "2"" of type '" "int""'");
@@ -17006,7 +17268,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_insertStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   styleObj *arg2 = (styleObj *) 0 ;
   int arg3 = (int) -1 ;
   void *argp1 = 0 ;
@@ -17023,9 +17285,9 @@ SWIGINTERN PyObject *_wrap_classObj_insertStyle(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO|O:classObj_insertStyle",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_insertStyle" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_insertStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_styleObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "classObj_insertStyle" "', argument " "2"" of type '" "styleObj *""'"); 
@@ -17073,7 +17335,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_removeStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17086,9 +17348,9 @@ SWIGINTERN PyObject *_wrap_classObj_removeStyle(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_removeStyle",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeStyle" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_removeStyle" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_removeStyle" "', argument " "2"" of type '" "int""'");
@@ -17129,7 +17391,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_moveStyleUp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17142,9 +17404,9 @@ SWIGINTERN PyObject *_wrap_classObj_moveStyleUp(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_moveStyleUp",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleUp" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleUp" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_moveStyleUp" "', argument " "2"" of type '" "int""'");
@@ -17185,7 +17447,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_classObj_moveStyleDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  classObj *arg1 = (classObj *) 0 ;
+  struct classObj *arg1 = (struct classObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17198,9 +17460,9 @@ SWIGINTERN PyObject *_wrap_classObj_moveStyleDown(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:classObj_moveStyleDown",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleDown" "', argument " "1"" of type '" "classObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "classObj_moveStyleDown" "', argument " "1"" of type '" "struct classObj *""'"); 
   }
-  arg1 = (classObj *)(argp1);
+  arg1 = (struct classObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "classObj_moveStyleDown" "', argument " "2"" of type '" "int""'");
@@ -22199,7 +22461,7 @@ SWIGINTERN PyObject *imageObj_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObj
 
 SWIGINTERN PyObject *_wrap_layerObj_classitem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22208,9 +22470,9 @@ SWIGINTERN PyObject *_wrap_layerObj_classitem_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_classitem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->classitem) free((char*)arg1->classitem);
     if (arg2) {
@@ -22229,7 +22491,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_classitem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22238,9 +22500,9 @@ SWIGINTERN PyObject *_wrap_layerObj_classitem_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_classitem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->classitem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22251,7 +22513,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22260,9 +22522,9 @@ SWIGINTERN PyObject *_wrap_layerObj_refcount_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_refcount_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_refcount_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->refcount);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22273,7 +22535,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_numclasses_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22282,9 +22544,9 @@ SWIGINTERN PyObject *_wrap_layerObj_numclasses_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_numclasses_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numclasses_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numclasses_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->numclasses);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22295,7 +22557,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxclasses_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22304,9 +22566,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxclasses_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_maxclasses_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxclasses_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxclasses_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->maxclasses);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22317,7 +22579,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22326,9 +22588,9 @@ SWIGINTERN PyObject *_wrap_layerObj_index_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_index_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_index_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_index_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->index);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22339,7 +22601,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_map_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22348,9 +22610,9 @@ SWIGINTERN PyObject *_wrap_layerObj_map_get(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_map_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_map_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_map_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (struct mapObj *) ((arg1)->map);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_mapObj, 0 |  0 );
   return resultobj;
@@ -22361,7 +22623,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_header_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22370,9 +22632,9 @@ SWIGINTERN PyObject *_wrap_layerObj_header_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_header_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->header) free((char*)arg1->header);
     if (arg2) {
@@ -22391,7 +22653,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_header_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22400,9 +22662,9 @@ SWIGINTERN PyObject *_wrap_layerObj_header_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_header_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_header_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->header);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22413,7 +22675,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_footer_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22422,9 +22684,9 @@ SWIGINTERN PyObject *_wrap_layerObj_footer_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_footer_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->footer) free((char*)arg1->footer);
     if (arg2) {
@@ -22443,7 +22705,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_footer_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22452,9 +22714,9 @@ SWIGINTERN PyObject *_wrap_layerObj_footer_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_footer_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_footer_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->footer);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22465,7 +22727,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_template_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22474,9 +22736,9 @@ SWIGINTERN PyObject *_wrap_layerObj_template_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_template_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->template) free((char*)arg1->template);
     if (arg2) {
@@ -22495,7 +22757,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_template_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22504,9 +22766,9 @@ SWIGINTERN PyObject *_wrap_layerObj_template_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_template_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_template_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->template);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22517,7 +22779,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22526,9 +22788,9 @@ SWIGINTERN PyObject *_wrap_layerObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_name_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->name) free((char*)arg1->name);
     if (arg2) {
@@ -22547,7 +22809,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22556,9 +22818,9 @@ SWIGINTERN PyObject *_wrap_layerObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_name_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_name_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->name);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22569,7 +22831,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_group_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22578,9 +22840,9 @@ SWIGINTERN PyObject *_wrap_layerObj_group_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_group_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->group) free((char*)arg1->group);
     if (arg2) {
@@ -22599,7 +22861,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_group_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22608,9 +22870,9 @@ SWIGINTERN PyObject *_wrap_layerObj_group_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_group_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_group_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->group);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22621,7 +22883,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_status_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22633,9 +22895,9 @@ SWIGINTERN PyObject *_wrap_layerObj_status_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_status_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -22651,7 +22913,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_status_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22660,9 +22922,9 @@ SWIGINTERN PyObject *_wrap_layerObj_status_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_status_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_status_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->status);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22673,7 +22935,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_data_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22682,9 +22944,9 @@ SWIGINTERN PyObject *_wrap_layerObj_data_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_data_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->data) free((char*)arg1->data);
     if (arg2) {
@@ -22703,7 +22965,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_data_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22712,9 +22974,9 @@ SWIGINTERN PyObject *_wrap_layerObj_data_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_data_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_data_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->data);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -22725,7 +22987,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_LAYER_TYPE arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22737,9 +22999,9 @@ SWIGINTERN PyObject *_wrap_layerObj_type_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_type_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_type_set" "', argument " "2"" of type '" "enum MS_LAYER_TYPE""'");
@@ -22755,7 +23017,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22764,9 +23026,9 @@ SWIGINTERN PyObject *_wrap_layerObj_type_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_type_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_type_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (enum MS_LAYER_TYPE) ((arg1)->type);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22777,7 +23039,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tolerance_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22789,9 +23051,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tolerance_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_tolerance_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_tolerance_set" "', argument " "2"" of type '" "double""'");
@@ -22807,7 +23069,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tolerance_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22816,9 +23078,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tolerance_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_tolerance_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tolerance_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->tolerance);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -22829,7 +23091,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_toleranceunits_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22841,9 +23103,9 @@ SWIGINTERN PyObject *_wrap_layerObj_toleranceunits_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_toleranceunits_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_toleranceunits_set" "', argument " "2"" of type '" "int""'");
@@ -22859,7 +23121,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_toleranceunits_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22868,9 +23130,9 @@ SWIGINTERN PyObject *_wrap_layerObj_toleranceunits_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_toleranceunits_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_toleranceunits_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->toleranceunits);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -22881,7 +23143,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_symbolscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22893,9 +23155,9 @@ SWIGINTERN PyObject *_wrap_layerObj_symbolscaledenom_set(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_symbolscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_symbolscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22911,7 +23173,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_symbolscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22920,9 +23182,9 @@ SWIGINTERN PyObject *_wrap_layerObj_symbolscaledenom_get(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_symbolscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_symbolscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->symbolscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -22933,7 +23195,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_minscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22945,9 +23207,9 @@ SWIGINTERN PyObject *_wrap_layerObj_minscaledenom_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_minscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_minscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -22963,7 +23225,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_minscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22972,9 +23234,9 @@ SWIGINTERN PyObject *_wrap_layerObj_minscaledenom_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_minscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->minscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -22985,7 +23247,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -22997,9 +23259,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxscaledenom_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_maxscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -23015,7 +23277,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23024,9 +23286,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxscaledenom_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_maxscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->maxscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -23037,7 +23299,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_minfeaturesize_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23049,9 +23311,9 @@ SWIGINTERN PyObject *_wrap_layerObj_minfeaturesize_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_minfeaturesize_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_minfeaturesize_set" "', argument " "2"" of type '" "int""'");
@@ -23067,7 +23329,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_minfeaturesize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23076,9 +23338,9 @@ SWIGINTERN PyObject *_wrap_layerObj_minfeaturesize_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_minfeaturesize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_minfeaturesize_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->minfeaturesize);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23089,7 +23351,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelminscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23101,9 +23363,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelminscaledenom_set(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_labelminscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelminscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -23119,7 +23381,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelminscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23128,9 +23390,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelminscaledenom_get(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_labelminscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelminscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->labelminscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -23141,7 +23403,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelmaxscaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23153,9 +23415,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelmaxscaledenom_set(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_labelmaxscaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelmaxscaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -23171,7 +23433,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelmaxscaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23180,9 +23442,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelmaxscaledenom_get(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_labelmaxscaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelmaxscaledenom_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->labelmaxscaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -23193,7 +23455,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_mingeowidth_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23205,9 +23467,9 @@ SWIGINTERN PyObject *_wrap_layerObj_mingeowidth_set(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_mingeowidth_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_mingeowidth_set" "', argument " "2"" of type '" "double""'");
@@ -23223,7 +23485,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_mingeowidth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23232,9 +23494,9 @@ SWIGINTERN PyObject *_wrap_layerObj_mingeowidth_get(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_mingeowidth_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mingeowidth_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->mingeowidth);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -23245,7 +23507,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxgeowidth_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23257,9 +23519,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxgeowidth_set(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_maxgeowidth_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxgeowidth_set" "', argument " "2"" of type '" "double""'");
@@ -23275,7 +23537,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxgeowidth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23284,9 +23546,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxgeowidth_get(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_maxgeowidth_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxgeowidth_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (double) ((arg1)->maxgeowidth);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -23297,7 +23559,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_sizeunits_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23309,9 +23571,9 @@ SWIGINTERN PyObject *_wrap_layerObj_sizeunits_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_sizeunits_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_sizeunits_set" "', argument " "2"" of type '" "int""'");
@@ -23327,7 +23589,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_sizeunits_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23336,9 +23598,9 @@ SWIGINTERN PyObject *_wrap_layerObj_sizeunits_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_sizeunits_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_sizeunits_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->sizeunits);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23349,7 +23611,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxfeatures_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23361,9 +23623,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxfeatures_set(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_maxfeatures_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_maxfeatures_set" "', argument " "2"" of type '" "int""'");
@@ -23379,7 +23641,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_maxfeatures_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23388,9 +23650,9 @@ SWIGINTERN PyObject *_wrap_layerObj_maxfeatures_get(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_maxfeatures_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_maxfeatures_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->maxfeatures);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23401,7 +23663,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_startindex_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23413,9 +23675,9 @@ SWIGINTERN PyObject *_wrap_layerObj_startindex_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_startindex_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_startindex_set" "', argument " "2"" of type '" "int""'");
@@ -23431,7 +23693,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_startindex_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23440,9 +23702,9 @@ SWIGINTERN PyObject *_wrap_layerObj_startindex_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_startindex_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_startindex_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->startindex);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23453,7 +23715,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_offsite_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   colorObj *arg2 = (colorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23465,9 +23727,9 @@ SWIGINTERN PyObject *_wrap_layerObj_offsite_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_offsite_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_colorObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_offsite_set" "', argument " "2"" of type '" "colorObj *""'"); 
@@ -23483,7 +23745,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_offsite_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23492,9 +23754,9 @@ SWIGINTERN PyObject *_wrap_layerObj_offsite_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_offsite_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_offsite_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (colorObj *)& ((arg1)->offsite);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_colorObj, 0 |  0 );
   return resultobj;
@@ -23505,7 +23767,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_transform_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23517,9 +23779,9 @@ SWIGINTERN PyObject *_wrap_layerObj_transform_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_transform_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_transform_set" "', argument " "2"" of type '" "int""'");
@@ -23535,7 +23797,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_transform_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23544,9 +23806,9 @@ SWIGINTERN PyObject *_wrap_layerObj_transform_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_transform_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_transform_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->transform);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23557,7 +23819,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelcache_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23569,9 +23831,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelcache_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_labelcache_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_labelcache_set" "', argument " "2"" of type '" "int""'");
@@ -23587,7 +23849,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelcache_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23596,9 +23858,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelcache_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_labelcache_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelcache_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->labelcache);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23609,7 +23871,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_postlabelcache_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23621,9 +23883,9 @@ SWIGINTERN PyObject *_wrap_layerObj_postlabelcache_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_postlabelcache_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_postlabelcache_set" "', argument " "2"" of type '" "int""'");
@@ -23639,7 +23901,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_postlabelcache_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23648,9 +23910,9 @@ SWIGINTERN PyObject *_wrap_layerObj_postlabelcache_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_postlabelcache_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_postlabelcache_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->postlabelcache);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23661,7 +23923,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelitem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23670,9 +23932,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelitem_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_labelitem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->labelitem) free((char*)arg1->labelitem);
     if (arg2) {
@@ -23691,7 +23953,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelitem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23700,9 +23962,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelitem_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_labelitem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->labelitem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -23713,7 +23975,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tileitem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23722,9 +23984,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tileitem_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_tileitem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->tileitem) free((char*)arg1->tileitem);
     if (arg2) {
@@ -23743,7 +24005,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tileitem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23752,9 +24014,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tileitem_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_tileitem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->tileitem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -23765,7 +24027,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tileindex_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23774,9 +24036,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tileindex_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_tileindex_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->tileindex) free((char*)arg1->tileindex);
     if (arg2) {
@@ -23795,7 +24057,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_tileindex_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23804,9 +24066,9 @@ SWIGINTERN PyObject *_wrap_layerObj_tileindex_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_tileindex_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_tileindex_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->tileindex);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -23817,7 +24079,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_units_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23829,9 +24091,9 @@ SWIGINTERN PyObject *_wrap_layerObj_units_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_units_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_units_set" "', argument " "2"" of type '" "int""'");
@@ -23847,7 +24109,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_units_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23856,9 +24118,9 @@ SWIGINTERN PyObject *_wrap_layerObj_units_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_units_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_units_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->units);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -23869,7 +24131,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_connection_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23878,9 +24140,9 @@ SWIGINTERN PyObject *_wrap_layerObj_connection_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_connection_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->connection) free((char*)arg1->connection);
     if (arg2) {
@@ -23899,7 +24161,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_connection_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23908,9 +24170,9 @@ SWIGINTERN PyObject *_wrap_layerObj_connection_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_connection_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connection_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->connection);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -23921,7 +24183,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_plugin_library_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23930,9 +24192,9 @@ SWIGINTERN PyObject *_wrap_layerObj_plugin_library_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_plugin_library_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->plugin_library) free((char*)arg1->plugin_library);
     if (arg2) {
@@ -23951,7 +24213,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_plugin_library_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -23960,9 +24222,9 @@ SWIGINTERN PyObject *_wrap_layerObj_plugin_library_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_plugin_library_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->plugin_library);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -23973,7 +24235,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_plugin_library_original_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -23982,9 +24244,9 @@ SWIGINTERN PyObject *_wrap_layerObj_plugin_library_original_set(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_plugin_library_original_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->plugin_library_original) free((char*)arg1->plugin_library_original);
     if (arg2) {
@@ -24003,7 +24265,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_plugin_library_original_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24012,9 +24274,9 @@ SWIGINTERN PyObject *_wrap_layerObj_plugin_library_original_get(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_plugin_library_original_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_plugin_library_original_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->plugin_library_original);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24025,7 +24287,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_connectiontype_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   enum MS_CONNECTION_TYPE arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24037,9 +24299,9 @@ SWIGINTERN PyObject *_wrap_layerObj_connectiontype_set(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_connectiontype_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_connectiontype_set" "', argument " "2"" of type '" "enum MS_CONNECTION_TYPE""'");
@@ -24055,7 +24317,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_connectiontype_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24064,9 +24326,9 @@ SWIGINTERN PyObject *_wrap_layerObj_connectiontype_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_connectiontype_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_connectiontype_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (enum MS_CONNECTION_TYPE) ((arg1)->connectiontype);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24077,7 +24339,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_numitems_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24086,9 +24348,9 @@ SWIGINTERN PyObject *_wrap_layerObj_numitems_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_numitems_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numitems_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numitems_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->numitems);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24099,7 +24361,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_bandsitem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24108,9 +24370,9 @@ SWIGINTERN PyObject *_wrap_layerObj_bandsitem_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_bandsitem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->bandsitem) free((char*)arg1->bandsitem);
     if (arg2) {
@@ -24129,7 +24391,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_bandsitem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24138,9 +24400,9 @@ SWIGINTERN PyObject *_wrap_layerObj_bandsitem_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_bandsitem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bandsitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->bandsitem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24151,7 +24413,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_filteritem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24160,9 +24422,9 @@ SWIGINTERN PyObject *_wrap_layerObj_filteritem_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_filteritem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->filteritem) free((char*)arg1->filteritem);
     if (arg2) {
@@ -24181,7 +24443,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_filteritem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24190,9 +24452,9 @@ SWIGINTERN PyObject *_wrap_layerObj_filteritem_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_filteritem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_filteritem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->filteritem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24203,7 +24465,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_styleitem_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24212,9 +24474,9 @@ SWIGINTERN PyObject *_wrap_layerObj_styleitem_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_styleitem_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->styleitem) free((char*)arg1->styleitem);
     if (arg2) {
@@ -24233,7 +24495,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_styleitem_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24242,9 +24504,9 @@ SWIGINTERN PyObject *_wrap_layerObj_styleitem_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_styleitem_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_styleitem_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->styleitem);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24255,7 +24517,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_requires_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24264,9 +24526,9 @@ SWIGINTERN PyObject *_wrap_layerObj_requires_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_requires_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->requires) free((char*)arg1->requires);
     if (arg2) {
@@ -24285,7 +24547,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_requires_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24294,9 +24556,9 @@ SWIGINTERN PyObject *_wrap_layerObj_requires_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_requires_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_requires_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->requires);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24307,7 +24569,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelrequires_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24316,9 +24578,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelrequires_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_labelrequires_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->labelrequires) free((char*)arg1->labelrequires);
     if (arg2) {
@@ -24337,7 +24599,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_labelrequires_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24346,9 +24608,9 @@ SWIGINTERN PyObject *_wrap_layerObj_labelrequires_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_labelrequires_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_labelrequires_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->labelrequires);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24359,7 +24621,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_metadata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24368,9 +24630,9 @@ SWIGINTERN PyObject *_wrap_layerObj_metadata_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_metadata_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_metadata_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_metadata_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->metadata);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -24381,7 +24643,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_validation_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24390,9 +24652,9 @@ SWIGINTERN PyObject *_wrap_layerObj_validation_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_validation_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_validation_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_validation_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->validation);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -24403,7 +24665,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_bindvals_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24412,9 +24674,9 @@ SWIGINTERN PyObject *_wrap_layerObj_bindvals_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_bindvals_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bindvals_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_bindvals_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->bindvals);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -24425,7 +24687,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_cluster_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24434,9 +24696,9 @@ SWIGINTERN PyObject *_wrap_layerObj_cluster_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_cluster_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_cluster_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_cluster_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (clusterObj *)& ((arg1)->cluster);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_clusterObj, 0 |  0 );
   return resultobj;
@@ -24447,7 +24709,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_opacity_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24459,9 +24721,9 @@ SWIGINTERN PyObject *_wrap_layerObj_opacity_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_opacity_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_opacity_set" "', argument " "2"" of type '" "int""'");
@@ -24477,7 +24739,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_opacity_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24486,9 +24748,9 @@ SWIGINTERN PyObject *_wrap_layerObj_opacity_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_opacity_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_opacity_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->opacity);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24499,7 +24761,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_dump_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24511,9 +24773,9 @@ SWIGINTERN PyObject *_wrap_layerObj_dump_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_dump_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_dump_set" "', argument " "2"" of type '" "int""'");
@@ -24529,7 +24791,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_dump_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24538,9 +24800,9 @@ SWIGINTERN PyObject *_wrap_layerObj_dump_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_dump_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_dump_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->dump);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24551,7 +24813,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_debug_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24563,9 +24825,9 @@ SWIGINTERN PyObject *_wrap_layerObj_debug_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_debug_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -24581,7 +24843,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_debug_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24590,9 +24852,9 @@ SWIGINTERN PyObject *_wrap_layerObj_debug_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_debug_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_debug_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->debug);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24603,7 +24865,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_extent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24612,9 +24874,9 @@ SWIGINTERN PyObject *_wrap_layerObj_extent_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_extent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_extent_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_extent_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (rectObj *)& ((arg1)->extent);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, 0 |  0 );
   return resultobj;
@@ -24625,7 +24887,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_numprocessing_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24634,9 +24896,9 @@ SWIGINTERN PyObject *_wrap_layerObj_numprocessing_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_numprocessing_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numprocessing_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numprocessing_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->numprocessing);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24647,7 +24909,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_numjoins_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24656,9 +24918,9 @@ SWIGINTERN PyObject *_wrap_layerObj_numjoins_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_numjoins_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numjoins_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_numjoins_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (int) ((arg1)->numjoins);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -24669,7 +24931,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_classgroup_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24678,9 +24940,9 @@ SWIGINTERN PyObject *_wrap_layerObj_classgroup_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_classgroup_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->classgroup) free((char*)arg1->classgroup);
     if (arg2) {
@@ -24699,7 +24961,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_classgroup_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24708,9 +24970,9 @@ SWIGINTERN PyObject *_wrap_layerObj_classgroup_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_classgroup_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_classgroup_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->classgroup);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24721,7 +24983,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_mask_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24730,9 +24992,9 @@ SWIGINTERN PyObject *_wrap_layerObj_mask_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_mask_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_set" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_set" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     if (arg1->mask) free((char*)arg1->mask);
     if (arg2) {
@@ -24751,7 +25013,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_mask_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24760,9 +25022,9 @@ SWIGINTERN PyObject *_wrap_layerObj_mask_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_mask_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_get" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_mask_get" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   result = (char *) ((arg1)->mask);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -24777,7 +25039,7 @@ SWIGINTERN PyObject *_wrap_new_layerObj(PyObject *SWIGUNUSEDPARM(self), PyObject
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
-  layerObj *result = 0 ;
+  struct layerObj *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"|O:new_layerObj",&obj0)) SWIG_fail;
   if (obj0) {
@@ -24788,7 +25050,7 @@ SWIGINTERN PyObject *_wrap_new_layerObj(PyObject *SWIGUNUSEDPARM(self), PyObject
     arg1 = (mapObj *)(argp1);
   }
   {
-    result = (layerObj *)new_layerObj(arg1); {
+    result = (struct layerObj *)new_layerObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
       
       switch(ms_error->code) {
@@ -24822,7 +25084,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_layerObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24830,9 +25092,9 @@ SWIGINTERN PyObject *_wrap_delete_layerObj(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"O:delete_layerObj",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_layerObj" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_layerObj" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     delete_layerObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -24868,7 +25130,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -24877,9 +25139,9 @@ SWIGINTERN PyObject *_wrap_layerObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_clone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clone" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clone" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (layerObj *)layerObj_clone(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -24915,7 +25177,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_updateFromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -24925,9 +25187,9 @@ SWIGINTERN PyObject *_wrap_layerObj_updateFromString(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_updateFromString",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_updateFromString" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_updateFromString" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_updateFromString(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -24963,7 +25225,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_insertClass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   classObj *arg2 = (classObj *) 0 ;
   int arg3 = (int) -1 ;
   void *argp1 = 0 ;
@@ -24980,9 +25242,9 @@ SWIGINTERN PyObject *_wrap_layerObj_insertClass(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO|O:layerObj_insertClass",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_insertClass" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_insertClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_classObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_insertClass" "', argument " "2"" of type '" "classObj *""'"); 
@@ -25030,7 +25292,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_removeClass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25043,9 +25305,9 @@ SWIGINTERN PyObject *_wrap_layerObj_removeClass(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_removeClass",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeClass" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_removeClass" "', argument " "2"" of type '" "int""'");
@@ -25086,7 +25348,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_open(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -25095,9 +25357,9 @@ SWIGINTERN PyObject *_wrap_layerObj_open(PyObject *SWIGUNUSEDPARM(self), PyObjec
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_open",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_open" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_open" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_open(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -25133,7 +25395,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_whichShapes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   rectObj arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25146,9 +25408,9 @@ SWIGINTERN PyObject *_wrap_layerObj_whichShapes(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_whichShapes",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_whichShapes" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_whichShapes" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_rectObj,  0 );
     if (!SWIG_IsOK(res2)) {
@@ -25195,7 +25457,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_nextShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -25204,9 +25466,9 @@ SWIGINTERN PyObject *_wrap_layerObj_nextShape(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_nextShape",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_nextShape" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_nextShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (shapeObj *)layerObj_nextShape(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -25242,7 +25504,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_close(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -25250,9 +25512,9 @@ SWIGINTERN PyObject *_wrap_layerObj_close(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_close",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_close" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_close" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     layerObj_close(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -25288,7 +25550,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   resultObj *arg2 = (resultObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25301,9 +25563,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getShape(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getShape" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_resultObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getShape" "', argument " "2"" of type '" "resultObj *""'"); 
@@ -25344,7 +25606,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getNumResults(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -25353,9 +25615,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getNumResults(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getNumResults",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumResults" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumResults" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_getNumResults(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -25391,7 +25653,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getResultsBounds(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -25400,9 +25662,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getResultsBounds(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getResultsBounds",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResultsBounds" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResultsBounds" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (rectObj *)layerObj_getResultsBounds(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -25438,7 +25700,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getResult(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25451,9 +25713,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getResult(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getResult",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResult" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResult" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getResult" "', argument " "2"" of type '" "int""'");
@@ -25494,7 +25756,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getClass(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25507,9 +25769,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getClass(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getClass",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClass" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClass" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getClass" "', argument " "2"" of type '" "int""'");
@@ -25550,7 +25812,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -25563,9 +25825,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getItem(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getItem",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getItem" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getItem" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getItem" "', argument " "2"" of type '" "int""'");
@@ -25606,7 +25868,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setItems(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char **arg2 = (char **) 0 ;
   int arg3 ;
   void *argp1 = 0 ;
@@ -25623,9 +25885,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setItems(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_setItems",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setItems" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setItems" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_p_char, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setItems" "', argument " "2"" of type '" "char **""'"); 
@@ -25671,7 +25933,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_draw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   imageObj *arg3 = (imageObj *) 0 ;
   void *argp1 = 0 ;
@@ -25688,9 +25950,9 @@ SWIGINTERN PyObject *_wrap_layerObj_draw(PyObject *SWIGUNUSEDPARM(self), PyObjec
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_draw",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_draw" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_draw" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_draw" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25736,7 +25998,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_drawQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   imageObj *arg3 = (imageObj *) 0 ;
   void *argp1 = 0 ;
@@ -25753,9 +26015,9 @@ SWIGINTERN PyObject *_wrap_layerObj_drawQuery(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_drawQuery",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_drawQuery" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_drawQuery" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_drawQuery" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25801,7 +26063,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByFilter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -25815,9 +26077,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByFilter(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OOz:layerObj_queryByFilter",&obj0,&obj1,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFilter" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFilter" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByFilter" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25858,7 +26120,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
@@ -25877,9 +26139,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByAttributes(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOzzO:layerObj_queryByAttributes",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByAttributes" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByAttributes" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByAttributes" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -25925,7 +26187,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
@@ -25950,9 +26212,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByPoint(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:layerObj_queryByPoint",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByPoint" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByPoint" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByPoint" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26008,7 +26270,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   rectObj arg3 ;
   void *argp1 = 0 ;
@@ -26025,9 +26287,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByRect(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_queryByRect",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByRect" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByRect" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByRect" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26079,7 +26341,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByFeatures(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   void *argp1 = 0 ;
@@ -26096,9 +26358,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByFeatures(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_queryByFeatures",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFeatures" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByFeatures" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByFeatures" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26144,7 +26406,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   shapeObj *arg3 = (shapeObj *) 0 ;
   void *argp1 = 0 ;
@@ -26161,9 +26423,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByShape(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_queryByShape",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByShape" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByShape" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByShape" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26209,7 +26471,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_queryByIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   int arg4 ;
@@ -26234,9 +26496,9 @@ SWIGINTERN PyObject *_wrap_layerObj_queryByIndex(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:layerObj_queryByIndex",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByIndex" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_queryByIndex" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_queryByIndex" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -26294,7 +26556,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getResults(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26303,9 +26565,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getResults(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getResults",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResults" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getResults" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (resultCacheObj *)layerObj_getResults(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -26341,7 +26603,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setFilter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26351,9 +26613,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setFilter(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_setFilter",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setFilter" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setFilter" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_setFilter(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -26389,7 +26651,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getFilterString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26398,9 +26660,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getFilterString(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getFilterString",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFilterString" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFilterString" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_getFilterString(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -26437,7 +26699,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setWKTProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26447,9 +26709,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setWKTProjection(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_setWKTProjection",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setWKTProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setWKTProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_setWKTProjection(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -26485,7 +26747,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26494,9 +26756,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getProjection(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getProjection",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_getProjection(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -26533,7 +26795,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26543,9 +26805,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setProjection(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_setProjection",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProjection" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProjection" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_setProjection(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -26581,7 +26843,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_addFeature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   shapeObj *arg2 = (shapeObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26594,9 +26856,9 @@ SWIGINTERN PyObject *_wrap_layerObj_addFeature(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_addFeature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addFeature" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addFeature" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_shapeObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_addFeature" "', argument " "2"" of type '" "shapeObj *""'"); 
@@ -26637,7 +26899,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getNumFeatures(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26646,9 +26908,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getNumFeatures(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getNumFeatures",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumFeatures" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNumFeatures" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_getNumFeatures(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -26684,7 +26946,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getExtent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26693,9 +26955,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getExtent(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getExtent",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getExtent" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getExtent" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (rectObj *)layerObj_getExtent(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -26731,7 +26993,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setExtent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   double arg2 = (double) -1.0 ;
   double arg3 = (double) -1.0 ;
   double arg4 = (double) -1.0 ;
@@ -26756,9 +27018,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setExtent(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O|OOOO:layerObj_setExtent",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setExtent" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setExtent" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_double(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {
@@ -26822,7 +27084,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26832,9 +27094,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getMetaData(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_getMetaData",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_getMetaData(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -26870,7 +27132,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -26881,9 +27143,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setMetaData(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Ozz:layerObj_setMetaData",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_setMetaData(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -26919,7 +27181,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_removeMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -26929,9 +27191,9 @@ SWIGINTERN PyObject *_wrap_layerObj_removeMetaData(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_removeMetaData",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeMetaData" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_removeMetaData" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_removeMetaData(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -26967,7 +27229,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -26976,9 +27238,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_getFirstMetaDataKey",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFirstMetaDataKey" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_getFirstMetaDataKey(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -27014,7 +27276,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27024,9 +27286,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"Oz:layerObj_getNextMetaDataKey",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNextMetaDataKey" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_getNextMetaDataKey(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -27062,7 +27324,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getWMSFeatureInfoURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   int arg3 ;
   int arg4 ;
@@ -27088,9 +27350,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getWMSFeatureInfoURL(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OOOOOz:layerObj_getWMSFeatureInfoURL",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getWMSFeatureInfoURL" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -27147,7 +27409,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_executeWFSGetFeature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   layerObj *arg2 = (layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27160,9 +27422,9 @@ SWIGINTERN PyObject *_wrap_layerObj_executeWFSGetFeature(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_executeWFSGetFeature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_executeWFSGetFeature" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_executeWFSGetFeature" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_executeWFSGetFeature" "', argument " "2"" of type '" "layerObj *""'"); 
@@ -27204,7 +27466,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_applySLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -27215,9 +27477,9 @@ SWIGINTERN PyObject *_wrap_layerObj_applySLD(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Ozz:layerObj_applySLD",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLD" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLD" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_applySLD(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -27253,7 +27515,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_applySLDURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -27264,9 +27526,9 @@ SWIGINTERN PyObject *_wrap_layerObj_applySLDURL(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Ozz:layerObj_applySLDURL",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLDURL" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_applySLDURL" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_applySLDURL(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -27302,7 +27564,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_generateSLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -27311,9 +27573,9 @@ SWIGINTERN PyObject *_wrap_layerObj_generateSLD(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_generateSLD",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_generateSLD" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_generateSLD" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (char *)layerObj_generateSLD(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -27350,7 +27612,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_isVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -27359,9 +27621,9 @@ SWIGINTERN PyObject *_wrap_layerObj_isVisible(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_isVisible",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_isVisible" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_isVisible" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_isVisible(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -27397,7 +27659,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_moveClassUp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27410,9 +27672,9 @@ SWIGINTERN PyObject *_wrap_layerObj_moveClassUp(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_moveClassUp",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassUp" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassUp" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_moveClassUp" "', argument " "2"" of type '" "int""'");
@@ -27453,7 +27715,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_moveClassDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27466,9 +27728,9 @@ SWIGINTERN PyObject *_wrap_layerObj_moveClassDown(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_moveClassDown",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassDown" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_moveClassDown" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_moveClassDown" "', argument " "2"" of type '" "int""'");
@@ -27509,7 +27771,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setProcessingKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -27527,9 +27789,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setProcessingKey(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_setProcessingKey",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessingKey" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessingKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setProcessingKey" "', argument " "2"" of type '" "char const *""'");
@@ -27579,7 +27841,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setProcessing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27592,9 +27854,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setProcessing(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_setProcessing",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_setProcessing" "', argument " "2"" of type '" "char const *""'");
@@ -27637,7 +27899,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_addProcessing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27650,9 +27912,9 @@ SWIGINTERN PyObject *_wrap_layerObj_addProcessing(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_addProcessing",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_addProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_addProcessing" "', argument " "2"" of type '" "char const *""'");
@@ -27695,7 +27957,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getProcessing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27708,9 +27970,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getProcessing(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getProcessing",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_getProcessing" "', argument " "2"" of type '" "int""'");
@@ -27751,7 +28013,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getProcessingKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -27765,9 +28027,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getProcessingKey(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OO:layerObj_getProcessingKey",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessingKey" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getProcessingKey" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getProcessingKey" "', argument " "2"" of type '" "char const *""'");
@@ -27810,7 +28072,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_clearProcessing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -27819,9 +28081,9 @@ SWIGINTERN PyObject *_wrap_layerObj_clearProcessing(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:layerObj_clearProcessing",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clearProcessing" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_clearProcessing" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   {
     result = (int)layerObj_clearProcessing(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -27857,7 +28119,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_setConnectionType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   int arg2 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -27875,9 +28137,9 @@ SWIGINTERN PyObject *_wrap_layerObj_setConnectionType(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOO:layerObj_setConnectionType",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setConnectionType" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_setConnectionType" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "layerObj_setConnectionType" "', argument " "2"" of type '" "int""'");
@@ -27925,7 +28187,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_layerObj_getClassIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  layerObj *arg1 = (layerObj *) 0 ;
+  struct layerObj *arg1 = (struct layerObj *) 0 ;
   mapObj *arg2 = (mapObj *) 0 ;
   shapeObj *arg3 = (shapeObj *) 0 ;
   int *arg4 = (int *) NULL ;
@@ -27950,9 +28212,9 @@ SWIGINTERN PyObject *_wrap_layerObj_getClassIndex(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:layerObj_getClassIndex",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClassIndex" "', argument " "1"" of type '" "layerObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "layerObj_getClassIndex" "', argument " "1"" of type '" "struct layerObj *""'"); 
   }
-  arg1 = (layerObj *)(argp1);
+  arg1 = (struct layerObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "layerObj_getClassIndex" "', argument " "2"" of type '" "mapObj *""'"); 
@@ -28019,7 +28281,7 @@ SWIGINTERN PyObject *layerObj_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObj
 
 SWIGINTERN PyObject *_wrap_mapObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28028,9 +28290,9 @@ SWIGINTERN PyObject *_wrap_mapObj_name_set(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_name_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     if (arg1->name) free((char*)arg1->name);
     if (arg2) {
@@ -28049,7 +28311,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28058,9 +28320,9 @@ SWIGINTERN PyObject *_wrap_mapObj_name_get(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_name_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_name_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->name);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -28071,7 +28333,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_status_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28083,9 +28345,9 @@ SWIGINTERN PyObject *_wrap_mapObj_status_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_status_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_status_set" "', argument " "2"" of type '" "int""'");
@@ -28101,7 +28363,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_status_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28110,9 +28372,9 @@ SWIGINTERN PyObject *_wrap_mapObj_status_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_status_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_status_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->status);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28123,7 +28385,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_height_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28135,9 +28397,9 @@ SWIGINTERN PyObject *_wrap_mapObj_height_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_height_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_height_set" "', argument " "2"" of type '" "int""'");
@@ -28153,7 +28415,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_height_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28162,9 +28424,9 @@ SWIGINTERN PyObject *_wrap_mapObj_height_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_height_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_height_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->height);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28175,7 +28437,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_width_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28187,9 +28449,9 @@ SWIGINTERN PyObject *_wrap_mapObj_width_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_width_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_width_set" "', argument " "2"" of type '" "int""'");
@@ -28205,7 +28467,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_width_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28214,9 +28476,9 @@ SWIGINTERN PyObject *_wrap_mapObj_width_get(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_width_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_width_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->width);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28227,7 +28489,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_maxsize_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28239,9 +28501,9 @@ SWIGINTERN PyObject *_wrap_mapObj_maxsize_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_maxsize_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_maxsize_set" "', argument " "2"" of type '" "int""'");
@@ -28257,7 +28519,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_maxsize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28266,9 +28528,9 @@ SWIGINTERN PyObject *_wrap_mapObj_maxsize_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_maxsize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxsize_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->maxsize);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28279,7 +28541,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_refcount_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28288,9 +28550,9 @@ SWIGINTERN PyObject *_wrap_mapObj_refcount_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_refcount_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_refcount_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_refcount_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->refcount);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28301,7 +28563,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_numlayers_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28310,9 +28572,9 @@ SWIGINTERN PyObject *_wrap_mapObj_numlayers_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_numlayers_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numlayers_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numlayers_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->numlayers);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28323,7 +28585,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_maxlayers_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28332,9 +28594,9 @@ SWIGINTERN PyObject *_wrap_mapObj_maxlayers_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_maxlayers_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxlayers_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_maxlayers_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->maxlayers);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28345,7 +28607,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_symbolset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28354,9 +28616,9 @@ SWIGINTERN PyObject *_wrap_mapObj_symbolset_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_symbolset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_symbolset_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_symbolset_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (symbolSetObj *)& ((arg1)->symbolset);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_symbolSetObj, 0 |  0 );
   return resultobj;
@@ -28367,7 +28629,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_fontset_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28376,9 +28638,9 @@ SWIGINTERN PyObject *_wrap_mapObj_fontset_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_fontset_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_fontset_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_fontset_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (fontSetObj *)& ((arg1)->fontset);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_fontSetObj, 0 |  0 );
   return resultobj;
@@ -28389,7 +28651,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_labelcache_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28398,9 +28660,9 @@ SWIGINTERN PyObject *_wrap_mapObj_labelcache_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_labelcache_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_labelcache_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_labelcache_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (labelCacheObj *)& ((arg1)->labelcache);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_labelCacheObj, 0 |  0 );
   return resultobj;
@@ -28411,7 +28673,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_transparent_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28423,9 +28685,9 @@ SWIGINTERN PyObject *_wrap_mapObj_transparent_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_transparent_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_transparent_set" "', argument " "2"" of type '" "int""'");
@@ -28441,7 +28703,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_transparent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28450,9 +28712,9 @@ SWIGINTERN PyObject *_wrap_mapObj_transparent_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_transparent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_transparent_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->transparent);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28463,7 +28725,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_interlace_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28475,9 +28737,9 @@ SWIGINTERN PyObject *_wrap_mapObj_interlace_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_interlace_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_interlace_set" "', argument " "2"" of type '" "int""'");
@@ -28493,7 +28755,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_interlace_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28502,9 +28764,9 @@ SWIGINTERN PyObject *_wrap_mapObj_interlace_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_interlace_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_interlace_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->interlace);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28515,7 +28777,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_imagequality_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28527,9 +28789,9 @@ SWIGINTERN PyObject *_wrap_mapObj_imagequality_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_imagequality_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_imagequality_set" "', argument " "2"" of type '" "int""'");
@@ -28545,7 +28807,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_imagequality_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28554,9 +28816,9 @@ SWIGINTERN PyObject *_wrap_mapObj_imagequality_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_imagequality_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagequality_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->imagequality);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28567,7 +28829,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_extent_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj *arg2 = (rectObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28579,9 +28841,9 @@ SWIGINTERN PyObject *_wrap_mapObj_extent_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_extent_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_rectObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_extent_set" "', argument " "2"" of type '" "rectObj *""'"); 
@@ -28597,7 +28859,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_extent_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28606,9 +28868,9 @@ SWIGINTERN PyObject *_wrap_mapObj_extent_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_extent_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_extent_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (rectObj *)& ((arg1)->extent);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_rectObj, 0 |  0 );
   return resultobj;
@@ -28619,7 +28881,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_cellsize_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28631,9 +28893,9 @@ SWIGINTERN PyObject *_wrap_mapObj_cellsize_set(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_cellsize_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_cellsize_set" "', argument " "2"" of type '" "double""'");
@@ -28649,7 +28911,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_cellsize_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28658,9 +28920,9 @@ SWIGINTERN PyObject *_wrap_mapObj_cellsize_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_cellsize_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_cellsize_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (double) ((arg1)->cellsize);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -28671,7 +28933,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_units_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   enum MS_UNITS arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28683,9 +28945,9 @@ SWIGINTERN PyObject *_wrap_mapObj_units_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_units_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_units_set" "', argument " "2"" of type '" "enum MS_UNITS""'");
@@ -28701,7 +28963,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_units_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28710,9 +28972,9 @@ SWIGINTERN PyObject *_wrap_mapObj_units_get(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_units_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_units_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (enum MS_UNITS) ((arg1)->units);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -28723,7 +28985,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_scaledenom_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28735,9 +28997,9 @@ SWIGINTERN PyObject *_wrap_mapObj_scaledenom_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_scaledenom_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_scaledenom_set" "', argument " "2"" of type '" "double""'");
@@ -28753,7 +29015,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_scaledenom_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28762,9 +29024,9 @@ SWIGINTERN PyObject *_wrap_mapObj_scaledenom_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_scaledenom_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaledenom_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (double) ((arg1)->scaledenom);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -28775,7 +29037,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_resolution_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28787,9 +29049,9 @@ SWIGINTERN PyObject *_wrap_mapObj_resolution_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_resolution_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_resolution_set" "', argument " "2"" of type '" "double""'");
@@ -28805,7 +29067,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_resolution_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28814,9 +29076,9 @@ SWIGINTERN PyObject *_wrap_mapObj_resolution_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_resolution_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_resolution_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (double) ((arg1)->resolution);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -28827,7 +29089,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_defresolution_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28839,9 +29101,9 @@ SWIGINTERN PyObject *_wrap_mapObj_defresolution_set(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_defresolution_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_defresolution_set" "', argument " "2"" of type '" "double""'");
@@ -28857,7 +29119,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_defresolution_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28866,9 +29128,9 @@ SWIGINTERN PyObject *_wrap_mapObj_defresolution_get(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_defresolution_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_defresolution_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (double) ((arg1)->defresolution);
   resultobj = SWIG_From_double((double)(result));
   return resultobj;
@@ -28879,7 +29141,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_shapepath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28888,9 +29150,9 @@ SWIGINTERN PyObject *_wrap_mapObj_shapepath_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_shapepath_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     if (arg1->shapepath) free((char*)arg1->shapepath);
     if (arg2) {
@@ -28909,7 +29171,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_shapepath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28918,9 +29180,9 @@ SWIGINTERN PyObject *_wrap_mapObj_shapepath_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_shapepath_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_shapepath_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->shapepath);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -28931,7 +29193,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_mappath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28940,9 +29202,9 @@ SWIGINTERN PyObject *_wrap_mapObj_mappath_set(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_mappath_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     if (arg1->mappath) free((char*)arg1->mappath);
     if (arg2) {
@@ -28961,7 +29223,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_mappath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -28970,9 +29232,9 @@ SWIGINTERN PyObject *_wrap_mapObj_mappath_get(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_mappath_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_mappath_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->mappath);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -28983,7 +29245,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_imagecolor_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   colorObj *arg2 = (colorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -28995,9 +29257,9 @@ SWIGINTERN PyObject *_wrap_mapObj_imagecolor_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_imagecolor_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_colorObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_imagecolor_set" "', argument " "2"" of type '" "colorObj *""'"); 
@@ -29013,7 +29275,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_imagecolor_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29022,9 +29284,9 @@ SWIGINTERN PyObject *_wrap_mapObj_imagecolor_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_imagecolor_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagecolor_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (colorObj *)& ((arg1)->imagecolor);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_colorObj, 0 |  0 );
   return resultobj;
@@ -29035,7 +29297,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_numoutputformats_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29044,9 +29306,9 @@ SWIGINTERN PyObject *_wrap_mapObj_numoutputformats_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_numoutputformats_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numoutputformats_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_numoutputformats_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->numoutputformats);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -29057,7 +29319,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_outputformatlist_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29066,9 +29328,9 @@ SWIGINTERN PyObject *_wrap_mapObj_outputformatlist_get(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_outputformatlist_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformatlist_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformatlist_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (outputFormatObj **) ((arg1)->outputformatlist);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_outputFormatObj, 0 |  0 );
   return resultobj;
@@ -29079,7 +29341,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_outputformat_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29088,9 +29350,9 @@ SWIGINTERN PyObject *_wrap_mapObj_outputformat_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_outputformat_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformat_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_outputformat_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (outputFormatObj *) ((arg1)->outputformat);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_outputFormatObj, 0 |  0 );
   return resultobj;
@@ -29101,7 +29363,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_imagetype_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29110,9 +29372,9 @@ SWIGINTERN PyObject *_wrap_mapObj_imagetype_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_imagetype_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagetype_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_imagetype_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->imagetype);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -29123,7 +29385,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_reference_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29132,9 +29394,9 @@ SWIGINTERN PyObject *_wrap_mapObj_reference_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_reference_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_reference_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_reference_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (referenceMapObj *)& ((arg1)->reference);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_referenceMapObj, 0 |  0 );
   return resultobj;
@@ -29145,7 +29407,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_scalebar_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29154,9 +29416,9 @@ SWIGINTERN PyObject *_wrap_mapObj_scalebar_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_scalebar_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scalebar_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scalebar_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (scalebarObj *)& ((arg1)->scalebar);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_scalebarObj, 0 |  0 );
   return resultobj;
@@ -29167,7 +29429,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_legend_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29176,9 +29438,9 @@ SWIGINTERN PyObject *_wrap_mapObj_legend_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_legend_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_legend_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_legend_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (legendObj *)& ((arg1)->legend);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_legendObj, 0 |  0 );
   return resultobj;
@@ -29189,7 +29451,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_querymap_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29198,9 +29460,9 @@ SWIGINTERN PyObject *_wrap_mapObj_querymap_get(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_querymap_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_querymap_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_querymap_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (queryMapObj *)& ((arg1)->querymap);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_queryMapObj, 0 |  0 );
   return resultobj;
@@ -29211,7 +29473,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_web_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29220,9 +29482,9 @@ SWIGINTERN PyObject *_wrap_mapObj_web_get(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_web_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_web_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_web_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (webObj *)& ((arg1)->web);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_webObj, 0 |  0 );
   return resultobj;
@@ -29233,7 +29495,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_layerorder_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29245,9 +29507,9 @@ SWIGINTERN PyObject *_wrap_mapObj_layerorder_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_layerorder_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_layerorder_set" "', argument " "2"" of type '" "int *""'"); 
@@ -29263,7 +29525,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_layerorder_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29272,9 +29534,9 @@ SWIGINTERN PyObject *_wrap_mapObj_layerorder_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_layerorder_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_layerorder_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int *) ((arg1)->layerorder);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
   return resultobj;
@@ -29285,7 +29547,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_debug_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29297,9 +29559,9 @@ SWIGINTERN PyObject *_wrap_mapObj_debug_set(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_debug_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_debug_set" "', argument " "2"" of type '" "int""'");
@@ -29315,7 +29577,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_debug_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29324,9 +29586,9 @@ SWIGINTERN PyObject *_wrap_mapObj_debug_get(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_debug_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_debug_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (int) ((arg1)->debug);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -29337,7 +29599,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_datapattern_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29346,9 +29608,9 @@ SWIGINTERN PyObject *_wrap_mapObj_datapattern_set(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_datapattern_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     if (arg1->datapattern) free((char*)arg1->datapattern);
     if (arg2) {
@@ -29367,7 +29629,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_datapattern_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29376,9 +29638,9 @@ SWIGINTERN PyObject *_wrap_mapObj_datapattern_get(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_datapattern_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_datapattern_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->datapattern);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -29389,7 +29651,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_templatepattern_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29398,9 +29660,9 @@ SWIGINTERN PyObject *_wrap_mapObj_templatepattern_set(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_templatepattern_set",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_set" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_set" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     if (arg1->templatepattern) free((char*)arg1->templatepattern);
     if (arg2) {
@@ -29419,7 +29681,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_templatepattern_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29428,9 +29690,9 @@ SWIGINTERN PyObject *_wrap_mapObj_templatepattern_get(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_templatepattern_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_templatepattern_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (char *) ((arg1)->templatepattern);
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
@@ -29441,7 +29703,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_configoptions_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29450,9 +29712,9 @@ SWIGINTERN PyObject *_wrap_mapObj_configoptions_get(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_configoptions_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_configoptions_get" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_configoptions_get" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   result = (hashTableObj *)& ((arg1)->configoptions);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_hashTableObj, 0 |  0 );
   return resultobj;
@@ -29464,11 +29726,11 @@ fail:
 SWIGINTERN PyObject *_wrap_new_mapObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) "" ;
-  mapObj *result = 0 ;
+  struct mapObj *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"|z:new_mapObj",&arg1)) SWIG_fail;
   {
-    result = (mapObj *)new_mapObj(arg1); {
+    result = (struct mapObj *)new_mapObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
       
       switch(ms_error->code) {
@@ -29502,7 +29764,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_mapObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29510,9 +29772,9 @@ SWIGINTERN PyObject *_wrap_delete_mapObj(PyObject *SWIGUNUSEDPARM(self), PyObjec
   if (!PyArg_ParseTuple(args,(char *)"O:delete_mapObj",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_mapObj" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_mapObj" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     delete_mapObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -29548,7 +29810,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29557,9 +29819,9 @@ SWIGINTERN PyObject *_wrap_mapObj_clone(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_clone",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_clone" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_clone" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (mapObj *)mapObj_clone(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -29595,7 +29857,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_insertLayer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   layerObj *arg2 = (layerObj *) 0 ;
   int arg3 = (int) -1 ;
   void *argp1 = 0 ;
@@ -29612,9 +29874,9 @@ SWIGINTERN PyObject *_wrap_mapObj_insertLayer(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO|O:mapObj_insertLayer",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_insertLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_insertLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_layerObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_insertLayer" "', argument " "2"" of type '" "layerObj *""'"); 
@@ -29662,7 +29924,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_removeLayer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29675,9 +29937,9 @@ SWIGINTERN PyObject *_wrap_mapObj_removeLayer(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_removeLayer",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_removeLayer" "', argument " "2"" of type '" "int""'");
@@ -29718,7 +29980,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setExtent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   double arg4 ;
@@ -29743,9 +30005,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setExtent(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:mapObj_setExtent",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setExtent" "', argument " "2"" of type '" "double""'");
@@ -29801,7 +30063,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_offsetExtent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   void *argp1 = 0 ;
@@ -29818,9 +30080,9 @@ SWIGINTERN PyObject *_wrap_mapObj_offsetExtent(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OOO:mapObj_offsetExtent",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_offsetExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_offsetExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_offsetExtent" "', argument " "2"" of type '" "double""'");
@@ -29866,7 +30128,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_scaleExtent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   double arg3 ;
   double arg4 ;
@@ -29887,9 +30149,9 @@ SWIGINTERN PyObject *_wrap_mapObj_scaleExtent(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OOOO:mapObj_scaleExtent",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaleExtent" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_scaleExtent" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_scaleExtent" "', argument " "2"" of type '" "double""'");
@@ -29940,7 +30202,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setCenter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   pointObj *arg2 = (pointObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -29953,9 +30215,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setCenter(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_setCenter",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setCenter" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setCenter" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_pointObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setCenter" "', argument " "2"" of type '" "pointObj *""'"); 
@@ -29996,7 +30258,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   int arg3 ;
   void *argp1 = 0 ;
@@ -30013,9 +30275,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setSize(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"OOO:mapObj_setSize",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSize" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSize" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setSize" "', argument " "2"" of type '" "int""'");
@@ -30061,7 +30323,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setRotation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30074,9 +30336,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setRotation(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_setRotation",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setRotation" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setRotation" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_setRotation" "', argument " "2"" of type '" "double""'");
@@ -30117,7 +30379,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getLayer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30130,9 +30392,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getLayer(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_getLayer",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayer" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayer" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_getLayer" "', argument " "2"" of type '" "int""'");
@@ -30173,7 +30435,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getLayerByName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30183,9 +30445,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getLayerByName(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getLayerByName",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerByName" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (layerObj *)mapObj_getLayerByName(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -30221,7 +30483,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getSymbolByName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30231,9 +30493,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getSymbolByName(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getSymbolByName",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSymbolByName" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSymbolByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_getSymbolByName(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -30269,7 +30531,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_prepareQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30277,9 +30539,9 @@ SWIGINTERN PyObject *_wrap_mapObj_prepareQuery(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_prepareQuery",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     mapObj_prepareQuery(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30315,7 +30577,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_prepareImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30324,9 +30586,9 @@ SWIGINTERN PyObject *_wrap_mapObj_prepareImage(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_prepareImage",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareImage" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_prepareImage" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_prepareImage(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30362,7 +30624,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setImageType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30371,9 +30633,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setImageType(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_setImageType",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setImageType" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setImageType" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     mapObj_setImageType(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -30409,7 +30671,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_selectOutputFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30418,9 +30680,9 @@ SWIGINTERN PyObject *_wrap_mapObj_selectOutputFormat(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_selectOutputFormat",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_selectOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_selectOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     mapObj_selectOutputFormat(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -30456,7 +30718,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setOutputFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj *arg2 = (outputFormatObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30468,9 +30730,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setOutputFormat(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_setOutputFormat",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_outputFormatObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setOutputFormat" "', argument " "2"" of type '" "outputFormatObj *""'"); 
@@ -30511,7 +30773,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_draw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30520,9 +30782,9 @@ SWIGINTERN PyObject *_wrap_mapObj_draw(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_draw",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_draw" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_draw" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_draw(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30558,7 +30820,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_drawQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30567,9 +30829,9 @@ SWIGINTERN PyObject *_wrap_mapObj_drawQuery(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_drawQuery",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_drawQuery(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30605,7 +30867,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_drawLegend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30614,9 +30876,9 @@ SWIGINTERN PyObject *_wrap_mapObj_drawLegend(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_drawLegend",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLegend" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLegend" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_drawLegend(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30652,7 +30914,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_drawScalebar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30661,9 +30923,9 @@ SWIGINTERN PyObject *_wrap_mapObj_drawScalebar(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_drawScalebar",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawScalebar" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawScalebar" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_drawScalebar(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30699,7 +30961,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_drawReferenceMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30708,9 +30970,9 @@ SWIGINTERN PyObject *_wrap_mapObj_drawReferenceMap(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_drawReferenceMap",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawReferenceMap" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawReferenceMap" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (imageObj *)mapObj_drawReferenceMap(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -30746,7 +31008,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_embedScalebar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30759,9 +31021,9 @@ SWIGINTERN PyObject *_wrap_mapObj_embedScalebar(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_embedScalebar",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedScalebar" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedScalebar" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_embedScalebar" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30802,7 +31064,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_embedLegend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30815,9 +31077,9 @@ SWIGINTERN PyObject *_wrap_mapObj_embedLegend(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_embedLegend",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedLegend" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_embedLegend" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_embedLegend" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30858,7 +31120,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_drawLabelCache(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   imageObj *arg2 = (imageObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30871,9 +31133,9 @@ SWIGINTERN PyObject *_wrap_mapObj_drawLabelCache(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_drawLabelCache",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLabelCache" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_drawLabelCache" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_imageObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_drawLabelCache" "', argument " "2"" of type '" "imageObj *""'"); 
@@ -30914,7 +31176,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -30927,9 +31189,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getLabel(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_getLabel",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLabel" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLabel" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_getLabel" "', argument " "2"" of type '" "int""'");
@@ -30970,7 +31232,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_nextLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -30979,9 +31241,9 @@ SWIGINTERN PyObject *_wrap_mapObj_nextLabel(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_nextLabel",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_nextLabel" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_nextLabel" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (labelCacheMemberObj *)mapObj_nextLabel(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -31017,7 +31279,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_queryByFilter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31027,9 +31289,9 @@ SWIGINTERN PyObject *_wrap_mapObj_queryByFilter(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_queryByFilter",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFilter" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFilter" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_queryByFilter(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31065,7 +31327,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_queryByPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   pointObj *arg2 = (pointObj *) 0 ;
   int arg3 ;
   double arg4 ;
@@ -31086,9 +31348,9 @@ SWIGINTERN PyObject *_wrap_mapObj_queryByPoint(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OOOO:mapObj_queryByPoint",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByPoint" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByPoint" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_pointObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_queryByPoint" "', argument " "2"" of type '" "pointObj *""'"); 
@@ -31139,7 +31401,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_queryByRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31152,9 +31414,9 @@ SWIGINTERN PyObject *_wrap_mapObj_queryByRect(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_queryByRect",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByRect" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByRect" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_rectObj,  0 );
     if (!SWIG_IsOK(res2)) {
@@ -31201,7 +31463,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_queryByFeatures(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31214,9 +31476,9 @@ SWIGINTERN PyObject *_wrap_mapObj_queryByFeatures(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_queryByFeatures",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFeatures" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByFeatures" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_queryByFeatures" "', argument " "2"" of type '" "int""'");
@@ -31257,7 +31519,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_queryByShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   shapeObj *arg2 = (shapeObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31270,9 +31532,9 @@ SWIGINTERN PyObject *_wrap_mapObj_queryByShape(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_queryByShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByShape" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_queryByShape" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_shapeObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_queryByShape" "', argument " "2"" of type '" "shapeObj *""'"); 
@@ -31313,7 +31575,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setWKTProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31323,9 +31585,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setWKTProjection(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_setWKTProjection",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setWKTProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setWKTProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_setWKTProjection(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31361,7 +31623,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -31370,9 +31632,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getProjection(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getProjection",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_getProjection(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -31409,7 +31671,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setProjection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31419,9 +31681,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setProjection(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_setProjection",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setProjection" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setProjection" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_setProjection(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31457,7 +31719,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_save(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31467,9 +31729,9 @@ SWIGINTERN PyObject *_wrap_mapObj_save(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_save",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_save" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_save" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_save(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31505,7 +31767,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_saveQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) 0 ;
   void *argp1 = 0 ;
@@ -31519,9 +31781,9 @@ SWIGINTERN PyObject *_wrap_mapObj_saveQuery(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"Oz|O:mapObj_saveQuery",&obj0,&arg2,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   if (obj2) {
     ecode3 = SWIG_AsVal_int(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -31564,7 +31826,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_loadQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31574,9 +31836,9 @@ SWIGINTERN PyObject *_wrap_mapObj_loadQuery(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_loadQuery",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_loadQuery(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31612,7 +31874,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_freeQuery(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 = (int) -1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31624,9 +31886,9 @@ SWIGINTERN PyObject *_wrap_mapObj_freeQuery(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"O|O:mapObj_freeQuery",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_freeQuery" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_freeQuery" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   if (obj1) {
     ecode2 = SWIG_AsVal_int(obj1, &val2);
     if (!SWIG_IsOK(ecode2)) {
@@ -31669,7 +31931,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_saveQueryAsGML(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) "GOMF" ;
   void *argp1 = 0 ;
@@ -31684,9 +31946,9 @@ SWIGINTERN PyObject *_wrap_mapObj_saveQueryAsGML(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz|O:mapObj_saveQueryAsGML",&obj0,&arg2,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQueryAsGML" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveQueryAsGML" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   if (obj2) {
     res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -31731,7 +31993,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31741,9 +32003,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getMetaData(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getMetaData",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_getMetaData(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31779,7 +32041,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -31790,9 +32052,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setMetaData(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Ozz:mapObj_setMetaData",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_setMetaData(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -31828,7 +32090,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_removeMetaData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31838,9 +32100,9 @@ SWIGINTERN PyObject *_wrap_mapObj_removeMetaData(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_removeMetaData",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeMetaData" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeMetaData" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_removeMetaData(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31876,7 +32138,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -31885,9 +32147,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getFirstMetaDataKey(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getFirstMetaDataKey",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getFirstMetaDataKey" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getFirstMetaDataKey" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_getFirstMetaDataKey(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -31923,7 +32185,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31933,9 +32195,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getNextMetaDataKey(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getNextMetaDataKey",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNextMetaDataKey" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNextMetaDataKey" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_getNextMetaDataKey(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -31971,7 +32233,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setSymbolSet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -31981,9 +32243,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setSymbolSet(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_setSymbolSet",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSymbolSet" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setSymbolSet" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_setSymbolSet(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32019,7 +32281,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getNumSymbols(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -32028,9 +32290,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getNumSymbols(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getNumSymbols",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNumSymbols" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getNumSymbols" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_getNumSymbols(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -32066,7 +32328,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setFontSet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32076,9 +32338,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setFontSet(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_setFontSet",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setFontSet" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setFontSet" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_setFontSet(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32114,7 +32376,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_saveMapContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32124,9 +32386,9 @@ SWIGINTERN PyObject *_wrap_mapObj_saveMapContext(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_saveMapContext",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveMapContext" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_saveMapContext" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_saveMapContext(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32162,7 +32424,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_loadMapContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) 0 ;
   void *argp1 = 0 ;
@@ -32176,9 +32438,9 @@ SWIGINTERN PyObject *_wrap_mapObj_loadMapContext(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"Oz|O:mapObj_loadMapContext",&obj0,&arg2,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadMapContext" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadMapContext" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   if (obj2) {
     ecode3 = SWIG_AsVal_int(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -32221,7 +32483,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_moveLayerUp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32234,9 +32496,9 @@ SWIGINTERN PyObject *_wrap_mapObj_moveLayerUp(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_moveLayerUp",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerUp" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerUp" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_moveLayerUp" "', argument " "2"" of type '" "int""'");
@@ -32277,7 +32539,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_moveLayerDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32290,9 +32552,9 @@ SWIGINTERN PyObject *_wrap_mapObj_moveLayerDown(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_moveLayerDown",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerDown" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_moveLayerDown" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_moveLayerDown" "', argument " "2"" of type '" "int""'");
@@ -32333,7 +32595,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getLayersDrawingOrder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -32342,9 +32604,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getLayersDrawingOrder(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getLayersDrawingOrder",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayersDrawingOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayersDrawingOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (intarray *)mapObj_getLayersDrawingOrder(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -32380,7 +32642,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setLayersDrawingOrder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int *arg2 = (int *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32393,9 +32655,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setLayersDrawingOrder(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_setLayersDrawingOrder",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_int, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_setLayersDrawingOrder" "', argument " "2"" of type '" "int *""'"); 
@@ -32436,7 +32698,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setConfigOption(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -32446,9 +32708,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setConfigOption(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Ozz:mapObj_setConfigOption",&obj0,&arg2,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setConfigOption" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setConfigOption" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     mapObj_setConfigOption(arg1,arg2,arg3); {
       errorObj *ms_error = msGetErrorObj();
@@ -32484,7 +32746,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getConfigOption(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32494,9 +32756,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getConfigOption(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getConfigOption",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getConfigOption" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getConfigOption" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_getConfigOption(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32532,7 +32794,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_applyConfigOptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -32540,9 +32802,9 @@ SWIGINTERN PyObject *_wrap_mapObj_applyConfigOptions(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_applyConfigOptions",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applyConfigOptions" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applyConfigOptions" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     mapObj_applyConfigOptions(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -32578,7 +32840,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_applySLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32588,9 +32850,9 @@ SWIGINTERN PyObject *_wrap_mapObj_applySLD(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_applySLD",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLD" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLD" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_applySLD(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32626,7 +32888,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_applySLDURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32636,9 +32898,9 @@ SWIGINTERN PyObject *_wrap_mapObj_applySLDURL(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_applySLDURL",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLDURL" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_applySLDURL" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_applySLDURL(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -32674,7 +32936,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_generateSLD(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -32683,9 +32945,9 @@ SWIGINTERN PyObject *_wrap_mapObj_generateSLD(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_generateSLD",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_generateSLD" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_generateSLD" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (char *)mapObj_generateSLD(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -32722,7 +32984,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_processTemplate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   char **arg3 = (char **) 0 ;
   char **arg4 = (char **) 0 ;
@@ -32747,9 +33009,9 @@ SWIGINTERN PyObject *_wrap_mapObj_processTemplate(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OOOOO:mapObj_processTemplate",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_processTemplate" "', argument " "2"" of type '" "int""'");
@@ -32806,7 +33068,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_processLegendTemplate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char **arg2 = (char **) 0 ;
   char **arg3 = (char **) 0 ;
   int arg4 ;
@@ -32827,9 +33089,9 @@ SWIGINTERN PyObject *_wrap_mapObj_processLegendTemplate(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OOOO:mapObj_processLegendTemplate",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processLegendTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processLegendTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_p_char, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_processLegendTemplate" "', argument " "2"" of type '" "char **""'"); 
@@ -32881,7 +33143,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_processQueryTemplate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char **arg2 = (char **) 0 ;
   char **arg3 = (char **) 0 ;
   int arg4 ;
@@ -32902,9 +33164,9 @@ SWIGINTERN PyObject *_wrap_mapObj_processQueryTemplate(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOOO:mapObj_processQueryTemplate",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processQueryTemplate" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_processQueryTemplate" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_p_char, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_processQueryTemplate" "', argument " "2"" of type '" "char **""'"); 
@@ -32956,7 +33218,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getOutputFormatByName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -32966,9 +33228,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getOutputFormatByName(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_getOutputFormatByName",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getOutputFormatByName" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getOutputFormatByName" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (outputFormatObj *)mapObj_getOutputFormatByName(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -33004,7 +33266,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_appendOutputFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   outputFormatObj *arg2 = (outputFormatObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -33017,9 +33279,9 @@ SWIGINTERN PyObject *_wrap_mapObj_appendOutputFormat(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_appendOutputFormat",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_appendOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_appendOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_outputFormatObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_appendOutputFormat" "', argument " "2"" of type '" "outputFormatObj *""'"); 
@@ -33060,7 +33322,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_removeOutputFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -33070,9 +33332,9 @@ SWIGINTERN PyObject *_wrap_mapObj_removeOutputFormat(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"Oz:mapObj_removeOutputFormat",&obj0,&arg2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeOutputFormat" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_removeOutputFormat" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (int)mapObj_removeOutputFormat(arg1,arg2); {
       errorObj *ms_error = msGetErrorObj();
@@ -33108,7 +33370,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_loadOWSParameters(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
   char *arg3 = (char *) "1.1.1" ;
   void *argp1 = 0 ;
@@ -33122,9 +33384,9 @@ SWIGINTERN PyObject *_wrap_mapObj_loadOWSParameters(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OO|z:mapObj_loadOWSParameters",&obj0,&obj1,&arg3)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadOWSParameters" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_loadOWSParameters" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_cgiRequestObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_loadOWSParameters" "', argument " "2"" of type '" "cgiRequestObj *""'"); 
@@ -33165,7 +33427,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_OWSDispatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   cgiRequestObj *arg2 = (cgiRequestObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -33178,9 +33440,9 @@ SWIGINTERN PyObject *_wrap_mapObj_OWSDispatch(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_OWSDispatch",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_OWSDispatch" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_OWSDispatch" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_cgiRequestObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_OWSDispatch" "', argument " "2"" of type '" "cgiRequestObj *""'"); 
@@ -33221,7 +33483,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_zoomPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   int arg2 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
@@ -33254,9 +33516,9 @@ SWIGINTERN PyObject *_wrap_mapObj_zoomPoint(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:mapObj_zoomPoint",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomPoint" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomPoint" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_zoomPoint" "', argument " "2"" of type '" "int""'");
@@ -33322,7 +33584,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_zoomRectangle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   rectObj *arg2 = (rectObj *) 0 ;
   int arg3 ;
   int arg4 ;
@@ -33351,9 +33613,9 @@ SWIGINTERN PyObject *_wrap_mapObj_zoomRectangle(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:mapObj_zoomRectangle",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomRectangle" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomRectangle" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_rectObj, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "mapObj_zoomRectangle" "', argument " "2"" of type '" "rectObj *""'"); 
@@ -33414,7 +33676,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_zoomScale(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   double arg2 ;
   pointObj *arg3 = (pointObj *) 0 ;
   int arg4 ;
@@ -33447,9 +33709,9 @@ SWIGINTERN PyObject *_wrap_mapObj_zoomScale(PyObject *SWIGUNUSEDPARM(self), PyOb
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:mapObj_zoomScale",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomScale" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_zoomScale" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "mapObj_zoomScale" "', argument " "2"" of type '" "double""'");
@@ -33515,7 +33777,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getLayerOrder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -33524,9 +33786,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getLayerOrder(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getLayerOrder",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getLayerOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (PyObject *)mapObj_getLayerOrder(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -33562,7 +33824,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_setLayerOrder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -33573,9 +33835,9 @@ SWIGINTERN PyObject *_wrap_mapObj_setLayerOrder(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:mapObj_setLayerOrder",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayerOrder" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_setLayerOrder" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   arg2 = obj1;
   {
     result = (int)mapObj_setLayerOrder(arg1,arg2); {
@@ -33612,7 +33874,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_mapObj_getSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  mapObj *arg1 = (mapObj *) 0 ;
+  struct mapObj *arg1 = (struct mapObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -33621,9 +33883,9 @@ SWIGINTERN PyObject *_wrap_mapObj_getSize(PyObject *SWIGUNUSEDPARM(self), PyObje
   if (!PyArg_ParseTuple(args,(char *)"O:mapObj_getSize",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_mapObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSize" "', argument " "1"" of type '" "mapObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mapObj_getSize" "', argument " "1"" of type '" "struct mapObj *""'"); 
   }
-  arg1 = (mapObj *)(argp1);
+  arg1 = (struct mapObj *)(argp1);
   {
     result = (PyObject *)mapObj_getSize(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -40293,8 +40555,8 @@ SWIGINTERN PyObject *_wrap_shapeObj_contains(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+  argc = args ? (int)PyObject_Length(args) : 0;
+  for (ii = 0; (ii < 2) && (ii < argc); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
@@ -40327,11 +40589,11 @@ SWIGINTERN PyObject *_wrap_shapeObj_contains(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'shapeObj_contains'.\n"
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'shapeObj_contains'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    contains(shapeObj *,shapeObj *)\n"
-    "    contains(shapeObj *,pointObj *)\n");
-  return NULL;
+    "    shapeObj::contains(shapeObj *)\n"
+    "    shapeObj::contains(pointObj *)\n");
+  return 0;
 }
 
 
@@ -44250,7 +44512,7 @@ SWIGINTERN PyObject *symbolObj_swigregister(PyObject *SWIGUNUSEDPARM(self), PyOb
 
 SWIGINTERN PyObject *_wrap_errorObj_code_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -44262,9 +44524,9 @@ SWIGINTERN PyObject *_wrap_errorObj_code_set(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:errorObj_code_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_set" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "errorObj_code_set" "', argument " "2"" of type '" "int""'");
@@ -44280,7 +44542,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_code_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44289,9 +44551,9 @@ SWIGINTERN PyObject *_wrap_errorObj_code_get(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:errorObj_code_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_get" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_code_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   result = (int) ((arg1)->code);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -44302,7 +44564,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_routine_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -44314,9 +44576,9 @@ SWIGINTERN PyObject *_wrap_errorObj_routine_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:errorObj_routine_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_set" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   res2 = SWIG_AsCharArray(obj1, temp2, 64);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "errorObj_routine_set" "', argument " "2"" of type '" "char [64]""'");
@@ -44333,7 +44595,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_routine_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44342,9 +44604,9 @@ SWIGINTERN PyObject *_wrap_errorObj_routine_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:errorObj_routine_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_get" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_routine_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   result = (char *)(char *) ((arg1)->routine);
   {
     size_t size = 64;
@@ -44361,7 +44623,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_message_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   char *arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -44373,9 +44635,9 @@ SWIGINTERN PyObject *_wrap_errorObj_message_set(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:errorObj_message_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_set" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   res2 = SWIG_AsCharArray(obj1, temp2, 2048);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "errorObj_message_set" "', argument " "2"" of type '" "char [2048]""'");
@@ -44392,7 +44654,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_message_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44401,9 +44663,9 @@ SWIGINTERN PyObject *_wrap_errorObj_message_get(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:errorObj_message_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_get" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_message_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   result = (char *)(char *) ((arg1)->message);
   {
     size_t size = 2048;
@@ -44420,7 +44682,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_isreported_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -44432,9 +44694,9 @@ SWIGINTERN PyObject *_wrap_errorObj_isreported_set(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OO:errorObj_isreported_set",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_set" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_set" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "errorObj_isreported_set" "', argument " "2"" of type '" "int""'");
@@ -44450,7 +44712,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_isreported_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44459,9 +44721,9 @@ SWIGINTERN PyObject *_wrap_errorObj_isreported_get(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:errorObj_isreported_get",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_get" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_isreported_get" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   result = (int) ((arg1)->isreported);
   resultobj = SWIG_From_int((int)(result));
   return resultobj;
@@ -44472,11 +44734,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_errorObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *result = 0 ;
+  struct errorObj *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_errorObj")) SWIG_fail;
   {
-    result = (errorObj *)new_errorObj(); {
+    result = (struct errorObj *)new_errorObj(); {
       errorObj *ms_error = msGetErrorObj();
       
       switch(ms_error->code) {
@@ -44510,7 +44772,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_errorObj(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44518,9 +44780,9 @@ SWIGINTERN PyObject *_wrap_delete_errorObj(PyObject *SWIGUNUSEDPARM(self), PyObj
   if (!PyArg_ParseTuple(args,(char *)"O:delete_errorObj",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_errorObj" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_errorObj" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   {
     delete_errorObj(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -44556,7 +44818,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_errorObj_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  errorObj *arg1 = (errorObj *) 0 ;
+  struct errorObj *arg1 = (struct errorObj *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44565,9 +44827,9 @@ SWIGINTERN PyObject *_wrap_errorObj_next(PyObject *SWIGUNUSEDPARM(self), PyObjec
   if (!PyArg_ParseTuple(args,(char *)"O:errorObj_next",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_errorObj, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_next" "', argument " "1"" of type '" "errorObj *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "errorObj_next" "', argument " "1"" of type '" "struct errorObj *""'"); 
   }
-  arg1 = (errorObj *)(argp1);
+  arg1 = (struct errorObj *)(argp1);
   {
     result = (errorObj *)errorObj_next(arg1); {
       errorObj *ms_error = msGetErrorObj();
@@ -47353,7 +47615,7 @@ static swig_type_info _swigt__p_hashTableObj = {"_p_hashTableObj", "hashTableObj
 static swig_type_info _swigt__p_imageObj = {"_p_imageObj", "imageObj *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int32_t = {"_p_int32_t", "int32_t *|ms_int32 *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_intarray = {"_p_intarray", "struct intarray *|intarray *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_intarray = {"_p_intarray", "intarray *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_labelCacheMemberObj = {"_p_labelCacheMemberObj", "labelCacheMemberObj *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_labelCacheObj = {"_p_labelCacheObj", "labelCacheObj *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_labelCacheSlotObj = {"_p_labelCacheSlotObj", "labelCacheSlotObj *", 0, 0, (void*)0, 0};
@@ -47929,24 +48191,23 @@ extern "C" {
   swig_varlink_type(void) {
     static char varlink__doc__[] = "Swig var link object";
     static PyTypeObject varlink_type;
-    static int type_init = 0;  
+    static int type_init = 0;
     if (!type_init) {
-      const PyTypeObject tmp
-      = {
+      const PyTypeObject tmp = {
         /* PyObject header changed in Python 3 */
 #if PY_VERSION_HEX >= 0x03000000
-        PyVarObject_HEAD_INIT(&PyType_Type, 0)
+        PyVarObject_HEAD_INIT(NULL, 0)
 #else
         PyObject_HEAD_INIT(NULL)
-        0,                                  /* Number of items in variable part (ob_size) */
+        0,                                  /* ob_size */
 #endif
-        (char *)"swigvarlink",              /* Type name (tp_name) */
-        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
-        0,                                  /* Itemsize (tp_itemsize) */
-        (destructor) swig_varlink_dealloc,  /* Deallocator (tp_dealloc) */ 
-        (printfunc) swig_varlink_print,     /* Print (tp_print) */
-        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
-        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+        (char *)"swigvarlink",              /* tp_name */
+        sizeof(swig_varlinkobject),         /* tp_basicsize */
+        0,                                  /* tp_itemsize */
+        (destructor) swig_varlink_dealloc,  /* tp_dealloc */
+        (printfunc) swig_varlink_print,     /* tp_print */
+        (getattrfunc) swig_varlink_getattr, /* tp_getattr */
+        (setattrfunc) swig_varlink_setattr, /* tp_setattr */
         0,                                  /* tp_compare */
         (reprfunc) swig_varlink_repr,       /* tp_repr */
         0,                                  /* tp_as_number */
@@ -47970,16 +48231,21 @@ extern "C" {
 #if PY_VERSION_HEX >= 0x02030000
         0,                                  /* tp_del */
 #endif
+#if PY_VERSION_HEX >= 0x02060000
+        0,                                  /* tp_version */
+#endif
 #ifdef COUNT_ALLOCS
         0,0,0,0                             /* tp_alloc -> tp_next */
 #endif
       };
       varlink_type = tmp;
-      /* for Python 3 we already assigned ob_type in PyVarObject_HEAD_INIT() */
-#if PY_VERSION_HEX < 0x03000000
+      type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
       varlink_type.ob_type = &PyType_Type;
+#else
+      if (PyType_Ready(&varlink_type) < 0)
+      return NULL;
 #endif
-      type_init = 1;
     }
     return &varlink_type;
   }
@@ -48030,7 +48296,7 @@ extern "C" {
     for (i = 0; constants[i].type; ++i) {
       switch(constants[i].type) {
       case SWIG_PY_POINTER:
-        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+        obj = SWIG_InternalNewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
         break;
       case SWIG_PY_BINARY:
         obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
@@ -48070,15 +48336,15 @@ extern "C" {
           }
         }
         if (ci) {
-          size_t shift = (ci->ptype) - types;
-          swig_type_info *ty = types_initial[shift];
-          size_t ldoc = (c - methods[i].ml_doc);
-          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
-          char *ndoc = (char*)malloc(ldoc + lptr + 10);
-          if (ndoc) {
-            char *buff = ndoc;
-            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
-            if (ptr) {
+          void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+          if (ptr) {
+            size_t shift = (ci->ptype) - types;
+            swig_type_info *ty = types_initial[shift];
+            size_t ldoc = (c - methods[i].ml_doc);
+            size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+            char *ndoc = (char*)malloc(ldoc + lptr + 10);
+            if (ndoc) {
+              char *buff = ndoc;
               strncpy(buff, methods[i].ml_doc, ldoc);
               buff += ldoc;
               strncpy(buff, "swig_ptr: ", 10);
@@ -48111,10 +48377,19 @@ PyObject*
 void
 #endif
 SWIG_init(void) {
-  PyObject *m, *d;  
+  PyObject *m, *d, *md;
 #if PY_VERSION_HEX >= 0x03000000
   static struct PyModuleDef SWIG_module = {
+# if PY_VERSION_HEX >= 0x03020000
     PyModuleDef_HEAD_INIT,
+# else
+    {
+      PyObject_HEAD_INIT(NULL)
+      NULL, /* m_init */
+      0,    /* m_index */
+      NULL, /* m_copy */
+    },
+# endif
     (char *) SWIG_name,
     NULL,
     -1,
@@ -48126,6 +48401,49 @@ SWIG_init(void) {
   };
 #endif
   
+#if defined(SWIGPYTHON_BUILTIN)
+  static SwigPyClientData SwigPyObject_clientdata = {
+    0, 0, 0, 0, 0, 0, 0
+  };
+  static PyGetSetDef this_getset_def = {
+    (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
+  };
+  static SwigPyGetSet thisown_getset_closure = {
+    (PyCFunction) SwigPyObject_own,
+    (PyCFunction) SwigPyObject_own
+  };
+  static PyGetSetDef thisown_getset_def = {
+    (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
+  };
+  PyObject *metatype_args;
+  PyTypeObject *builtin_pytype;
+  int builtin_base_count;
+  swig_type_info *builtin_basetype;
+  PyObject *tuple;
+  PyGetSetDescrObject *static_getset;
+  PyTypeObject *metatype;
+  SwigPyClientData *cd;
+  PyObject *public_interface, *public_symbol;
+  PyObject *this_descr;
+  PyObject *thisown_descr;
+  int i;
+  
+  (void)builtin_pytype;
+  (void)builtin_base_count;
+  (void)builtin_basetype;
+  (void)tuple;
+  (void)static_getset;
+  
+  /* metatype is used to implement static member variables. */
+  metatype_args = Py_BuildValue("(s(O){})", "SwigPyObjectType", &PyType_Type);
+  assert(metatype_args);
+  metatype = (PyTypeObject *) PyType_Type.tp_call((PyObject *) &PyType_Type, metatype_args, NULL);
+  assert(metatype);
+  Py_DECREF(metatype_args);
+  metatype->tp_setattro = (setattrofunc) &SwigPyObjectType_setattro;
+  assert(PyType_Ready(metatype) >= 0);
+#endif
+  
   /* Fix SwigMethods to carry the callback ptrs when needed */
   SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
   
@@ -48134,11 +48452,47 @@ SWIG_init(void) {
 #else
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
 #endif
-  d = PyModule_GetDict(m);
+  md = d = PyModule_GetDict(m);
   
   SWIG_InitializeModule(0);
-  SWIG_InstallConstants(d,swig_const_table);
   
+#ifdef SWIGPYTHON_BUILTIN
+  SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
+  assert(SwigPyObject_stype);
+  cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
+  if (!cd) {
+    SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
+    SwigPyObject_clientdata.pytype = SwigPyObject_TypeOnce();
+  } else if (SwigPyObject_TypeOnce()->tp_basicsize != cd->pytype->tp_basicsize) {
+    PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
+# if PY_VERSION_HEX >= 0x03000000
+    return NULL;
+# else
+    return;
+# endif
+  }
+  
+  /* All objects have a 'this' attribute */
+  this_descr = PyDescr_NewGetSet(SwigPyObject_type(), &this_getset_def);
+  (void)this_descr;
+  
+  /* All objects have a 'thisown' attribute */
+  thisown_descr = PyDescr_NewGetSet(SwigPyObject_type(), &thisown_getset_def);
+  (void)thisown_descr;
+  
+  public_interface = PyList_New(0);
+  public_symbol = 0;
+  (void)public_symbol;
+  
+  PyDict_SetItemString(md, "__all__", public_interface);
+  Py_DECREF(public_interface);
+  for (i = 0; SwigMethods[i].ml_name != NULL; ++i)
+  SwigPyBuiltin_AddPublicSymbol(public_interface, SwigMethods[i].ml_name);
+  for (i = 0; swig_const_table[i].name != 0; ++i)
+  SwigPyBuiltin_AddPublicSymbol(public_interface, swig_const_table[i].name);
+#endif
+  
+  SWIG_InstallConstants(d,swig_const_table);
   
   
   
@@ -48162,11 +48516,11 @@ SWIG_init(void) {
   PyDict_SetItemString(d, "MapServerChildError", MSExc_MapServerChildError);
   
   
-  SWIG_Python_SetConstant(d, "MS_VERSION",SWIG_FromCharPtr("6.2.1"));
+  SWIG_Python_SetConstant(d, "MS_VERSION",SWIG_FromCharPtr("6.2.2"));
   SWIG_Python_SetConstant(d, "MS_VERSION_MAJOR",SWIG_From_int((int)(6)));
   SWIG_Python_SetConstant(d, "MS_VERSION_MINOR",SWIG_From_int((int)(2)));
-  SWIG_Python_SetConstant(d, "MS_VERSION_REV",SWIG_From_int((int)(1)));
-  SWIG_Python_SetConstant(d, "MS_VERSION_NUM",SWIG_From_int((int)((6*10000+2*100+1))));
+  SWIG_Python_SetConstant(d, "MS_VERSION_REV",SWIG_From_int((int)(2)));
+  SWIG_Python_SetConstant(d, "MS_VERSION_NUM",SWIG_From_int((int)((6*10000+2*100+2))));
   SWIG_Python_SetConstant(d, "MS_TRUE",SWIG_From_int((int)(1)));
   SWIG_Python_SetConstant(d, "MS_FALSE",SWIG_From_int((int)(0)));
   SWIG_Python_SetConstant(d, "MS_UNKNOWN",SWIG_From_int((int)(-1)));
diff --git a/mapserver.h b/mapserver.h
index 9987a33..11c5a88 100644
--- a/mapserver.h
+++ b/mapserver.h
@@ -32,11 +32,11 @@
 /*
 ** MapServer version - to be updated for every release
 */
-#define MS_VERSION "6.2.1"
+#define MS_VERSION "6.2.2"
 
 #define MS_VERSION_MAJOR    6
 #define MS_VERSION_MINOR    2
-#define MS_VERSION_REV      1
+#define MS_VERSION_REV      2
 
 #define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)
 
@@ -2041,6 +2041,7 @@ extern "C" {
   MS_DLL_EXPORT int msLoadSymbolSet(symbolSetObj *symbolset, mapObj *map);
   MS_DLL_EXPORT int msCopySymbol(symbolObj *dst, symbolObj *src, mapObj *map);
   MS_DLL_EXPORT int msCopySymbolSet(symbolSetObj *dst, symbolSetObj *src, mapObj *map);
+  MS_DLL_EXPORT int msCopyHashTable(hashTableObj *dst, hashTableObj *src);
   MS_DLL_EXPORT void msInitSymbolSet(symbolSetObj *symbolset);
   MS_DLL_EXPORT symbolObj *msGrowSymbolSet( symbolSetObj *symbolset );
   MS_DLL_EXPORT int msAddImageSymbol(symbolSetObj *symbolset, char *filename);
diff --git a/mapshape.c b/mapshape.c
index ea0f684..87deafd 100644
--- a/mapshape.c
+++ b/mapshape.c
@@ -250,6 +250,10 @@ SHPHandle msSHPOpen( const char * pszLayer, const char * pszAccess )
   sprintf( pszFullname, "%s.shp", pszBasename );
   psSHP->fpSHP = fopen(pszFullname, pszAccess );
   if( psSHP->fpSHP == NULL ) {
+    sprintf( pszFullname, "%s.SHP", pszBasename );
+    psSHP->fpSHP = fopen(pszFullname, pszAccess );
+  }
+  if( psSHP->fpSHP == NULL ) {
     msFree(pszBasename);
     msFree(pszFullname);
     msFree(psSHP);
@@ -259,6 +263,10 @@ SHPHandle msSHPOpen( const char * pszLayer, const char * pszAccess )
   sprintf( pszFullname, "%s.shx", pszBasename );
   psSHP->fpSHX = fopen(pszFullname, pszAccess );
   if( psSHP->fpSHX == NULL ) {
+    sprintf( pszFullname, "%s.SHX", pszBasename );
+    psSHP->fpSHX = fopen(pszFullname, pszAccess );
+  }
+  if( psSHP->fpSHX == NULL ) {
     msFree(pszBasename);
     msFree(pszFullname);
     msFree(psSHP);
@@ -1753,9 +1761,14 @@ int msShapefileWhichShapes(shapefileObj *shpfile, rectObj rect, int debug)
 
     /* deal with case where sourcename is of the form 'file.shp' */
     sourcename = msStrdup(shpfile->source);
-    /* TODO: need to add case-insensitive handling! */
     s = strstr(sourcename, ".shp");
-    if( s ) *s = '\0';
+    if( s )
+      *s = '\0';
+    else {
+      s = strstr(sourcename, ".SHP");
+      if( s )
+        *s = '\0';
+    }
 
     filename = (char *)malloc(strlen(sourcename)+strlen(MS_INDEX_EXTENSION)+1);
     MS_CHECK_ALLOC(filename, strlen(sourcename)+strlen(MS_INDEX_EXTENSION)+1, MS_FAILURE);
diff --git a/maptemplate.c b/maptemplate.c
index 6b1e12b..ef31644 100644
--- a/maptemplate.c
+++ b/maptemplate.c
@@ -2058,7 +2058,7 @@ static int processShpxyTag(layerObj *layer, char **line, shapeObj *shape)
     }
 
     /* build the per point format strings (version 1 contains the coordinate seperator, version 2 doesn't) */
-    pointFormatLength = strlen("xh") + strlen("xf") + strlen("yh") + strlen("yf") + strlen("cs") + 10 + 1;
+    pointFormatLength = strlen(xh) + strlen(xf) + strlen(yh) + strlen(yf) + strlen(cs) + 12 + 1;
     pointFormat1 = (char *) msSmallMalloc(pointFormatLength);
     snprintf(pointFormat1, pointFormatLength, "%s%%.%dlf%s%s%%.%dlf%s%s", xh, precision, xf, yh, precision, yf, cs);
     pointFormat2 = (char *) msSmallMalloc(pointFormatLength);
diff --git a/maptree.c b/maptree.c
index 178fb42..805a554 100644
--- a/maptree.c
+++ b/maptree.c
@@ -126,6 +126,10 @@ SHPTreeHandle msSHPDiskTreeOpen(const char * pszTree, int debug)
   pszFullname = (char *) msSmallMalloc(strlen(pszBasename) + 5);
   sprintf( pszFullname, "%s%s", pszBasename, MS_INDEX_EXTENSION);
   psTree->fp = fopen(pszFullname, "rb" );
+  if( psTree->fp == NULL ) {
+      sprintf( pszFullname, "%s.QIX", pszBasename);
+      psTree->fp = fopen(pszFullname, "rb" );
+  }
 
   msFree(pszBasename); /* don't need these any more */
   msFree(pszFullname);
diff --git a/mapuvraster.c b/mapuvraster.c
index 6f6a04d..3cc1e28 100644
--- a/mapuvraster.c
+++ b/mapuvraster.c
@@ -333,13 +333,23 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
 {
   uvRasterLayerInfo *uvlinfo = (uvRasterLayerInfo *) layer->layerinfo;
   imageObj *image_tmp;
-  mapObj   map_tmp;
+  outputFormatObj *outputformat = NULL;
+  mapObj *map_tmp;
   double map_cellsize;
   unsigned int spacing;
   int width, height, u_src_off, v_src_off, i, x, y;
   char   **alteredProcessing = NULL;
   char **savedProcessing = NULL;
 
+  /*
+  ** Allocate mapObj structure
+  */
+  map_tmp = (mapObj *)msSmallCalloc(sizeof(mapObj),1);
+  if(initMap(map_tmp) == -1) { /* initialize this map */
+    msFree(map_tmp);
+    return(MS_FAILURE);
+  }
+  
   if (layer->debug)
     msDebug("Entering msUVRASTERLayerWhichShapes().\n");
 
@@ -358,6 +368,7 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
                 "msUVRASTERLayerWhichShapes()" );
     return MS_FAILURE;
   }
+
   /* -------------------------------------------------------------------- */
   /*      Determine desired spacing.  Default to 32 if not otherwise set  */
   /* -------------------------------------------------------------------- */
@@ -371,58 +382,59 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
   height = (int)ceil(layer->map->height/spacing);
   map_cellsize = MS_MAX(MS_CELLSIZE(rect.minx, rect.maxx,layer->map->width),
                         MS_CELLSIZE(rect.miny,rect.maxy,layer->map->height));
-  map_tmp.cellsize = map_cellsize*spacing;
+  map_tmp->cellsize = map_cellsize*spacing;
   
   if (layer->debug)
     msDebug("msUVRASTERLayerWhichShapes(): width: %d, height: %d, cellsize: %g\n",
-            width, height, map_tmp.cellsize);
+            width, height, map_tmp->cellsize);
 
   /* Initialize our dummy map */
-  MS_INIT_COLOR(map_tmp.imagecolor, 255,255,255,255);
-  map_tmp.resolution = layer->map->resolution;
-  map_tmp.defresolution = layer->map->defresolution;
-  map_tmp.outputformat = (outputFormatObj *) msSmallCalloc(1,sizeof(outputFormatObj));
-  uvlinfo->band_count = map_tmp.outputformat->bands = 2;
-  map_tmp.outputformat->name = NULL;
-  map_tmp.outputformat->driver = NULL;
-  map_tmp.outputformat->refcount = 0;
-  map_tmp.outputformat->vtable = NULL;
-  map_tmp.outputformat->device = NULL;
-  map_tmp.outputformat->renderer = MS_RENDER_WITH_RAWDATA;
-  map_tmp.outputformat->imagemode = MS_IMAGEMODE_FLOAT32;
-
-  map_tmp.configoptions = layer->map->configoptions;
-  map_tmp.mappath = layer->map->mappath;
-  map_tmp.shapepath = layer->map->shapepath;
-  map_tmp.extent.minx = rect.minx-(0.5*map_cellsize)+(0.5*map_tmp.cellsize);
-  map_tmp.extent.miny = rect.miny-(0.5*map_cellsize)+(0.5*map_tmp.cellsize);
-  map_tmp.extent.maxx = map_tmp.extent.minx+((width-1)*map_tmp.cellsize);
-  map_tmp.extent.maxy = map_tmp.extent.miny+((height-1)*map_tmp.cellsize);
-  map_tmp.gt.rotation_angle = 0.0;
-
-  msInitProjection(&map_tmp.projection);
-  msCopyProjection(&map_tmp.projection, &layer->projection);
+  MS_INIT_COLOR(map_tmp->imagecolor, 255,255,255,255);
+  map_tmp->resolution = layer->map->resolution;
+  map_tmp->defresolution = layer->map->defresolution;
+
+  outputformat = (outputFormatObj *) msSmallCalloc(1,sizeof(outputFormatObj));
+  outputformat->bands = uvlinfo->band_count = 2;
+  outputformat->name = NULL;
+  outputformat->driver = NULL;
+  outputformat->refcount = 0;
+  outputformat->vtable = NULL;
+  outputformat->device = NULL;
+  outputformat->renderer = MS_RENDER_WITH_RAWDATA;
+  outputformat->imagemode = MS_IMAGEMODE_FLOAT32;
+  msAppendOutputFormat(map_tmp, outputformat);
+  
+  msCopyHashTable(&map_tmp->configoptions, &layer->map->configoptions);
+  map_tmp->mappath = msStrdup(layer->map->mappath);
+  map_tmp->shapepath = msStrdup(layer->map->shapepath);
+  map_tmp->extent.minx = rect.minx-(0.5*map_cellsize)+(0.5*map_tmp->cellsize);
+  map_tmp->extent.miny = rect.miny-(0.5*map_cellsize)+(0.5*map_tmp->cellsize);
+  map_tmp->extent.maxx = map_tmp->extent.minx+((width-1)*map_tmp->cellsize);
+  map_tmp->extent.maxy = map_tmp->extent.miny+((height-1)*map_tmp->cellsize);
+  map_tmp->gt.rotation_angle = 0.0;
+
+   msCopyProjection(&map_tmp->projection, &layer->projection);
 
   if (layer->debug == 5)
-    msDebug("msUVRASTERLayerWhichShapes(): extent: %g %d %g %g\n",
-            map_tmp.extent.minx, map_tmp.extent.miny,
-            map_tmp.extent.maxx, map_tmp.extent.maxy);
+    msDebug("msUVRASTERLayerWhichShapes(): extent: %g %g %g %g\n",
+            map_tmp->extent.minx, map_tmp->extent.miny,
+            map_tmp->extent.maxx, map_tmp->extent.maxy);
 
   /* important to use that function, to compute map
      geotransform, used by the resampling*/
-  msMapSetSize(&map_tmp, width, height);
+   msMapSetSize(map_tmp, width, height);
 
   if (layer->debug == 5)
     msDebug("msUVRASTERLayerWhichShapes(): geotransform: %g %g %g %g %g %g\n",
-            map_tmp.gt.geotransform[0], map_tmp.gt.geotransform[1],
-            map_tmp.gt.geotransform[2], map_tmp.gt.geotransform[3],
-            map_tmp.gt.geotransform[4], map_tmp.gt.geotransform[5]);
+            map_tmp->gt.geotransform[0], map_tmp->gt.geotransform[1],
+            map_tmp->gt.geotransform[2], map_tmp->gt.geotransform[3],
+            map_tmp->gt.geotransform[4], map_tmp->gt.geotransform[5]);
 
-  uvlinfo->extent = map_tmp.extent;
+  uvlinfo->extent = map_tmp->extent;
 
-  image_tmp = msImageCreate(width, height, map_tmp.outputformat,
-                            NULL, NULL, map_tmp.resolution, map_tmp.defresolution,
-                            &(map_tmp.imagecolor));
+  image_tmp = msImageCreate(width, height, map_tmp->outputformatlist[0],
+                            NULL, NULL, map_tmp->resolution, map_tmp->defresolution,
+                            &(map_tmp->imagecolor));
 
   /* Default set to AVERAGE resampling */
   if( CSLFetchNameValue( layer->processing, "RESAMPLE" ) == NULL ) {
@@ -434,14 +446,16 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
     layer->processing = alteredProcessing;
   }
 
-  if (msDrawRasterLayerLow(&map_tmp, layer, image_tmp, NULL ) == MS_FAILURE) {
-    msSetError(MS_MISCERR, "Unable to draw raster data.", NULL, "msUVRASTERLayerWhichShapes()" );
+  if (msDrawRasterLayerLow(map_tmp, layer, image_tmp, NULL ) == MS_FAILURE) {
+    msSetError(MS_MISCERR, "Unable to draw raster data.", "msUVRASTERLayerWhichShapes()");
     return MS_FAILURE;
   }
 
   /* restore the saved processing */
-  if (alteredProcessing != NULL)
+  if (alteredProcessing != NULL) {
     layer->processing = savedProcessing;
+    CSLDestroy(alteredProcessing);
+  }
 
   /* free old query arrays */
   if (uvlinfo->u) {
@@ -484,6 +498,7 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
   }
 
   msFreeImage(image_tmp); /* we do not need the imageObj anymore */
+  msFreeMap(map_tmp);
 
   uvlinfo->next_shape = 0;
 
diff --git a/mapwcs.c b/mapwcs.c
index ceacabf..cc35463 100644
--- a/mapwcs.c
+++ b/mapwcs.c
@@ -139,17 +139,18 @@ int msWCSException(mapObj *map, const char *code, const char *locator,
 {
   char *pszEncodedVal = NULL;
   const char *encoding;
+  char version_string[OWS_VERSION_MAXLEN];
 
   if( version == NULL )
     version = "1.0.0";
 
 #if defined(USE_LIBXML2)
   if( msOWSParseVersionString(version) >= OWS_2_0_0 )
-    return msWCSException20( map, code, locator, version );
+    return msWCSException20( map, code, locator, msOWSGetVersionString(msOWSParseVersionString(version), version_string) );
 #endif
 
   if( msOWSParseVersionString(version) >= OWS_1_1_0 )
-    return msWCSException11( map, code, locator, version );
+    return msWCSException11( map, code, locator, msOWSGetVersionString(msOWSParseVersionString(version), version_string) );
 
   encoding = msOWSLookupMetadata(&(map->web.metadata), "CO", "encoding");
   if (encoding)
@@ -2162,6 +2163,13 @@ int msWCSDispatch(mapObj *map, cgiRequestObj *request, owsRequestObj *ows_reques
         return msWCSException(map, "InvalidParameterValue",
                               "request", "2.0.1");
       }
+      else if (status == MS_DONE) {
+        /* MS_DONE means, that the exception has already been written to the IO 
+          buffer. 
+        */
+        msWCSFreeParamsObj20(params);
+        return MS_FAILURE;
+      }
     }
 
     /* check if all layer names are valid NCNames */
diff --git a/mapwcs20.c b/mapwcs20.c
index 33a282d..f03681b 100644
--- a/mapwcs20.c
+++ b/mapwcs20.c
@@ -667,7 +667,7 @@ static int msWCSParseRequest20_XMLDescribeCoverage(
 /************************************************************************/
 #if defined(USE_LIBXML2)
 static int msWCSParseRequest20_XMLGetCoverage(
-  xmlNodePtr root, wcs20ParamsObjPtr params)
+  mapObj* map, xmlNodePtr root, wcs20ParamsObjPtr params)
 {
   xmlNodePtr child;
   int numIds = 0;
@@ -696,6 +696,12 @@ static int msWCSParseRequest20_XMLGetCoverage(
                           || EQUAL(content, "multipart/related"))) {
         params->multipart = MS_TRUE;
       }
+      else {
+        msSetError(MS_WCSERR, "Invalid value '%s' for parameter 'Mediatype'.",
+                  "msWCSParseRequest20()", content);
+        xmlFree(content);
+        return MS_FAILURE;
+      }
       xmlFree(content);
     } else if (EQUAL((char *) child->name, "DimensionTrim")) {
       wcs20AxisObjPtr axis = NULL;
@@ -745,7 +751,8 @@ static int msWCSParseRequest20_XMLGetCoverage(
       if (msWCSParseSubset20(subset, axisName, crs, min, max)
           == MS_FAILURE) {
         msWCSFreeSubsetObj20(subset);
-        return MS_FAILURE;
+        msWCSException(map, "InvalidSubsetting", "subset", "2.0.1");
+        return MS_DONE;
       }
 
       if(NULL == (axis = msWCSFindAxis20(params, subset->axis))) {
@@ -923,14 +930,14 @@ int msWCSParseRequest20(mapObj *map,
       if(EQUAL(params->request, "DescribeCoverage")) {
         ret = msWCSParseRequest20_XMLDescribeCoverage(root, params);
       } else if(EQUAL(params->request, "GetCoverage")) {
-        ret = msWCSParseRequest20_XMLGetCoverage(root, params);
+        ret = msWCSParseRequest20_XMLGetCoverage(map, root, params);
       }
     }
     return ret;
 
 #else /* defined(USE_LIBXML2) */
     /* TODO: maybe with CPLXML? */
-    return MS_DONE;
+    return MS_FAILURE;
 #endif /* defined(USE_LIBXML2) */
   }
 
@@ -982,6 +989,11 @@ int msWCSParseRequest20(mapObj *map,
       if(EQUAL(value, "multipart/mixed") || EQUAL(value, "multipart/related")) {
         params->multipart = MS_TRUE;
       }
+      else {
+         msSetError(MS_WCSERR, "Invalid value '%s' for parameter 'Mediatype'.",
+                    "msWCSParseRequest20()", value);
+         return MS_FAILURE;
+      }
     } else if (EQUAL(key, "INTERPOLATION")) {
       params->interpolation = msStrdup(value);
     } else if (EQUAL(key, "OUTPUTCRS")) {
@@ -1043,7 +1055,8 @@ int msWCSParseRequest20(mapObj *map,
       }
       if (msWCSParseSubsetKVPString20(subset, value) == MS_FAILURE) {
         msWCSFreeSubsetObj20(subset);
-        return MS_FAILURE;
+        msWCSException(map, "InvalidSubsetting", "subset", ows_request->version);
+        return MS_DONE;
       }
 
       if(NULL == (axis = msWCSFindAxis20(params, subset->axis))) {
@@ -1058,7 +1071,8 @@ int msWCSParseRequest20(mapObj *map,
         msSetError(MS_WCSERR, "The axis '%s' is already subsetted.",
                    "msWCSParseRequest20()", axis->name);
         msWCSFreeSubsetObj20(subset);
-        return MS_FAILURE;
+        msWCSException(map, "InvalidAxisLabel", "subset", ows_request->version);
+        return MS_DONE;
       }
       axis->subset = subset;
     } else if(EQUAL(key, "RANGESUBSET")) {
@@ -1087,12 +1101,17 @@ int msWCSParseRequest20(mapObj *map,
 /************************************************************************/
 static int msWCSValidateAndFindAxes20(
   wcs20ParamsObjPtr params,
-  char*** validAxisNames,
-  int numAxis,
   wcs20AxisObjPtr outAxes[])
 {
+  static const int numAxis = 2;
+  char *validXAxisNames[] = {"x", "xaxis", "x-axis", "x_axis", "long", "long_axis", "long-axis", "lon", "lon_axis", "lon-axis", NULL};
+  char *validYAxisNames[] = {"y", "yaxis", "y-axis", "y_axis", "lat", "lat_axis", "lat-axis", NULL};
+  char **validAxisNames[2]; 
   int iParamAxis, iAcceptedAxis, iName, i;
 
+  validAxisNames[0] = validXAxisNames;
+  validAxisNames[1] = validYAxisNames;
+
   for(i = 0; i < numAxis; ++i) {
     outAxes[i] = NULL;
   }
@@ -1101,20 +1120,6 @@ static int msWCSValidateAndFindAxes20(
   for(iParamAxis = 0; iParamAxis < params->numaxes; ++iParamAxis) {
     int found = 0;
 
-    /* check if subset is valid */
-    if(params->axes[iParamAxis]->subset != NULL) {
-      if(params->axes[iParamAxis]->subset->timeOrScalar == MS_WCS20_TIME_VALUE) {
-        msSetError(MS_WCSERR, "Time values for subsets are not supported. ",
-                   "msWCSCreateBoundingBox20()");
-        return MS_FAILURE;
-      }
-      if(params->axes[iParamAxis]->subset->operation == MS_WCS20_SLICE) {
-        msSetError(MS_WCSERR, "Subset operation 'slice' is not supported.",
-                   "msWCSCreateBoundingBox20()");
-        return MS_FAILURE;
-      }
-    }
-
     /* iterate over all given axes */
     for(iAcceptedAxis = 0; iAcceptedAxis < numAxis; ++iAcceptedAxis ) {
       /* iterate over all possible names for the current axis */
@@ -1125,7 +1130,7 @@ static int msWCSValidateAndFindAxes20(
           if(outAxes[iAcceptedAxis] != NULL) {
             msSetError(MS_WCSERR, "The axis with the name '%s' corresponds "
                        "to the same axis as the subset with the name '%s'.",
-                       "msWCSValidateAndFindSubsets20()",
+                       "msWCSValidateAndFindAxes20()",
                        outAxes[iAcceptedAxis]->name, params->axes[iParamAxis]->name);
             return MS_FAILURE;
           }
@@ -1145,7 +1150,7 @@ static int msWCSValidateAndFindAxes20(
     /* exit and throw error                             */
     if(found == 0) {
       msSetError(MS_WCSERR, "Invalid subset axis '%s'.",
-                 "msWCSValidateAndFindSubsets20()", params->axes[iParamAxis]->name);
+                 "msWCSValidateAndFindAxes20()", params->axes[iParamAxis]->name);
       return MS_FAILURE;
     }
   }
@@ -1855,6 +1860,7 @@ static int msWCSGetCoverageMetadata20(layerObj *layer, wcs20coverageMetadataObj
 {
   char  *srs_uri = NULL;
   int i = 0;
+  memset(cm,0,sizeof(wcs20coverageMetadataObj));
   if ( msCheckParentPointer(layer->map,"map") == MS_FAILURE )
     return MS_FAILURE;
 
@@ -2351,6 +2357,7 @@ int msWCSException20(mapObj *map, const char *exceptionCode,
                      const char *locator, const char *version)
 {
   int size = 0;
+  char *status = "400 Bad Request";
   char *errorString = NULL;
   char *errorMessage = NULL;
   char *schemasLocation = NULL;
@@ -2417,6 +2424,18 @@ int msWCSException20(mapObj *map, const char *exceptionCode,
 
   xmlDocSetRootElement(psDoc, psRootNode);
 
+  if(EQUAL(exceptionCode, "OperationNotSupported")
+     || EQUAL(exceptionCode, "OptionNotSupported")) {
+    status = "501 Not Implemented";
+  }
+  else if (EQUAL(exceptionCode, "NoSuchCoverage")
+           || EQUAL(exceptionCode, "emptyCoverageIdList")
+           || EQUAL(exceptionCode, "InvalidAxisLabel")
+           || EQUAL(exceptionCode, "InvalidSubsetting")) {
+    status = "404 Not Found";
+  }
+
+  msIO_setHeader("Status", "%s", status);
   if (encoding)
     msIO_setHeader("Content-Type","text/xml; charset=%s", encoding);
   else
@@ -2957,29 +2976,10 @@ int msWCSDescribeCoverage20(mapObj *map, wcs20ParamsObjPtr params, owsRequestObj
 /*      is found out.                                                   */
 /************************************************************************/
 
-static int msWCSGetCoverage20_FinalizeParamsObj(wcs20ParamsObjPtr params)
+static int msWCSGetCoverage20_FinalizeParamsObj(wcs20ParamsObjPtr params, wcs20AxisObjPtr *axes)
 {
-  int returnValue;
-  static const int numAxis = 2;
-  char *validXAxisNames[] = {"x", "xaxis", "x-axis", "x_axis", "long", "long_axis", "long-axis", "lon", "lon_axis", "lon-axis", NULL};
-  char *validYAxisNames[] = {"y", "yaxis", "y-axis", "y_axis", "lat", "lat_axis", "lat-axis", NULL};
-  char ***validAxisNames;
   char *crs = NULL;
-  wcs20AxisObjPtr *axes;
-
-  axes = (wcs20AxisObjPtr*)msSmallMalloc(sizeof(wcs20AxisObjPtr) * numAxis);
-
-  validAxisNames = msSmallCalloc(sizeof(char**), numAxis);
-  validAxisNames[0] = validXAxisNames;
-  validAxisNames[1] = validYAxisNames;
-
-  returnValue = msWCSValidateAndFindAxes20(params, validAxisNames, numAxis, axes);
-  msFree(validAxisNames);
-  if(returnValue != MS_SUCCESS) {
-    msFree(axes);
-    return MS_FAILURE;
-  }
-
+  
   if (axes[0] != NULL) {
     if(axes[0]->subset != NULL) {
       msDebug("Subset for X-axis found: %s\n", axes[0]->subset->axis);
@@ -3007,7 +3007,6 @@ static int msWCSGetCoverage20_FinalizeParamsObj(wcs20ParamsObjPtr params)
         if(!EQUAL(crs, axes[1]->subset->crs)) {
           msSetError(MS_WCSERR, "CRS for axis %s and axis %s are not the same.",
                      "msWCSCreateBoundingBox20()", axes[0]->name, axes[1]->name);
-          msFree(axes);
           return MS_FAILURE;
         }
       } else {
@@ -3024,13 +3023,10 @@ static int msWCSGetCoverage20_FinalizeParamsObj(wcs20ParamsObjPtr params)
       msSetError(MS_WCSERR, "The units of measure of the resolution for"
                  "axis %s and axis %s are not the same.",
                  "msWCSCreateBoundingBox20()", axes[0]->name, axes[1]->name);
-      msFree(axes);
       return MS_FAILURE;
     }
   }
 
-  msFree(axes);
-
   /* check if projections are equal */
   if(crs != NULL) {
     params->subsetcrs = msStrdup(crs);
@@ -3167,9 +3163,9 @@ int msWCSGetCoverage20(mapObj *map, cgiRequestObj *request,
   /* throw exception if no Layer was found */
   if (layer == NULL) {
     msSetError(MS_WCSERR,
-               "COVERAGE=%s not found, not in supported layer list. A layer might be disabled for \
+               "COVERAGEID=%s not found, not in supported layer list. A layer might be disabled for \
 this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", params->ids[0]);
-    return msWCSException(map, "InvalidParameterValue", "coverage",
+    return msWCSException(map, "NoSuchCoverage", "coverageid",
                           params->version);
   }
   /* retrieve coverage metadata  */
@@ -3203,9 +3199,36 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
                           "projection", params->version);
   }
 
-  if(msWCSGetCoverage20_FinalizeParamsObj(params) == MS_FAILURE) {
-    msWCSClearCoverageMetadata20(&cm);
-    return msWCSException(map, "InvalidParameterValue", "extent", params->version);
+  /* iterate over all subsets and check if they are valid*/
+  for(i = 0; i < params->numaxes; ++i) {
+    if(params->axes[i]->subset != NULL) {
+      if(params->axes[i]->subset->timeOrScalar == MS_WCS20_TIME_VALUE) {
+        msSetError(MS_WCSERR, "Time values for subsets are not supported. ",
+                   "msWCSGetCoverage20()");
+        return msWCSException(map, "InvalidSubsetting", "subset", params->version);
+      }
+      if(params->axes[i]->subset->operation == MS_WCS20_SLICE) {
+        msSetError(MS_WCSERR, "Subset operation 'slice' is not supported.",
+                   "msWCSGetCoverage20()");
+        return msWCSException(map, "InvalidSubsetting", "subset", params->version);
+      }
+    }
+  }
+
+  {
+    wcs20AxisObjPtr *axes;
+    axes = msSmallMalloc(sizeof(wcs20AxisObjPtr) * 2);
+    if(msWCSValidateAndFindAxes20(params, axes) == MS_FAILURE) {
+      msWCSClearCoverageMetadata20(&cm);
+      msFree(axes);
+      return msWCSException(map, "InvalidAxisLabel", "subset", params->version);
+    }
+    if(msWCSGetCoverage20_FinalizeParamsObj(params, axes) == MS_FAILURE) {
+      msWCSClearCoverageMetadata20(&cm);
+      msFree(axes);
+      return msWCSException(map, "InvalidParameterValue", "extent", params->version);
+    }
+    msFree(axes);
   }
 
   subsets = params->bbox;
diff --git a/mapwms.c b/mapwms.c
index 2b96574..e96c2ed 100644
--- a/mapwms.c
+++ b/mapwms.c
@@ -2446,7 +2446,7 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
                           break;
                         }
                       }
-                      if (l < lp2->numclasses)
+                      if (lp2 && l < lp2->numclasses)
                         break;
                     }
                     if (j < numNestedGroups[lp->index])
diff --git a/mapxbase.c b/mapxbase.c
index 2dfc38a..a667f5b 100644
--- a/mapxbase.c
+++ b/mapxbase.c
@@ -162,11 +162,11 @@ DBFHandle msDBFOpen( const char * pszFilename, const char * pszAccess )
   pszDBFFilename = (char *) msSmallMalloc(strlen(pszFilename)+1);
   strcpy( pszDBFFilename, pszFilename );
 
-  if( strcmp(pszFilename+strlen(pszFilename)-4,".shp")
-      || strcmp(pszFilename+strlen(pszFilename)-4,".shx") ) {
+  if( strcmp(pszFilename+strlen(pszFilename)-4,".shp") == 0
+      || strcmp(pszFilename+strlen(pszFilename)-4,".shx") == 0 ) {
     strcpy( pszDBFFilename+strlen(pszDBFFilename)-4, ".dbf");
-  } else if( strcmp(pszFilename+strlen(pszFilename)-4,".SHP")
-             || strcmp(pszFilename+strlen(pszFilename)-4,".SHX") ) {
+  } else if( strcmp(pszFilename+strlen(pszFilename)-4,".SHP") == 0
+             || strcmp(pszFilename+strlen(pszFilename)-4,".SHX") == 0 ) {
     strcpy( pszDBFFilename+strlen(pszDBFFilename)-4, ".DBF");
   }
 
@@ -177,6 +177,13 @@ DBFHandle msDBFOpen( const char * pszFilename, const char * pszAccess )
   MS_CHECK_ALLOC(psDBF, sizeof(DBFInfo), NULL);
   psDBF->fp = fopen( pszDBFFilename, pszAccess );
   if( psDBF->fp == NULL )
+  {
+    if( strcmp(pszDBFFilename+strlen(pszDBFFilename)-4,".dbf") == 0 ) {
+      strcpy( pszDBFFilename+strlen(pszDBFFilename)-4, ".DBF");
+      psDBF->fp = fopen( pszDBFFilename, pszAccess );
+    }
+  }
+  if( psDBF->fp == NULL )
     return( NULL );
 
   psDBF->bNoHeader = MS_FALSE;
diff --git a/tile4ms.c b/tile4ms.c
index 445aced..266bf3b 100644
--- a/tile4ms.c
+++ b/tile4ms.c
@@ -213,6 +213,7 @@ int process_shapefiles(char *metaFileNameP, char *tileFileNameP,
     /* create and add shape object.  Returns link to entry in DBF file */
     /* --------------------------------------------------------------- */
 
+    shapeRect.type = MS_SHAPE_POLYGON;
     msAddLine(&shapeRect, &line);
     entityNum = msSHPWriteShape( tileSHP, &shapeRect );
 
diff --git a/xmlmapfile/mapfile.xsd b/xmlmapfile/mapfile.xsd
index 0e83beb..310b90d 100644
--- a/xmlmapfile/mapfile.xsd
+++ b/xmlmapfile/mapfile.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://www.mapserver.org/mapserver" targetNamespace="http://www.mapserver.org/mapserver" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.0.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ms="http://www.mapserver.org/mapserver" targetNamespace="http://www.mapserver.org/mapserver" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.2.1">
 	<!-- Definition of types -->
 	<xs:simpleType name="rgbColorValueType">
 		<xs:restriction base="xs:integer">
@@ -347,7 +347,8 @@
 				</xs:simpleType>
 			</xs:element>
 			<xs:element name="Style" type="ms:Style" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="wrap" type="xs:string" minOccurs="0"/>
+		        <xs:element name="text" type="xs:string" minOccurs="0"/>                
+		        <xs:element name="wrap" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 		<xs:attribute name="type" use="required">
 			<xs:simpleType>
diff --git a/xmlmapfile/mapfile.xsl b/xmlmapfile/mapfile.xsl
index a113474..13cfa04 100644
--- a/xmlmapfile/mapfile.xsl
+++ b/xmlmapfile/mapfile.xsl
@@ -682,6 +682,11 @@
     </xsl:apply-templates>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:text'"/>
+      <xsl:with-param name="quote" select="1"/>
+    </xsl:call-template>    
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:wrap'"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
diff --git a/xmlmapfile/tests/layerset.xml b/xmlmapfile/tests/layerset.xml
index a347fb1..92a7696 100644
--- a/xmlmapfile/tests/layerset.xml
+++ b/xmlmapfile/tests/layerset.xml
@@ -32,6 +32,7 @@
         <shadowColor red="244" green="43" blue="22"/>
         <shadowSize x="15" y="14"/>
         <size>TINY</size>
+        <text>Test</text>
         <wrap>\n</wrap>
       </Label>
       <LabelLeader>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git



More information about the Pkg-grass-devel mailing list