Changeset 649 for trunk

Timestamp:

02/12/08 15:05:04 (9 months ago)

Author:

artem

Message:

pass parameter by reference
store reference to wstring in text_path

Location:

trunk

Files:

• include/mapnik/font_engine_freetype.hpp (modified) (1 diff)
• include/mapnik/text_path.hpp (modified) (2 diffs)
• src/agg_renderer.cpp (modified) (2 diffs)

trunk/include/mapnik/font_engine_freetype.hpp

@@ -308 +308 @@
         }
         
-        void get_string_info(string_info *info)
-        {
-            unsigned width = 0;
-            unsigned height = 0;
-
-            std::wstring text = info->get_string();
-
-            for (std::wstring::const_iterator i=text.begin();i!=text.end();++i)
-            {
+          void get_string_info(string_info & info)
+          {
+             unsigned width = 0;
+             unsigned height = 0;
+             
+             std::wstring const& text = info.get_string();
+            
+             for (std::wstring::const_iterator i=text.begin();i!=text.end();++i)
+             {
                 dimension_t char_dim = character_dimensions(*i);
-              
-                info->add_info(*i, char_dim.first, char_dim.second);
-              
+                
+                info.add_info(*i, char_dim.first, char_dim.second);
+                
                 width += char_dim.first;
                 height = char_dim.second > height ? char_dim.second : height;
                 
-            }
-            info->set_dimensions(width, height);
-        }
-        
+             }
+             info.set_dimensions(width, height);
+          }
+          
         void render(double x0, double y0)
         {

trunk/include/mapnik/text_path.hpp

@@ -51 +51 @@
       protected:
          typedef boost::ptr_vector<character_info> characters_t;
-         std::wstring string_;
          characters_t characters_;
-
+         std::wstring const& text_;
          double width_;
          double height_;
       public:
-         string_info(std::wstring string)
-            : string_(string),
+         string_info(std::wstring const& text)
+            : text_(text),
               width_(0),
               height_(0) {}
@@ -95 +94 @@
          std::wstring const&  get_string() const 
          {
-            return string_;
+           return text_;
          }
    };

trunk/src/agg_renderer.cpp

@@ -467 +467 @@
             ren.set_pixel_size(sym.get_text_size());
             ren.set_fill(sym.get_fill());
+            
             string_info info(text);
-            ren.get_string_info(&info);
+            ren.get_string_info(info);
             
             placement_finder<label_collision_detector4> finder(detector_);
@@ -682 +683 @@
            
             string_info info(text);
-            ren.get_string_info(&info);
+            ren.get_string_info(info);
             unsigned num_geom = feature.num_geometries();
             for (unsigned i=0;i<num_geom;++i)