[mapserver-commits] r11151 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-03-11 05:22:21 -0800 (Fri, 11 Mar 2011)
New Revision: 11151

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
Log:
Fixed mapfile parse error with label angle binding... (#3727)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-11 05:40:53 UTC (rev 11150)
+++ trunk/mapserver/HISTORY.TXT	2011-03-11 13:22:21 UTC (rev 11151)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed mapfile parsing error when a label angle referenced an attribute 
+  (e.g. ANGLE [angle]) #3727
+
 - Removed executable flag on some source files (#3726)
 
 - Fixed SQL Spatial to be able to use UniqueIdentifier field as unique key (#3722)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-03-11 05:40:53 UTC (rev 11150)
+++ trunk/mapserver/mapfile.c	2011-03-11 13:22:21 UTC (rev 11151)
@@ -1625,7 +1625,7 @@
   for(;;) {
     switch(msyylex()) {
     case(ANGLE):
-      if((symbol = getSymbol(4, MS_NUMBER,MS_AUTO,MS_AUTO2,MS_FOLLOW,MS_BINDING)) == -1) 
+      if((symbol = getSymbol(5, MS_NUMBER,MS_AUTO,MS_AUTO2,MS_FOLLOW,MS_BINDING)) == -1) 
 	return(-1);
 
       if(symbol == MS_NUMBER)