Changeset 715 for trunk/include/mapnik/cairo_renderer.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/cairo_renderer.hpp (modified) (2 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_;