[mapserver-commits] r8766 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2009-03-10 10:16:49 -0400 (Tue, 10 Mar 2009)
New Revision: 8766

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapagg.cpp
Log:
switch AGG renderer to use native outlining instead of copying the non-outlined glyphs (#1243)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-10 13:48:27 UTC (rev 8765)
+++ trunk/mapserver/HISTORY.TXT	2009-03-10 14:16:49 UTC (rev 8766)
@@ -11,6 +11,7 @@
 
 Current Version (SVN trunk):
 ----------------------------
+- AGG font outline method change (#1243)
 
 - Change mapbit.c bitmask type from char to new 32bit ms_bitarray (#2930)
 

Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp	2009-03-10 13:48:27 UTC (rev 8765)
+++ trunk/mapserver/mapagg.cpp	2009-03-10 14:16:49 UTC (rev 8766)
@@ -818,23 +818,9 @@
         if(outlinecolor.a) {
             ras_aa.reset();
             ras_aa.filling_rule(agg::fill_non_zero);
-            if(outlinewidth==1) {
-            //draw the text offset by one pixel in each direction (NW,W,SW,N,S,NE,E,SE)
-                for(int i=-1;i<=1;i++) {
-                    for(int j=-1;j<=1;j++) {
-                        if(i||j) {
-                            agg::trans_affine_translation tr(i,j);
-                            agg::conv_transform<agg::path_storage, agg::trans_affine> tglyphs(glyphs,tr);
-                            ras_aa.add_path(tglyphs);
-                        }
-                    }
-                }
-            }
-            else {
-                agg::conv_contour<agg::path_storage> cc(glyphs);
-                cc.width(outlinewidth);
-                ras_aa.add_path(cc);
-            }
+            agg::conv_contour<agg::path_storage> cc(glyphs);
+            cc.width(outlinewidth);
+            ras_aa.add_path(cc);
             ren_aa.color(outlinecolor);
             agg::render_scanlines(ras_aa, sl_line, ren_aa);
         }