Changeset 702

Timestamp:

06/29/08 06:56:29 (2 months ago)

Author:

artem

Message:

reverting back to 700

Location:

trunk

Files:

• include/mapnik/font_engine_freetype.hpp (modified) (12 diffs)
• include/mapnik/image_view.hpp (modified) (2 diffs)
• include/mapnik/map.hpp (modified) (4 diffs)
• include/mapnik/octree.hpp (modified) (1 diff)
• include/mapnik/png_io.hpp (modified) (1 diff)
• include/mapnik/text_symbolizer.hpp (modified) (4 diffs)
• src/SConscript (modified) (1 diff)

trunk/include/mapnik/font_engine_freetype.hpp

@@ -31 +31 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/text_path.hpp>
-#include <mapnik/font_set.hpp>
 
 // freetype2
@@ -63 +62 @@
     {
     public:
-        font_face(FT_Face face)
+        typedef std::pair<unsigned,unsigned> dimension_t;
+
+        font_face(FT_Face face)
             : face_(face) {}
         
@@ -104 +105 @@
         }
               
-        ~font_face()
-        {
-#ifdef MAPNIK_DEBUG
-            std::clog << "~font_face: Clean up face \"" << family_name()
-                << " " << style_name() << "\"" << std::endl;
-#endif
-            FT_Done_Face(face_);
-        }
-        
-    private:
-        FT_Face face_;
-    };
-    
-    typedef boost::shared_ptr<font_face> face_ptr;
-   
-    class MAPNIK_DECL freetype_engine  // : public mapnik::singleton<freetype_engine,mapnik::CreateStatic>,
-         // private boost::noncopyable
-    {
-       // friend class mapnik::CreateStatic<freetype_engine>;
-      public:
-        static bool register_font(std::string const& file_name);
-        static std::vector<std::string> face_names ();
-        face_ptr create_face(std::string const& family_name);
-        virtual ~freetype_engine();
-        freetype_engine();
-      private:
-        FT_Library library_;
-        static boost::mutex mutex_;
-        static std::map<std::string,std::string> name2file_;
-    }; 
-    
-    template <typename T>
-    class MAPNIK_DECL face_manager : private boost::noncopyable
-    {
-        typedef T font_engine_type;
-        typedef std::map<std::string,face_ptr> faces;
-        
-    public:
-        face_manager(T & engine)
-           : engine_(engine) {}
-        
-        face_ptr get_face(std::string const& name)
-        {
-            typename faces::iterator itr;
-            itr = faces_.find(name);
-            if (itr != faces_.end())
-            {
-                return itr->second;
-            }
-            else
-            {
-                face_ptr face = engine_.create_face(name);
-                if (face)
-                {
-                    faces_.insert(make_pair(name,face));
-                }
-                return face;    
-            }
-        }
-    private:
-        faces faces_;
-        font_engine_type & engine_;
-    };
-        
-    template <typename T>
-    struct text_renderer : private boost::noncopyable
-    {
-        typedef std::pair<unsigned,unsigned> dimension_t;
-        
-        struct glyph_t : boost::noncopyable
-        {
-            FT_Glyph image;
-            glyph_t(FT_Glyph image_) : image(image_) {}
-            ~glyph_t () { FT_Done_Glyph(image);}
-        };
-        
-        typedef boost::ptr_vector<glyph_t> glyphs_t;
-        typedef T pixmap_type;
-        
-        text_renderer (pixmap_type & pixmap, std::vector<face_ptr> faces)
-            : pixmap_(pixmap),
-              faces_(faces),
-              fill_(0,0,0), 
-              halo_fill_(255,255,255),
-              halo_radius_(0) {}
-
         dimension_t character_dimensions(const unsigned c)
         {
@@ -196 +111 @@
             FT_Error  error;
             
+            FT_GlyphSlot slot = face_->glyph;
+            
             pen.x = 0;
             pen.y = 0;
@@ -201 +118 @@
             FT_BBox glyph_bbox; 
             FT_Glyph image;
-                    
-            FT_Face face = (*faces_.begin())->get_face();
-            
-            FT_UInt glyph_index = FT_Get_Char_Index(face, c);
-                 
-            // If there's no glyph_index we loop through the remaining fonts
-            // in the fontset looking for one.
-            if (!glyph_index) {
-                std::vector<face_ptr>::iterator itr = faces_.begin();
-                std::vector<face_ptr>::iterator end = faces_.end();
-                
-                ++itr; // Skip the first one, we already tried it.
-                
-                for (; itr != end; ++itr)
-                {
-                    FT_Face f = (*itr)->get_face();
-                    
-                    glyph_index = FT_Get_Char_Index(f, c);
-
-                    if (glyph_index) {
-                        face = f;
-                        break;
-                    }
-                }
-            }
-
+            
             matrix.xx = (FT_Fixed)( 1 * 0x10000L ); 
             matrix.xy = (FT_Fixed)( 0 * 0x10000L ); 
             matrix.yx = (FT_Fixed)( 0 * 0x10000L ); 
             matrix.yy = (FT_Fixed)( 1 * 0x10000L );
-            
-            FT_Set_Transform(face, &matrix, &pen);
-
-            error = FT_Load_Glyph (face, glyph_index, FT_LOAD_NO_HINTING); 
+                    
+            FT_Set_Transform (face_,&matrix,&pen);
+            
+            FT_UInt glyph_index = FT_Get_Char_Index( face_, c);
+            
+            error = FT_Load_Glyph (face_,glyph_index,FT_LOAD_NO_HINTING); 
             if ( error )
                 return dimension_t(0, 0);
             
-            error = FT_Get_Glyph(face->glyph, &image);
+            error = FT_Get_Glyph( face_->glyph, &image);
             if ( error )
                 return dimension_t(0, 0);
-
-            FT_Glyph_Get_CBox(image, ft_glyph_bbox_pixels, &glyph_bbox); 
-            FT_Done_Glyph(image);
-
-            unsigned tempx = face->glyph->advance.x >> 6;
-            unsigned tempy = glyph_bbox.yMax - glyph_bbox.yMin;
-
-            //std::clog << "glyph: " << glyph_index << " x: " << tempx << " y: " << tempy << std::endl;
-
-            return dimension_t(tempx, tempy);
+            
+            FT_Glyph_Get_CBox(image,ft_glyph_bbox_pixels, &glyph_bbox); 
+            FT_Done_Glyph(image); 
+            return dimension_t(slot->advance.x >> 6, glyph_bbox.yMax - glyph_bbox.yMin);
         }
         
@@ -300 +188 @@
                         if ( *arabic.getBuffer() >= 0x0600 && *arabic.getBuffer() <= 0x06ff)
                         {
+                            
                            UnicodeString shaped;
                            u_shapeArabic(arabic.getBuffer(),arabic.length(),shaped.getBuffer(arabic.length()),arabic.length(),
@@ -327 +216 @@
             info.set_dimensions(width, height);
         }
-
+        
+        ~font_face()
+        {
+#ifdef MAPNIK_DEBUG
+            std::clog << "clean up face:" << family_name()<<":" << style_name() << std::endl;
+#endif
+            FT_Done_Face(face_);
+        }
+        
+    private:
+        FT_Face face_;
+    };
+    
+   typedef boost::shared_ptr<font_face> face_ptr;
+   class MAPNIK_DECL freetype_engine  // : public mapnik::singleton<freetype_engine,mapnik::CreateStatic>,
+         // private boost::noncopyable
+    {
+       // friend class mapnik::CreateStatic<freetype_engine>;
+      public:
+        static bool register_font(std::string const& file_name);
+        static std::vector<std::string> face_names ();
+        face_ptr create_face(std::string const& family_name);
+        virtual ~freetype_engine();
+        freetype_engine();
+      private:
+        FT_Library library_;
+        static boost::mutex mutex_;
+        static std::map<std::string,std::string> name2file_;
+    }; 
+    
+    template <typename T>
+    class MAPNIK_DECL face_manager : private boost::noncopyable
+    {
+        typedef T font_engine_type;
+        typedef std::map<std::string,face_ptr> faces;
+        
+    public:
+        face_manager(T & engine)
+           : engine_(engine) {}
+        
+        face_ptr get_face(std::string const& name)
+        {
+            typename faces::iterator itr;
+            itr = faces_.find(name);
+            if (itr != faces_.end())
+            {
+                return itr->second;
+            }
+            else
+            {
+                face_ptr face = engine_.create_face(name);
+                if (face)
+                {
+                    faces_.insert(make_pair(name,face));
+                }
+                return face;    
+            }
+        }
+    private:
+        faces faces_;
+        font_engine_type & engine_;
+    };
+        
+    template <typename T>
+    struct text_renderer : private boost::noncopyable
+    {
+        struct glyph_t : boost::noncopyable
+        {
+            FT_Glyph image;
+            glyph_t(FT_Glyph image_) : image(image_) {}
+            ~glyph_t () { FT_Done_Glyph(image);}
+        };
+        
+        typedef boost::ptr_vector<glyph_t> glyphs_t;
+        typedef T pixmap_type;
+        
+        text_renderer (pixmap_type & pixmap, face_ptr face)
+            : pixmap_(pixmap),
+              face_(face),
+              fill_(0,0,0), 
+              halo_fill_(255,255,255),
+              halo_radius_(0) {}
+    
         void set_pixel_size(unsigned size)
         {
-            std::vector<face_ptr>::iterator itr = faces_.begin();
-            std::vector<face_ptr>::iterator end = faces_.end();
-            for (; itr != end; ++itr)
-            {
-                (*itr)->set_pixel_sizes(size);
-            }
+            face_->set_pixel_sizes(size);
         }
     
@@ -361 +327 @@
             FT_Vector pen;
             FT_Error  error;
-
+            
+            FT_Face face = face_->get_face();
+            //            FT_GlyphSlot slot = face->glyph;
+            
             FT_BBox bbox;   
-            bbox.xMin = bbox.yMin = 32000;  // Initialize these so we can tell if we
-            bbox.xMax = bbox.yMax = -32000; // properly grew the bbox later
-            
-            std::vector<face_ptr>::iterator end = faces_.end();
-            
+            bbox.xMin = bbox.yMin = 32000; 
+            bbox.xMax = bbox.yMax = -32000; //hmm?? 
+            
             for (int i = 0; i < path->num_nodes(); i++) 
             {
                 int c;
                 double x, y, angle;
-
+                
                 path->vertex(&c, &x, &y, &angle);
-
-#ifdef MAPNIK_DEBUG
-                // TODO Enable when we have support for setting verbosity
-                //std::clog << "prepare_glyphs: " << c << "," << x << 
-                //    "," << y << "," << angle << std::endl;
-#endif
+//                std::clog << "   prepare_glyph: " << (unsigned char)c << "," << x << "," << y << "," << angle << std::endl;
+
 
                 FT_BBox glyph_bbox; 
@@ -387 +350 @@
                 pen.y = int(y * 64);
                         
-                FT_Face face = (*faces_.begin())->get_face();
-
-                FT_UInt glyph_index = FT_Get_Char_Index(face, unsigned(c));
-                     
-                // If there's no glyph_index we loop through the remaining fonts
-                // in the fontset looking for one.
-                if (!glyph_index) {
-                    std::vector<face_ptr>::iterator itr = faces_.begin();
-                    ++itr; // Skip the first one, we already tried it.
-                    
-                    for (; itr != end; ++itr)
-                    {
-#ifdef MAPNIK_DEBUG
-                        // TODO Enable when we have support for setting verbosity
-                        //std::clog << "prepare_glyphs: Falling back to font named \""
-                        //    << (*itr)->family_name() << " " << (*itr)->style_name()
-                        //    << "\"" << std::endl;
-#endif
-
-                        FT_Face f = (*itr)->get_face();
-                        
-                        glyph_index = FT_Get_Char_Index(f, unsigned(c));
-
-                        if (glyph_index) {
-                            face = f;
-                            break;
-                        }
-                    }
-
-#ifdef MAPNIK_DEBUG
-                    // TODO Enable when we have support for setting verbosity
-                    //if (!glyph_index) {
-                    //    std::clog << "prepare_glyphs: Failed to fall back, glyph "
-                    //        << c << " not found in any font." << std::endl;
-                    //}
-#endif
-                }
-
                 matrix.xx = (FT_Fixed)( cos( angle ) * 0x10000L ); 
                 matrix.xy = (FT_Fixed)(-sin( angle ) * 0x10000L ); 
                 matrix.yx = (FT_Fixed)( sin( angle ) * 0x10000L ); 
                 matrix.yy = (FT_Fixed)( cos( angle ) * 0x10000L );
-
-                FT_Set_Transform(face, &matrix, &pen);
-
-                error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_HINTING); 
+                
+                FT_Set_Transform (face,&matrix,&pen);
+                
+                FT_UInt glyph_index = FT_Get_Char_Index( face, unsigned(c));
+                
+                error = FT_Load_Glyph (face,glyph_index, FT_LOAD_NO_HINTING); 
                 if ( error )
                     continue;
-
-                error = FT_Get_Glyph(face->glyph, &image);
+                
+                error = FT_Get_Glyph( face->glyph, &image);
                 if ( error )
                     continue;
-
+                
                 FT_Glyph_Get_CBox(image,ft_glyph_bbox_pixels, &glyph_bbox); 
                 if (glyph_bbox.xMin < bbox.xMin) 
@@ -449 +376 @@
                 if (glyph_bbox.yMax > bbox.yMax) 
                     bbox.yMax = glyph_bbox.yMax;
-        
-                // Check if we properly grew the bbox
+                
                 if ( bbox.xMin > bbox.xMax )
                 {
@@ -559 +485 @@
     
         pixmap_type & pixmap_;
-        std::vector<face_ptr> faces_;
+        face_ptr face_;
         mapnik::Color fill_;
         mapnik::Color halo_fill_;
@@ -569 +495 @@
 }
 
+
 #endif // FONT_ENGINE_FREETYPE_HPP

trunk/include/mapnik/image_view.hpp

@@ -81 +81 @@
             return width_;
          }
-         
          inline unsigned height() const
          {
@@ -91 +90 @@
             return data_.getRow(row + y_) + x_;
          }
-         
          inline T& data()
          {
             return data_;
          }
-      
          inline T const& data() const
          {
             return data_;
          }
-         
+          
       private:
          unsigned x_;

trunk/include/mapnik/map.hpp

@@ -38 +38 @@
     class MAPNIK_DECL Map
     {   
-    public:
-
-        enum aspect_fix_mode 
-        {
-            /* grow the width or height of the specified geo bbox to fill the map size. default behaviour. */
-            GROW_BBOX,
-            /* grow the width or height of the map to accomodate the specified geo bbox. */
-            GROW_CANVAS,
-            /* shrink the width or height of the specified geo bbox to fill the map size. */
-            SHRINK_BBOX,
-            /* shrink the width or height of the map to accomodate the specified geo bbox. */
-            SHRINK_CANVAS,
-            /* adjust the width of the specified geo bbox, leave height and map size unchanged */
-            ADJUST_BBOX_WIDTH,
-            /* adjust the height of the specified geo bbox, leave width and map size unchanged */
-            ADJUST_BBOX_HEIGHT,
-            /* adjust the width of the map, leave height and geo bbox unchanged */
-            ADJUST_CANVAS_WIDTH,
-            /* adjust the height of the map, leave width and geo bbox unchanged */
-            ADJUST_CANVAS_HEIGHT
-        };
-    private:
         static const unsigned MIN_MAPSIZE=16;
         static const unsigned MAX_MAPSIZE=MIN_MAPSIZE<<10;
@@ -67 +45 @@
         boost::optional<Color> background_;
         std::map<std::string,feature_type_style> styles_;
-        std::map<std::string,FontSet> fontsets_;
         std::vector<Layer> layers_;
         Envelope<double> currentExtent_;
-        aspect_fix_mode aspectFixMode_;
         
     public:
-
         typedef std::map<std::string,feature_type_style>::const_iterator const_style_iterator;
         typedef std::map<std::string,feature_type_style>::iterator style_iterator;
@@ -155 +130 @@
         feature_type_style const& find_style(std::string const& name) const;
 
-        /*! \brief Insert a fontset into the map.
-         *  @param name The name of the fontset.
-         *  @param style The fontset to insert.
-         *  @return true If success.
-         *  @return false If failure.
-         */
-        bool insert_fontset(std::string const& name, FontSet const& fontset);
-       
-        /*! \brief Find a fontset.
-         *  @param name The name of the fontset.
-         *  @return The fontset if found. If not found return the default map fontset.
-         */
-        FontSet const& find_fontset(std::string const& name) const;
-
         /*! \brief Get number of all layers.
          */
@@ -283 +244 @@
         featureset_ptr query_map_point(unsigned index, double x, double y) const;
         ~Map();
-
-        void setAspectFixMode(aspect_fix_mode afm) { aspectFixMode_ = afm; }
-        bool getAspectFixMode() { return aspectFixMode_; }
-
     private:
         void fixAspectRatio();

trunk/include/mapnik/octree.hpp

@@ -25 +25 @@
 #define _OCTREE_HPP_
 
-#include <mapnik/global.hpp>
 #include <boost/format.hpp>
 #include <boost/utility.hpp>

trunk/include/mapnik/png_io.hpp

@@ -81 +81 @@
                    PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
       png_write_info(png_ptr, info_ptr);
-      
       for (unsigned i=0;i<image.height();i++)
       {
-        png_write_row(png_ptr,(png_bytep)image.getRow(i));
-      }
-      
+         png_write_row(png_ptr,(png_bytep)image.getRow(i));
+      }
+
       png_write_end(png_ptr, info_ptr);
       png_destroy_write_struct(&png_ptr, &info_ptr);

trunk/include/mapnik/text_symbolizer.hpp

@@ -28 +28 @@
 #include <mapnik/enumeration.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/font_set.hpp>
-#include <mapnik/graphics.hpp>
+#include <mapnik/graphics.hpp> 
 // boost
 #include <boost/tuple/tuple.hpp>
@@ -51 +50 @@
          text_symbolizer(std::string const& name,std::string const& face_name, 
                          unsigned size, Color const& fill);     
-         text_symbolizer(std::string const& name, unsigned size, Color const& fill);    
          text_symbolizer(text_symbolizer const& rhs);
          text_symbolizer& operator=(text_symbolizer const& rhs);
@@ -69 +67 @@
          unsigned get_text_size() const;
          std::string const& get_face_name() const;
-         void set_face_name(std::string face_name);
-         FontSet const& get_fontset() const;
-         void set_fontset(FontSet fontset);
          Color const& get_fill() const;
          void set_halo_fill(Color const& fill);
@@ -92 +87 @@
          std::string name_;
          std::string face_name_;
-         FontSet fontset_;
          unsigned size_;
          unsigned text_ratio_;

trunk/src/SConscript

@@ -48 +48 @@
     filter_factory.cpp
     font_engine_freetype.cpp
-    font_set.cpp
     graphics.cpp
     image_reader.cpp