Changeset 715 for trunk

Timestamp:

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

Author:

tom

Message:

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

Location:

trunk

Files:

• include/mapnik/cairo_renderer.hpp (modified) (2 diffs)
• include/mapnik/font_engine_freetype.hpp (modified) (7 diffs)
• src/cairo_renderer.cpp (modified) (12 diffs)

trunk/include/mapnik/cairo_renderer.hpp

@@ -51 +51 @@
    {
      public:
-      cairo_face_manager(void);
-      cairo_face_ptr get_face(std::string const& name);
+      cairo_face_manager(boost::shared_ptr<freetype_engine> engine,
+                         face_manager<freetype_engine> & manager);
+      cairo_face_ptr get_face(face_ptr face);
 
      private:
-      typedef std::map<std::string,cairo_face_ptr> cairo_face_cache;
+      typedef std::map<face_ptr,cairo_face_ptr> cairo_face_cache;
       boost::shared_ptr<freetype_engine> font_engine_;
-      face_manager<freetype_engine> font_manager_;
+      face_manager<freetype_engine> & font_manager_;
       cairo_face_cache cache_;
    };
@@ -108 +109 @@
       Cairo::RefPtr<Cairo::Context> context_;
       CoordTransform t_;
+      boost::shared_ptr<freetype_engine> font_engine_;
+      face_manager<freetype_engine> font_manager_;
       cairo_face_manager face_manager_;
       label_collision_detector4 detector_;

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 ); 

trunk/src/cairo_renderer.cpp

@@ -141 +141 @@
          }
 
-         void get_string_info(unsigned size, string_info & info)
-         {
-            face_->set_pixel_sizes(size);
-            face_->get_string_info(info);
-         }
-
-         unsigned get_char(unsigned c) const
-         {
-            return face_->get_char(c);
-         }
-
       private:
          class handle
@@ -176 +165 @@
    };
 
-   cairo_face_manager::cairo_face_manager(void)
-      : font_engine_(new freetype_engine()),
-        font_manager_(*font_engine_)
-   {
-   }
-
-   cairo_face_ptr cairo_face_manager::get_face(std::string const& name)
-   {
-      cairo_face_cache::iterator itr = cache_.find(name);
+   cairo_face_manager::cairo_face_manager(boost::shared_ptr<freetype_engine> engine,
+                                          face_manager<freetype_engine> & manager)
+      : font_engine_(engine),
+        font_manager_(manager)
+   {
+   }
+
+   cairo_face_ptr cairo_face_manager::get_face(face_ptr face)
+   {
+      cairo_face_cache::iterator itr = cache_.find(face);
       cairo_face_ptr entry;
 
@@ -193 +183 @@
       else
       {
-         face_ptr face = font_manager_.get_face(name);
-
-         if (face)
-         {
-            entry = cairo_face_ptr(new cairo_face(font_engine_, face));
-
-            cache_.insert(std::make_pair(name, entry));
-         }
+         entry = cairo_face_ptr(new cairo_face(font_engine_, face));
+
+         cache_.insert(std::make_pair(face, entry));
       }
 
@@ -360 +345 @@
          }
 
-         void set_font_face(cairo_face_ptr const& face)
-         {
-            context_->set_font_face(face->face());
+         void set_font_face(cairo_face_manager & manager, face_ptr face)
+         {
+            context_->set_font_face(manager.get_face(face)->face());
          }
 
@@ -400 +385 @@
          }
 
-         void add_text(text_symbolizer const& sym, text_path & path, cairo_face_ptr const& face)
+         void add_text(text_symbolizer const& sym, text_path & path,
+                       cairo_face_manager & manager,
+                       face_set_ptr const& faces)
          {
             unsigned text_size = sym.get_text_size();
@@ -415 +402 @@
                path.vertex(&c, &x, &y, &angle);
 
-               Cairo::Matrix matrix;
-
-               matrix.xx = text_size * cos(angle);
-               matrix.xy = text_size * sin(angle);
-               matrix.yx = text_size * -sin(angle);
-               matrix.yy = text_size * cos(angle);
-               matrix.x0 = 0;
-               matrix.y0 = 0;
-
-               set_font_matrix(matrix);
-               glyph_path(face->get_char(c), sx + x, sy - y);
+               glyph_ptr glyph = faces->get_glyph(c);
+ 
+               if (glyph)
+               {
+                  Cairo::Matrix matrix;
+
+                  matrix.xx = text_size * cos(angle);
+                  matrix.xy = text_size * sin(angle);
+                  matrix.yx = text_size * -sin(angle);
+                  matrix.yy = text_size * cos(angle);
+                  matrix.x0 = 0;
+                  matrix.y0 = 0;
+
+                  set_font_matrix(matrix);
+
+                  set_font_face(manager, glyph->get_face());
+
+                  glyph_path(glyph->get_index(), sx + x, sy - y);
+               }
             }
 
@@ -444 +439 @@
                path.vertex(&c, &x, &y, &angle);
 
-               Cairo::Matrix matrix;
-
-               matrix.xx = text_size * cos(angle);
-               matrix.xy = text_size * sin(angle);
-               matrix.yx = text_size * -sin(angle);
-               matrix.yy = text_size * cos(angle);
-               matrix.x0 = 0;
-               matrix.y0 = 0;
-
-               set_font_matrix(matrix);
-               show_glyph(face->get_char(c), sx + x, sy - y);
+               glyph_ptr glyph = faces->get_glyph(c);
+ 
+               if (glyph)
+               {
+                  Cairo::Matrix matrix;
+
+                  matrix.xx = text_size * cos(angle);
+                  matrix.xy = text_size * sin(angle);
+                  matrix.yx = text_size * -sin(angle);
+                  matrix.yy = text_size * cos(angle);
+                  matrix.x0 = 0;
+                  matrix.y0 = 0;
+
+                  set_font_matrix(matrix);
+
+                  set_font_face(manager, glyph->get_face());
+
+                  show_glyph(glyph->get_index(), sx + x, sy - y);
+               }
             }
          }
