[mapserver-commits] r8827 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-03-26 00:32:25 -0400 (Thu, 26 Mar 2009)
New Revision: 8827

Modified:
   branches/branch-5-2/mapserver/mapagg.cpp
Log:
Fixed (I believe) issue with placement of ttf glyphs related to ticket #2848.

Modified: branches/branch-5-2/mapserver/mapagg.cpp
===================================================================
--- branches/branch-5-2/mapserver/mapagg.cpp	2009-03-26 03:09:48 UTC (rev 8826)
+++ branches/branch-5-2/mapserver/mapagg.cpp	2009-03-26 04:32:25 UTC (rev 8827)
@@ -748,7 +748,13 @@
         ras_aa.filling_rule(agg::fill_non_zero);
         const agg::glyph_cache* glyph;
         int unicode;
-        
+
+        m_feng.hinting(true);
+        m_feng.height(size);
+        m_feng.resolution(96);
+        m_feng.flip_y(true);
+        font_curve_type m_curves(m_fman.path_adaptor());
+                
         double ox = 0, oy = 0;
 		if (isMarker) {
 			//is we're rendering a marker symbol, it has to be centered
@@ -770,15 +776,6 @@
 		mtx *= agg::trans_affine_translation(x - ox, y - oy);
 
 
-
-        m_feng.hinting(true);
-        m_feng.height(size);
-        m_feng.resolution(96);
-        m_feng.flip_y(true);
-        font_curve_type m_curves(m_fman.path_adaptor());
-        
-
-
         double fx=x,fy=y;
         const char *utfptr=thechars;
         agg::path_storage glyphs;