[mapserver-commits] r9398 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-10-07 11:57:01 -0400 (Wed, 07 Oct 2009)
New Revision: 9398

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
don't apply scalefactor to label outlines (#3157)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-07 14:52:45 UTC (rev 9397)
+++ trunk/mapserver/HISTORY.TXT	2009-10-07 15:57:01 UTC (rev 9398)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- don't apply scalefactor to label outlines (#3157)
+
 - update namespaces and schema pointers (#2872)
 
 - add RFC49 and RFC40 keywords to copy functions (#2865)

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2009-10-07 14:52:45 UTC (rev 9397)
+++ trunk/mapserver/mapagg.cpp	2009-10-07 15:57:01 UTC (rev 9398)
@@ -1981,7 +1981,7 @@
         size = label->size*scalefactor;
         size = MS_MAX(size, label->minsize);
         size = MS_MIN(size, label->maxsize);
-        outlinewidth = label->outlinewidth*scalefactor;
+        outlinewidth = label->outlinewidth;
         shadowsizex = label->shadowsizex*scalefactor;
         shadowsizey = label->shadowsizey*scalefactor;
 
@@ -2071,7 +2071,7 @@
         size = label->size*scalefactor;
         size = MS_MAX(size, label->minsize);
         size = MS_MIN(size, label->maxsize);
-        outlinewidth = label->outlinewidth*scalefactor;
+        outlinewidth = label->outlinewidth;
         shadowsizex = label->shadowsizex*scalefactor;
         shadowsizey = label->shadowsizey*scalefactor;