@@ -470 +473 @@
         context_(Cairo::Context::create(surface)),
         t_(m.getWidth(),m.getHeight(),m.getCurrentExtent(),offset_x,offset_y),
+        font_engine_(new freetype_engine()),
+        font_manager_(*font_engine_),
+        face_manager_(font_engine_,font_manager_),
         detector_(Envelope<double>(-64 ,-64, m.getWidth() + 64 ,m.getHeight() + 64))
    {
@@ -761 +767 @@
       if (text.length() > 0 && data)
       {
-         cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
-
-         if (face)
+         face_set_ptr faces;
+
+         if (sym.get_fontset().size() > 0)
+         {
+            faces = font_manager_.get_face_set(sym.get_fontset());
+         }
+         else 
+         {
+            faces = font_manager_.get_face_set(sym.get_face_name());
+         }
+
+         if (faces->size() > 0)
          {
             cairo_context context(context_);
-
-            context.set_font_face(face);
-
             string_info info(text);
 
-            face->get_string_info(sym.get_text_size(), info);
+            faces->set_pixel_sizes(sym.get_text_size());
+            faces->get_string_info(info);
 
             placement_finder<label_collision_detector4> finder(detector_);
@@ -793 +806 @@
 
                      context.add_image(shield_x, shield_y, *data);
-                     context.add_text(sym, text_placement.placements[ii], face);
+                     context.add_text(sym, text_placement.placements[ii], face_manager_, faces);
                   }
                }
@@ -932 +945 @@
       if (text.length() > 0)
       {
-         cairo_face_ptr face = face_manager_.get_face(sym.get_face_name());
-
-         if (face)
+         face_set_ptr faces;
+
+         if (sym.get_fontset().size() > 0)
+         {
+            faces = font_manager_.get_face_set(sym.get_fontset());
+         }
+         else 
+         {
+            faces = font_manager_.get_face_set(sym.get_face_name());
+         }
+
+         if (faces->size() > 0)
          {
             cairo_context context(context_);
-
-            context.set_font_face(face);
-
             string_info info(text);
 
-            face->get_string_info(sym.get_text_size(), info);
+            faces->set_pixel_sizes(sym.get_text_size());
+            faces->get_string_info(info);
 
             placement_finder<label_collision_detector4> finder(detector_);
@@ -971 +991 @@
                   for (unsigned int ii = 0; ii < text_placement.placements.size(); ++ii)
                   {
-                     context.add_text(sym, text_placement.placements[ii], face);
+                     context.add_text(sym, text_placement.placements[ii], face_manager_, faces);
                   }
                }