[mapserver-commits] r13291 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2012-03-20 20:21:28 -0700 (Tue, 20 Mar 2012)
New Revision: 13291

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maplegend.c
Log:
Fixed legend image problem with annotation layers with label offsets. (#4147)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2012-03-21 03:07:14 UTC (rev 13290)
+++ trunk/mapserver/HISTORY.TXT	2012-03-21 03:21:28 UTC (rev 13291)
@@ -14,6 +14,9 @@
 
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
+
+- Fixed legend image problem with annotation layers with label offsets (#4147)
+
 - Add support for mutiple labels per feature (RFC81)
 
 - Add support for INSPIRE view service (RFC 75)

Modified: trunk/mapserver/maplegend.c
===================================================================
--- trunk/mapserver/maplegend.c	2012-03-21 03:07:14 UTC (rev 13290)
+++ trunk/mapserver/maplegend.c	2012-03-21 03:21:28 UTC (rev 13291)
@@ -149,13 +149,21 @@
       double lsize = label->size;
       double langle = label->angle;
       int lpos = label->position;
+      int loffsetx = label->offsetx;
+      int loffsety = label->offsety;
+
+      label->offsetx = 0;
+      label->offsety = 0;
       label->angle = 0;
       label->position = MS_CC;
       if (label->type == MS_TRUETYPE) label->size = height;
       msDrawLabel(map, image_draw, marker, (char*)"Az", label,1.0);
+
       label->size = lsize;
       label->position = lpos;
       label->angle = langle;
+      label->offsetx = loffsetx;
+      label->offsety = loffsety;
     }
     break;
   case MS_LAYER_POINT: