[mapserver-commits] r8976 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-04-29 09:06:17 -0400 (Wed, 29 Apr 2009)
New Revision: 8976

Modified:
   branches/branch-5-4/mapserver/maptemplate.c
Log:
One more change in processExtentTag(). (#2990)

Modified: branches/branch-5-4/mapserver/maptemplate.c
===================================================================
--- branches/branch-5-4/mapserver/maptemplate.c	2009-04-29 12:54:23 UTC (rev 8975)
+++ branches/branch-5-4/mapserver/maptemplate.c	2009-04-29 13:06:17 UTC (rev 8976)
@@ -1286,7 +1286,7 @@
   double xExpand, yExpand;
 
   char number[64]; /* holds a single number in the extent */
-  char numberFormat[16]="%f";
+  char numberFormat[16];
   char *format;
 
   int precision;
@@ -1306,14 +1306,14 @@
 
   while(tagStart) {
     /* set tag argument defaults */
-    xExpand = yExpand=0;
-    precision=-1;
-    format="$minx $miny $maxx $maxy";
+    xExpand = yExpand = 0;
+    precision = -1;
+    format = "$minx $miny $maxx $maxy";
     if(strstr(name, "_esc")) 
       escape = ESCAPE_URL;
     else
-      escape=ESCAPE_HTML;
-    projectionString=NULL;
+      escape = ESCAPE_HTML;
+    projectionString = NULL;
 
     tagOffset = tagStart - *line;
 
@@ -1379,6 +1379,8 @@
 
     if(precision != -1)
       snprintf(numberFormat, 16, "%%.%dlf", precision);
+    else
+      snprintf(numberFormat, 16, "%%f");
 
     snprintf(number, 64, numberFormat, tempExtent.minx);
     tagValue = msReplaceSubstring(tagValue, "$minx", number);