Changeset 715 for trunk/include/mapnik/font_engine_freetype.hpp

Timestamp:

07/25/08 19:26:02 (6 months ago)

Author:

tom

Message:

Make the cairo renderer build again, with font fallback support now.

Files:

• trunk/include/mapnik/font_engine_freetype.hpp (modified) (7 diffs)

trunk/include/mapnik/font_engine_freetype.hpp

@@ -60 +60 @@
 namespace mapnik
 {
+    class font_face;
+       
+    typedef boost::shared_ptr<font_face> face_ptr;
+
     class MAPNIK_DECL font_glyph : private boost::noncopyable
     {
     public:
-        font_glyph(FT_Face face, unsigned index)
-            : face_(face), index_(index) {}
-
-        FT_Face get_face() const
+        font_glyph(face_ptr face, unsigned index)
+           : face_(face), index_(index) {}
+
+        face_ptr get_face() const
         {
             return face_;
@@ -76 +80 @@
         }
     private:
-        FT_Face face_;
+        face_ptr face_;
         unsigned index_;
     };
@@ -86 +90 @@
     public:
         font_face(FT_Face face)
-            : face_(face) {}
+           : face_(face) {}
         
         std::string  family_name() const
@@ -133 +137 @@
         FT_Face face_;
     };
-    
-    typedef boost::shared_ptr<font_face> face_ptr;
 
     class MAPNIK_DECL font_face_set : private boost::noncopyable
@@ -158 +160 @@
             for (std::vector<face_ptr>::const_iterator face = faces_.begin(); face != faces_.end(); ++face)
             {
-               FT_Face f = (*face)->get_face();
                FT_UInt g = (*face)->get_char(c);
 
-               if (g) return glyph_ptr(new font_glyph(f, g));
+               if (g) return glyph_ptr(new font_glyph(*face, g));
             }
 
@@ -180 +181 @@
 
             glyph_ptr glyph = get_glyph(c);
-            FT_Face face = glyph->get_face();
+            FT_Face face = glyph->get_face()->get_face();
 
             matrix.xx = (FT_Fixed)( 1 * 0x10000L ); 
@@ -442 +443 @@
                 
                 glyph_ptr glyph = faces_->get_glyph(unsigned(c));
-                FT_Face face = glyph->get_face();
+                FT_Face face = glyph->get_face()->get_face();
 
                 matrix.xx = (FT_Fixed)( cos( angle ) * 0x10000L );