[mapserver-commits] r7892 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2008-08-30 03:14:24 -0400 (Sat, 30 Aug 2008)
New Revision: 7892

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
Fix a label size computation for AGG bug when scalefactor is used (#2756)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-08-30 07:11:51 UTC (rev 7891)
+++ trunk/mapserver/HISTORY.TXT	2008-08-30 07:14:24 UTC (rev 7892)
@@ -11,6 +11,7 @@
 
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
+- Fix a label size computation for AGG bug when scalefactor is used (#2756)
 
 - various SOS updates for CITE compliance (#2646)
 

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2008-08-30 07:11:51 UTC (rev 7891)
+++ trunk/mapserver/mapagg.cpp	2008-08-30 07:14:24 UTC (rev 7892)
@@ -2044,7 +2044,7 @@
             msSetError(MS_TTFERR, "Requested font (%s) not found.", "msGetLabelSizeAGG()", label->font);
             return MS_FAILURE;
         }
-        if (ren->getLabelSize(string, font, label->size, rect) != MS_SUCCESS)
+        if (ren->getLabelSize(string, font, size, rect) != MS_SUCCESS)
             return MS_FAILURE;
         if (adjustBaseline) {
             label->offsety += MS_NINT(((rect->miny+rect->maxy) + size) / 2);