Removed duplication of menu items.

[inkscape.git] / src / libnrtype / RasterFont.h

diff --git a/src/libnrtype/RasterFont.h b/src/libnrtype/RasterFont.h
index 03665c69a736529cd622b3e510fe7cd90508be90..015121b421df838dac2cfd9232dcc3961d49c833 100644 (file)
--- a/src/libnrtype/RasterFont.h
+++ b/src/libnrtype/RasterFont.h
@@ -7,7 +7,7 @@
 #ifndef my_raster_font
 #define my_raster_font
 
-#include <ext/hash_map>
+#include <map>
 
 #include <libnr/nr-forward.h>
 #include <libnrtype/nrtype-forward.h>
@@ -22,7 +22,7 @@ public:
 
     font_style                    style;  
 
-    __gnu_cxx::hash_map<int,int>             glyph_id_to_raster_glyph_no;
+    std::map<int,int>             glyph_id_to_raster_glyph_no;
                // an array of glyphs in this rasterfont.
                // it's a bit redundant with the one in the daddy font_instance, but these glyphs
                // contains the real rasterization data
@@ -30,13 +30,13 @@ public:
     raster_glyph**                bases;
 
     explicit raster_font(font_style const &fstyle);
-    ~raster_font(void);
+    virtual ~raster_font(void);
    
     void                          Unref(void);
     void                          Ref(void);
 
                // utility functions
-    NR::Point      Advance(int glyph_id);
+    Geom::Point      Advance(int glyph_id);
     void           BBox(int glyph_id,NRRect *area);         
 
                // attempts to load a glyph and return a raster_glyph on which you can call Blit