[mapserver-commits] r11540 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-04-12 04:44:43 -0700 (Tue, 12 Apr 2011)
New Revision: 11540

Modified:
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapgraticule.c
Log:
change r11538 to free layerinfo inside msGraticuleLayerClose as it should be


Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-04-12 11:27:38 UTC (rev 11539)
+++ trunk/mapserver/mapfile.c	2011-04-12 11:44:43 UTC (rev 11540)
@@ -3416,10 +3416,6 @@
 
   if(msLayerIsOpen(layer))
      msLayerClose(layer);
-  if( layer->layerinfo &&  layer->connectiontype == MS_GRATICULE) {
-     free(layer->layerinfo);
-     layer->layerinfo = NULL;
-  }
 
   msFree(layer->name);
   msFree(layer->group);

Modified: trunk/mapserver/mapgraticule.c
===================================================================
--- trunk/mapserver/mapgraticule.c	2011-04-12 11:27:38 UTC (rev 11539)
+++ trunk/mapserver/mapgraticule.c	2011-04-12 11:44:43 UTC (rev 11540)
@@ -142,6 +142,8 @@
     free( pInfo->pboundinglines );
     pInfo->pboundinglines = NULL;
   }
+
+  free(layer->layerinfo);
   
   return MS_SUCCESS;
 }