Changeset 704 for trunk/src/agg_renderer.cpp

Timestamp:

06/29/08 06:58:48 (6 months ago)

Author:

artem

Message:

applied font fallback patch from Beau Gunderson

Files:

• trunk/src/agg_renderer.cpp (modified) (6 diffs)

trunk/src/agg_renderer.cpp

@@ -30 +30 @@
 #include <mapnik/arrow.hpp>
 #include <mapnik/config_error.hpp>
+#include <mapnik/font_set.hpp>
 
 // agg
@@ -281 +282 @@
                frame->move_to(itr->get<0>(),itr->get<1>());
                frame->line_to(itr->get<0>(),itr->get<1>()+height);   
-               
             }
             
@@ -311 +311 @@
             ren.color(agg::rgba8(r, g, b, int(255 * sym.get_opacity())));
             agg::render_scanlines(*ras_ptr, sl, ren);
-            
          }
       }
@@ -461 +460 @@
       if (text.length() > 0 && data)
       {
-         face_ptr face = font_manager_.get_face(sym.get_face_name());
-         if (face)
-         {
-            text_renderer<mapnik::Image32> ren(pixmap_,face);
+         std::vector<face_ptr> faces;
+                        
+         faces.push_back(font_manager_.get_face(sym.get_face_name()));
+         
+         if (faces.size() > 0)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_, faces);
+            
             ren.set_pixel_size(sym.get_text_size());
             ren.set_fill(sym.get_fill());
             
             string_info info(text);
-            face->get_string_info(info);
+
+            ren.get_string_info(info);
             
             placement_finder<label_collision_detector4> finder(detector_);
@@ -670 +674 @@
       if ( text.length() > 0 )
       {
-         Color const& fill  = sym.get_fill();
-         face_ptr face = font_manager_.get_face(sym.get_face_name());
-         if (face)
-         {
-            text_renderer<mapnik::Image32> ren(pixmap_,face);
+         Color const& fill = sym.get_fill();
+
+         std::vector<face_ptr> faces;
+    
+         FontSet fontset = sym.get_fontset();
+         std::vector<std::string> face_names = fontset.get_face_names();
+    
+         if (face_names.size() > 0)
+         {
+            std::vector<std::string>::iterator itr = face_names.begin();
+            std::vector<std::string>::iterator end = face_names.end();
+
+            for (; itr != end; ++itr)
+            {
+               faces.push_back(font_manager_.get_face(*itr));
+            }
+         }
+         else 
+         {
+            faces.push_back(font_manager_.get_face(sym.get_face_name()));
+         }
+     
+         if (faces.size() > 0)
+         {
+            text_renderer<mapnik::Image32> ren(pixmap_, faces);
             ren.set_pixel_size(sym.get_text_size());
             ren.set_fill(fill);
@@ -683 +707 @@
            
             string_info info(text);
-            face->get_string_info(info);
+            
+            ren.get_string_info(info);
             unsigned num_geom = feature.num_geometries();
             for (unsigned i=0;i<num_geom;++i)