Ticket #2032: rfc24-mapandlayers-demo.patch

mapcontext.c

@@ -1145 +1145 @@
-  layerObj *layer;
-
-  /* Init new layer */
-map->layers[map->numlayers]
+GET_LAYER(map, map->numlayers)
-  initLayer(layer, map);
-  layer->map = (mapObj *)map;
-  layer->type = MS_LAYER_RASTER;
-  /* save the index */
-map->layers[map->numlayers].
+GET_LAYER(map, map->numlayers)->
-  map->layerorder[map->numlayers] = map->numlayers;
-  map->numlayers++;
-  
@@ -1919 +1919 @@
-  /* Loop on all layer   */
-  for(i=0; i<map->numlayers; i++)
-  {
-map->layers[i].status != MS_DELETE && map->layers[i].
+GET_LAYER(map, i)->status != MS_DELETE && GET_LAYER(map, i)->
-      {
-map->layers[i].
+GET_LAYER(map, i)->
-              nValue = 1;
-          else
-              nValue = 0;
-          msIO_fprintf(stream, "    <Layer queryable=\"%d\" hidden=\"%d\">\n", 
-map->layers[i]
+GET_LAYER(map, i)
-
-          /*  */
-          /* Server definition */
-          /*  */
-          if(nVersion <= OWS_1_0_0 )
-map->layers[i].
+GET_LAYER(map, i)->
-                                       NULL, "wms_server_version", OWS_WARN,
-                             "      <Server service=\"WMS\" version=\"%s\" ",
-                                       "1.0.0");
-          else
-map->layers[i].
+GET_LAYER(map, i)->
-                                       NULL, "wms_server_version", OWS_WARN,
-                          "      <Server service=\"OGC:WMS\" version=\"%s\" ",
-                                       "1.0.0");
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-                                       NULL, "wms_title", OWS_NOERR, 
-map->layers[i].
+GET_LAYER(map, i)->
-          else
-          {
-map->layers[i].
+GET_LAYER(map, i)->
-                                       NULL, "wms_title", OWS_NOERR, 
-                                       "title=\"%s\">\n", "");
-          }
-
-          /* Get base url of the online resource to be the default value */
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-          else
-              pszValue = strdup( "" );
-          pszChar = strchr(pszValue, '?');
-          if( pszChar )
-              pszValue[pszChar - pszValue] = '\0';
-map->layers[i].
+GET_LAYER(map, i)->
-                                      NULL, "wms_onlineresource", OWS_WARN, 
-         "        <OnlineResource xlink:type=\"simple\" xlink:href=\"%s\"/>\n",
-                                      pszValue) == OWS_WARN)
@@ -1973 +1973 @@
-          /*  */
-          /* Layer information */
-          /*  */
-map->layers[i].
+GET_LAYER(map, i)->
-                             NULL, "wms_name", OWS_WARN, 
-                             "      <Name>%s</Name>\n", 
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-                             NULL, "wms_title", OWS_WARN, 
-                             "      <Title>%s</Title>\n", 
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-                             NULL, "wms_abstract", OWS_NOERR, 
-                             "      <Abstract>%s</Abstract>\n", 
-                             NULL);
@@ -1989 +1989 @@
-          /* DataURL */
-          if(nVersion <= OWS_0_1_4)
-          {
-map->layers[i].
+GET_LAYER(map, i)->
-                                 NULL, "wms_dataurl", OWS_NOERR, 
-                                 "      <DataURL>%s</DataURL>\n", 
-                                 NULL);
@@ -2002 +2002 @@
-              /* Note: in version 0.1.7 the width and height are not included  */
-              /* in the Context file, but they are included in the metadata for */
-              /* for consistency with the URLType. */
-map->layers[i].
+GET_LAYER(map, i)->
-                                "dataurl", OWS_NOERR, NULL, "DataURL", NULL, 
-                                " width=\"%s\"", " height=\"%s\"",
-                                " format=\"%s\"", 
@@ -2016 +2016 @@
-          /* The MetadataURL have a width, height, format and an URL */
-          /* The metadata will be structured like this:  */
-          /* "width height format url" */
-map->layers[i].
+GET_LAYER(map, i)->
-                            "metadataurl", OWS_NOERR, NULL, "MetadataURL",NULL,
-                            " width=\"%s\"", " height=\"%s\""," format=\"%s\"",
-                            "        <OnlineResource xlink:type=\"simple\""
@@ -2025 +2025 @@
-                            MS_TRUE, NULL, NULL, NULL, NULL, NULL, "      ");
-
-          /* MinScale && MaxScale */
-map->layers[i].
+GET_LAYER(map, i)->
-              msIO_fprintf(stream, 
-               "      <sld:MinScaleDenominator>%g</sld:MinScaleDenominator>\n",
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-              msIO_fprintf(stream, 
-               "      <sld:MaxScaleDenominator>%g</sld:MaxScaleDenominator>\n",
-map->layers[i].
+GET_LAYER(map, i)->
-
-          /* Layer SRS */
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-                                             "MO", MS_FALSE);
-          if(pszValue && (strcasecmp(pszValue, "(null)") != 0))
-          {
@@ -2046 +2046 @@
-          }
-
-          /* Format */
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-          {
-              pszURL = NULL;
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-              else
-                  pszURL = strdup( "" );
-              pszValue = pszURL;
@@ -2079 +2079 @@
-              char **papszFormats;
-              int numFormats, nForm;
-
-map->layers[i].
+GET_LAYER(map, i)->
-                                           "wms_formatlist");
-              if(!pszValue)
-map->layers[i].
+GET_LAYER(map, i)->
-                                               "wms_format");
-map->layers[i].
+GET_LAYER(map, i)->
-                                             "wms_format");
-
-              papszFormats = split(pszValue, ',', &numFormats);
@@ -2111 +2111 @@
-          }
-          /* Style */
-          /* First check the stylelist */
-map->layers[i].
+GET_LAYER(map, i)->
-                                       "wms_stylelist");
-          if(pszValue == NULL || strlen(trimLeft(pszValue)) < 1)
-          {
-              /* Check if the style is in the connection URL */
-              pszURL = "";
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-              else
-                  pszURL = strdup( "" );
-              pszValue = pszURL;
@@ -2132 +2132 @@
-                      pszValue[pszChar - pszValue] = '\0';
-
-                  /* Check the SLD string from the URL */
-map->layers[i].
-map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
-                  else
-                      pszSLD2 = strdup( "" );
-                  if(pszSLD2)
@@ -2215 +2215 @@
-          {
-              /* If the style information is not in the connection URL, */
-              /* read the metadata. */
-map->layers[i].
+GET_LAYER(map, i)->
-                                           "wms_stylelist");
-map->layers[i].
+GET_LAYER(map, i)->
-                                             "wms_style");
-              msIO_fprintf( stream, "      <StyleList>\n");
-              /* Loop in each style in the style list */
@@ -2238 +2238 @@
-                  /* Write SLDURL if it is in the metadata */
-                  pszStyleItem = (char*)malloc(strlen(pszStyle)+10+10);
-                  sprintf(pszStyleItem, "wms_style_%s_sld", pszStyle);
-map->layers[i].
+GET_LAYER(map, i)->
-                                       pszStyleItem) != NULL)
-                  {
-                      msIO_fprintf(stream, "          <SLD>\n");
-                      msOWSPrintEncodeMetadata(stream, 
-map->layers[i].
+GET_LAYER(map, i)->
-                                               NULL, pszStyleItem, 
-                                               OWS_NOERR, 
-     "            <OnlineResource xlink:type=\"simple\" xlink:href=\"%s\"/>\n",
@@ -2255 +2255 @@
-                  {
-                      /* If the URL is not there, check for SLDBody */
-                      sprintf(pszStyleItem, "wms_style_%s_sld_body", pszStyle);
-map->layers[i].
+GET_LAYER(map, i)->
-                                           pszStyleItem) != NULL)
-                      {
-                          msIO_fprintf(stream, "          <SLD>\n");
-map->layers[i].
+GET_LAYER(map, i)->
-                                             NULL, pszStyleItem, OWS_NOERR, 
-                                             "            %s\n", NULL);
-                          msIO_fprintf(stream, "          </SLD>\n");
@@ -2279 +2279 @@
-                          sprintf(pszStyleItem, "wms_style_%s_title",pszStyle);
-                          /* Title */
-                          msOWSPrintEncodeMetadata(stream, 
-map->layers[i].
+GET_LAYER(map, i)->
-                                                   NULL, pszStyleItem, 
-                                                   OWS_NOERR, 
-                                        "          <Title>%s</Title>\n",
@@ -2290 +2290 @@
-                          pszStyleItem = (char*)malloc(strlen(pszStyle)+10+20);
-                          sprintf(pszStyleItem, "style_%s_legendurl",
-                                  pszStyle);
-map->layers[i].
+GET_LAYER(map, i)->
-                                            "M", pszStyleItem, OWS_NOERR, NULL,
-                                            "LegendURL", NULL, " width=\"%s\"",
-                                            " height=\"%s\""," format=\"%s\"",
@@ -2317 +2317 @@
-          /* Dimension element */;
-          pszCurrent = NULL;
-
-map->layers[i].
+GET_LAYER(map, i)->
-                                       "wms_dimensionlist");
-map->layers[i].
+GET_LAYER(map, i)->
-                                         "wms_dimension");
-          while(pszValue != NULL)
-          {
@@ -2338 +2338 @@
-              }
-
-              /* From the dimension list, extract the required dimension */
-map->layers[i]
+GET_LAYER(map, i)
-                                    &pszDimUserValue, &pszDimUnits, 
-                                    &pszDimDefault, &pszDimNearValue, 
-                                    &pszDimUnitSymbol, &pszDimMultiValue);

