[mapserver-commits] r11471 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-04-05 19:35:02 -0700 (Tue, 05 Apr 2011)
New Revision: 11471

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogr.cpp
Log:
Fixed handling of STYLEITEM AUTO label position codes 10,11,12 (#3806)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-05 20:11:33 UTC (rev 11470)
+++ trunk/mapserver/HISTORY.TXT	2011-04-06 02:35:02 UTC (rev 11471)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Fixed handling of STYLEITEM AUTO label position codes 10,11,12 (#3806)
+
 - Fixed msGEOSGeometry2Shape to handle 'GEOMETRYCOLLECTION EMPTY' 
   as null geometry instead of raising an error (#3811)
 

Modified: trunk/mapserver/mapogr.cpp
===================================================================
--- trunk/mapserver/mapogr.cpp	2011-04-05 20:11:33 UTC (rev 11470)
+++ trunk/mapserver/mapogr.cpp	2011-04-06 02:35:02 UTC (rev 11471)
@@ -2929,9 +2929,9 @@
                 case 7: c->label.position = MS_LR; break;
                 case 8: c->label.position = MS_LC; break;
                 case 9: c->label.position = MS_LL; break;
-                case 10: c->label.position = MS_LR; break; /*approximate*/
-                case 11: c->label.position = MS_LC; break;
-                case 12: c->label.position = MS_LL; break;
+                case 10: c->label.position = MS_UR; break; /*approximate*/
+                case 11: c->label.position = MS_UC; break;
+                case 12: c->label.position = MS_UL; break;
                 default: break;
               }
           }