mapcopy.c

@@ -878 +878 @@
-    MS_COPYSTELEM(numlayers);
-
-    for (i = 0; i < dst->numlayers; i++) {
-&(dst->layers[i]
+(GET_LAYER(dst, i)
-
-&(dst->layers[i]), &(src->layers[i]
+(GET_LAYER(dst, i)), (GET_LAYER(src, i)
-        if (return_value != MS_SUCCESS) {
-            msSetError(MS_MEMERR, "Failed to copy layer.", "msCopyMap()");
-            return MS_FAILURE;

mapdraw.c

@@ -217 +217 @@
-  int i;
-
-  for(i=0; i<map->numlayers; i++)
-&(map->layers[i]
+(GET_LAYER(map, i)
-
-  msClearLegendPenValues(&(map->legend));
-  msClearScalebarPenValues(&(map->scalebar));
@@ -360 +360 @@
-
-    /* compute layer scale factors now */
-    for(i=0;i<map->numlayers; i++) {
-map->layers[i].
-map->layers[i].scalefactor = (msInchesPerUnit(map->layers[i].
-map->layers[i].
-map->layers[i].scalefactor = map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->scalefactor = (msInchesPerUnit(GET_LAYER(map, i)->
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->scalefactor = GET_LAYER(map, i)->
-      else
-map->layers[i].
+GET_LAYER(map, i)->
-    }
-
-    return image;
@@ -421 +421 @@
-    for(i=0; i<map->numlayers; i++) 
-    {
-        if (map->layerorder[i] == -1 || 
-map->layers[map->layerorder[i]]
+GET_LAYER(map, map->layerorder[i])
-            continue;
-
-map->layers[ map->layerorder[i]]
+GET_LAYER(map,  map->layerorder[i])
-
-#ifdef USE_WMS_LYR
-        if (lp->connectiontype == MS_WMS)
@@ -473 +473 @@
-    for(i=0; i<map->numlayers; i++) {
-
-        if (map->layerorder[i] != -1) {
-&(map->layers[ map->layerorder[i]]
+(GET_LAYER(map,  map->layerorder[i])
-
-            if(lp->postlabelcache) /* wait to draw */
-                continue;
@@ -602 +602 @@
-
-  for(i=0; i<map->numlayers; i++) { /* for each layer, check for postlabelcache layers */
-
-&(map->layers[map->layerorder[i]]
+(GET_LAYER(map, map->layerorder[i])
-
-    if(!lp->postlabelcache)
-      continue;
@@ -734 +734 @@
-
-  /* compute layer scale factors now */
-  for(i=0;i<map->numlayers; i++) {
-map->layers[i].
-map->layers[i].scalefactor = (msInchesPerUnit(map->layers[i].
-map->layers[i].
-map->layers[i].scalefactor = map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->scalefactor = (msInchesPerUnit(GET_LAYER(map, i)->
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->scalefactor = GET_LAYER(map, i)->
-    else
-map->layers[i].
+GET_LAYER(map, i)->
-  }
-
-  for(i=0; i<map->numlayers; i++) {
-&(map->layers[ map->layerorder[i]]
+(GET_LAYER(map,  map->layerorder[i])
-
-    if(lp->postlabelcache) /* wait to draw */
-      continue;
@@ -762 +762 @@
-    return(NULL);
-
-  for(i=0; i<map->numlayers; i++) { /* for each layer, check for postlabelcache layers */
-&(map->layers[ map->layerorder[i]]
+(GET_LAYER(map,  map->layerorder[i])
-
-    if(!lp->postlabelcache)
-      continue;

maperror.h

@@ -96 +96 @@
-#define MS_TIMEERR 35
-#define MS_GMLERR 36
-#define MS_SOSERR 37
-
+
+
-
-#define MESSAGELENGTH 2048
-#define ROUTINELENGTH 64

mapfile.c

@@ -471 +471 @@
-  if(!name) return(-1);
-
-  for(i=0;i<map->numlayers; i++) {
-map->layers[i].
+GET_LAYER(map, i)->
-      continue;
-map->layers[i].
+GET_LAYER(map, i)->
-      return(i);
-  }
-  return(-1);
@@ -2440 +2440 @@
-*/
-int initLayer(layerObj *layer, mapObj *map)
-{
+  if (layer==NULL) {
+    msSetError(MS_MEMERR, "Layer is null", "initLayer()");
+    return(-1);
+  }
-  layer->debug = MS_OFF;
+  MS_REFCNT_INIT(layer);
-
-  layer->numclasses = 0;
-  if((layer->class = (classObj *)malloc(sizeof(classObj)*MS_MAXCLASSES)) == NULL) {
@@ -2550 +2555 @@
-  return(0);
-}
-
-void
+int
-  int i;
+  if (!layer) return MS_FAILURE;
+  if( MS_REFCNT_IS_NOT_ZERO(layer) ) { return MS_FAILURE; }
+  if (layer->debug)
+     msDebug("freeLayer(): freeing layer at %p.",layer);
-
-  msFree(layer->name);
-  msFree(layer->group);
@@ -2571 +2580 @@
-  msFree(layer->connection);
-  msFree(layer->vtable);
-
-
-  msFreeProjection(&(layer->projection));
-
-  for(i=0;i<layer->numclasses;i++)
@@ -2601 +2609 @@
-    freeJoin(&(layer->joins[i]));
-  msFree(layer->joins);
-  layer->numjoins = 0;
+
+  return MS_SUCCESS;
-}
-
-int loadLayer(layerObj *layer, mapObj *map)
@@ -4336 +4346 @@
-*/
-int initMap(mapObj *map)
-{
+  int i=0;
+  MS_REFCNT_INIT(map);
-  map->numlayers = 0;
-)malloc(sizeof(layerObj
+*)malloc(sizeof(layerObj*
-    msSetError(MS_MEMERR, NULL, "initMap()");
-    return(-1);
-  }
+  for (i=0;i<MS_MAXLAYERS;i++) {
+        map->layers[i]=NULL;
+  }
-
-  map->debug = MS_OFF;
-  map->status = MS_ON;
@@ -4553 +4568 @@
-
-  for(i=0; i<map->numlayers; i++)
-  {
-&(map->layers[map->layerorder[i]]
-map->layers[i]
+(GET_LAYER(map, map->layerorder[i])
+GET_LAYER(map, i)
-  }
-
-  fprintf(stream, "END\n");
@@ -4660 +4675 @@
-
-      /* step through layers and classes to resolve symbol names */
-      for(i=0; i<map->numlayers; i++) {
-map->layers[i].
-map->layers[i].
-map->layers[i].
-map->layers[i].class[j].styles[k].symbol =  msGetSymbolIndex(&(map->symbolset), map->layers[i].
-map->layers[i].class[j].styles[k].symbolname, j, k, map->layers[i].
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->
+GET_LAYER(map, i)->class[j].styles[k].symbol =  msGetSymbolIndex(&(map->symbolset), GET_LAYER(map, i)->
+GET_LAYER(map, i)->class[j].styles[k].symbolname, j, k, GET_LAYER(map, i)->
-                return(NULL);
-              }
-            }
@@ -4730 +4745 @@
-            msSetError(MS_IDENTERR, "Maximum number of layers reached.", "msLoadMap()");
-            return(NULL);
-      }
-
-
+
+
+
+
+
+
+
+
+
-      /* Update the layer order list with the layer's index. */
-      map->layerorder[map->numlayers] = map->numlayers;
-      map->numlayers++;
@@ -4917 +4939 @@
-    case(LAYER):      
-      if(getInteger(&i) == -1) break;
-      if(i>=map->numlayers || i<0) break;
-&(map->layers[i]
+(GET_LAYER(map, i)
-      break;
-    case(LEGEND):
-      loadLegendString(map, &(map->legend), value);
@@ -4962 +4984 @@
-    case(MS_STRING):
-      i = msGetLayerIndex(map, msyytext);
-      if(i>=map->numlayers || i<0) break;
-&(map->layers[i]
+(GET_LAYER(map, i)
-      break;
-    case(TRANSPARENT):
-      msyystate = 2; msyystring = value;
@@ -5114 +5136 @@
-  layerObj *lp;
-
-  for (i=0;i<map->numlayers;i++) {
-&(map->layers[i]
+(GET_LAYER(map, i)
-
-    /* If the vtable is null, then the layer is never accessed or used -> skip it
-     */

mapgd.c

@@ -184 +184 @@
-  if(gdImageTrueColor(image->img.gd)) return;
-
-  for(i=0; i<map->numlayers; i++) {
-&(map->layers[i]
+(GET_LAYER(map, i)
-    if(lp->status == MS_ON || lp->status == MS_DEFAULT) {
-      for(j=0; j<lp->numclasses; j++) {
-        cp = &(lp->class[j]);
@@ -3249 +3249 @@
-
-    cachePtr = &(map->labelcache.labels[l]); /* point to right spot in the label cache */
-
-&(map->layers[cachePtr->layerindex]
+(GET_LAYER(map, cachePtr->layerindex)
-    labelPtr = &(cachePtr->label);
-
-    if(!cachePtr->text || strlen(cachePtr->text) == 0)

mapgml.c

@@ -1424 +1424 @@
-
-  /* step through the layers looking for query results */
-  for(i=0; i<map->numlayers; i++) {
-&(map->layers[map->layerorder[i]]
+(GET_LAYER(map, map->layerorder[i])
-
-    if(lp->dump == MS_TRUE && lp->resultcache && lp->resultcache->numresults > 0) { /* found results */
-
@@ -1575 +1575 @@
-  /* step through the layers looking for query results */
-  for(i=0; i<map->numlayers; i++) {
-
-map->layers[map->layerorder[i]]
+GET_LAYER(map, map->layerorder[i])
-
-    if(lp->dump == MS_TRUE && lp->resultcache && lp->resultcache->numresults > 0)  { /* found results */
-      char *layerName;      

mapgraticule.c

@@ -200 +200 @@
-        int                                      iAxisTickCount = 0;
-        rectObj                          rectMapCoordinates;
-
+        if ( msCheckParentPointer(layer->map,"map")==MS_FAILURE )
+                return MS_FAILURE;
+
-        pInfo->dstartlatitude                   = rect.miny;
-        pInfo->dstartlongitude                  = rect.minx;
-        pInfo->dendlatitude                             = rect.maxy;
@@ -686 +689 @@
-        msSetError(MS_MISCERR, "Assertion failed: Null shape or layerinfo!, ", "_AdjustLabelPosition()");
-                return MS_FAILURE;
-    }
+        if ( msCheckParentPointer(pLayer->map,"map")==MS_FAILURE )
+                return MS_FAILURE;
-        
-        ptPoint                 = pShape->line->point[0];
-

map.h

@@ -403 +403 @@
-
-#define MS_ENCRYPTION_KEY_SIZE  16   /* Key size: 128 bits = 16 bytes */
-
+#define GET_LAYER(map, pos) map->layers[pos]
+#define MS_REFCNT_INCR(obj) obj->refcount++
+#define MS_REFCNT_DECR(obj) obj->refcount--
+#define MS_REFCNT_INIT(obj) obj->refcount=1
+#define MS_REFCNT_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0
+#define MS_REFCNT_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0
+
-#endif
-
-/* General enumerated types - needed by scripts */
@@ -995 +1002 @@
-#ifdef SWIG
-%immutable;
-#endif /* SWIG */
+  /* reference counting, RFC24 */
+  int refcount;
-  int numclasses;
-  int index;
-  struct map_obj *map;
@@ -1133 +1142 @@
-  int maxsize;
-
-#ifndef SWIG
-
+*
-#endif /* SWIG */
-
-#ifdef SWIG
-%immutable;
-#endif /* SWIG */
+  /* reference counting, RFC24 */
+  int refcount;
-  int numlayers; /* number of layers in mapfile */
-
-  symbolSetObj symbolset;
@@ -1346 +1357 @@
-MS_DLL_EXPORT void initSymbol(symbolObj *s);
-MS_DLL_EXPORT int initMap(mapObj *map);
-MS_DLL_EXPORT int initLayer(layerObj *layer, mapObj *map);
-void
+int
-MS_DLL_EXPORT int initClass(classObj *_class);
-MS_DLL_EXPORT void freeClass( classObj * );
-MS_DLL_EXPORT void initLabel(labelObj *label);
@@ -1853 +1864 @@
-
-MS_DLL_EXPORT int msAlphaBlend (int dst, int src);
-
+MS_DLL_EXPORT int msCheckParentPointer(void* p, char* objname);
+
-
-/* ==================================================================== */
-/*      End of prototypes for functions in maputil.c                    */

mapimagemap.c

@@ -1877 +1877 @@
-
-    cachePtr = &(map->labelcache.labels[l]); /* point to right spot in the label cache */
-
-&(map->layers[cachePtr->layerindex]
+(GET_LAYER(map, cachePtr->layerindex)
-    labelPtr = &(cachePtr->label);
-
-    if(!cachePtr->text || strlen(cachePtr->text) == 0)

mapjoin.c

@@ -188 +188 @@
-  msDBFJoinInfo *joininfo;
-
-  if(join->joininfo) return(MS_SUCCESS); /* already open */
+  
+  if ( msCheckParentPointer(layer->map,"map")==MS_FAILURE )
+        return MS_FAILURE;
+  
-    
-  /* allocate a msDBFJoinInfo struct */
-  joininfo = (msDBFJoinInfo *) malloc(sizeof(msDBFJoinInfo));
@@ -345 +349 @@
-  char buffer[MS_BUFFER_LENGTH];
-
-  if(join->joininfo) return(MS_SUCCESS); /* already open */
+  if ( msCheckParentPointer(layer->map,"map")==MS_FAILURE )
+        return MS_FAILURE;
+  
-    
-  /* allocate a msCSVJoinInfo struct */
-  if((joininfo = (msCSVJoinInfo *) malloc(sizeof(msCSVJoinInfo))) == NULL) {

maplabel.c

@@ -105 +105 @@
-  }
-
-  cachePtr = &(map->labelcache.labels[map->labelcache.numlabels]); /* set up a few pointers for clarity */
-&(map->layers[layerindex]
-map->layers[layerindex].
+(GET_LAYER(map, layerindex)
+GET_LAYER(map, layerindex)->
-
-  if( label == NULL )
-      label = &(classPtr->label);

maplegend.c

@@ -289 +289 @@
-  ** allocate heights array
-  */
-  for(i=0; i<map->numlayers; i++) {
-&(map->layers[map->layerorder[i]]
+(GET_LAYER(map, map->layerorder[i])
-
-    if((lp->status == MS_OFF) || (lp->type == MS_LAYER_QUERY)) /* skip it */
-      continue;
@@ -310 +310 @@
-  */
-  n=0;
-  for(i=0; i<map->numlayers; i++) { /* Need to find the longest legend label string */
-&(map->layers[map->layerorder[i]]
+(GET_LAYER(map, map->layerorder[i])
-
-    if((lp->status == MS_OFF) || (lp->type == MS_LAYER_QUERY)) /* skip it */
-      continue;
@@ -375 +375 @@
-    
-  /* for(i=0; i<map->numlayers; i++) { */
-  for(i=map->numlayers-1; i>=0; i--) {
-&(map->layers[map->layerorder[i]]
+(GET_LAYER(map, map->layerorder[i])
-
-    if((lp->numclasses == 0) || (lp->status == MS_OFF) || (lp->type == MS_LAYER_QUERY))
-      continue; /* skip this layer */
@@ -490 +490 @@
-    l = map->numlayers;
-    map->numlayers++;
-
-&(map->layers[l]
-map->layers[l].
-map->layers[l].
+(GET_LAYER(map, l)
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
-
-map->layers[l].
-map->layers[l].
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
-        
-    /* update the layer order list with the layer's index. */
-    map->layerorder[l] = l;
-  }
-
-map->layers[l].
+GET_LAYER(map, l)->
-
-map->layers[l].
-map->layers[l].
-map->layers[l].
-map->layers[l].
-map->layers[l].
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
+GET_LAYER(map, l)->
-
-  if(map->legend.postlabelcache) /* add it directly to the image */
-map->layers[l].
+GET_LAYER(map, l)->
-  else
-    msAddLabel(map, l, 0, -1, -1, &point, NULL, " ", 1.0, NULL);
-
-  /* Mark layer as deleted so that it doesn't interfere with html legends or */
-  /* with saving maps */
-map->layers[l].
+GET_LAYER(map, l)->
-
-  return(0);
-}

mapmygis.c

@@ -341 +341 @@
-
-  /* TODO: there is an issue with layer order since it's possible that layers to be rendered out of order */
-  for (i=0;i<layer->index;i++) {        /* check all layers previous to this one */
-layer->map->layers[i]
+GET_LAYER(layer->map, i)
-
-    if (lp == layer) continue;
-

mapobject.c

@@ -169 +169 @@
-  int i;
-
-  if(!map) return;
+
+  if ( MS_REFCNT_IS_NOT_ZERO(map) ) { return; }
+  if (map->debug)
+     msDebug("msFreeMap(): freeing map at %p.",map);
+  
-  msCloseConnections(map);
-
-  msFree(map->name);
@@ -203 +208 @@
-  freeReferenceMap(&(map->reference));
-  freeLegend(&(map->legend));  
-
-
-
+
+
+
+
+
+
+
+
+
-  msFree(map->layers);
-
-  if (map->layerorder)
@@ -475 +487 @@
-    map->projection.gt.geotransform[5] *= -1;
-
-    for(i=0; i<map->numlayers; i++)
-map->layers[i].
+GET_LAYER(map, i)->
-
-    return InvGeoTransform( map->projection.gt.geotransform, 
-                            map->projection.gt.invgeotransform );
@@ -524 +536 @@
-        return -1;
-    }
-    else if (nIndex < 0) { /* Insert at the end by default */
-initLayer(&(map->layers[map->numlayers]
-msCopyLayer(&(map->layers[map->numlayers]
+//initLayer((GET_LAYER(map, map->numlayers)
+//msCopyLayer((GET_LAYER(map, map->numlayers)
-        map->layerorder[map->numlayers] = map->numlayers;
-
+
+
+
-        map->numlayers++;
-        return map->numlayers-1;
-    }