diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-03-04 21:54:38 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-03-04 21:54:38 +0000 |
| commit | 91b1b6cec4776d8c2e48b54e16d698abcea6bbfe (patch) | |
| tree | 1e5a2dbb736ad7cd51cbb4ef46644b92f784deed /src/libnrtype | |
| parent | Fix for invisible blured clone elements in PDF export. (diff) | |
| download | inkscape-91b1b6cec4776d8c2e48b54e16d698abcea6bbfe.tar.gz inkscape-91b1b6cec4776d8c2e48b54e16d698abcea6bbfe.zip | |
Clean up the unordered containers fix.
(bzr r9142)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 18 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 33 |
2 files changed, 21 insertions, 30 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 8ab2ee696..06fb93f2d 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -10,25 +10,19 @@ #define PANGO_ENABLE_ENGINE -#include "FontFactory.h" -#include <libnrtype/font-instance.h> - -#include <glibmm.h> - - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <glibmm.h> #include <glib/gmem.h> #include <glibmm/i18n.h> // _() +#include <pango/pangoft2.h> +#include "libnrtype/FontFactory.h" +#include "libnrtype/font-instance.h" +#include "util/unordered-containers.h" -/* Freetype2 */ -# include <pango/pangoft2.h> - -#include "util/set-types.h" - -typedef optim_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; +typedef INK_UNORDERED_MAP<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; // need to avoid using the size field size_t font_descr_hash::operator()( PangoFontDescription *const &x) const { diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 61cd28190..be5eb86c8 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -11,25 +11,22 @@ #define PANGO_ENABLE_ENGINE #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" #endif -#include <libnr/nr-rect.h> -#include <libnrtype/font-glyph.h> -#include <libnrtype/font-instance.h> -#include <2geom/pathvector.h> -#include <livarot/Path.h> - -#include "RasterFont.h" -/* Freetype 2 */ -# include <ft2build.h> -# include FT_OUTLINE_H -# include FT_BBOX_H -# include FT_TRUETYPE_TAGS_H -# include FT_TRUETYPE_TABLES_H -# include <pango/pangoft2.h> - -#include "util/set-types.h" +#include <ft2build.h> +#include FT_OUTLINE_H +#include FT_BBOX_H +#include FT_TRUETYPE_TAGS_H +#include FT_TRUETYPE_TABLES_H +#include <pango/pangoft2.h> +#include <2geom/pathvector.h> +#include "libnr/nr-rect.h" +#include "libnrtype/font-glyph.h" +#include "libnrtype/font-instance.h" +#include "libnrtype/RasterFont.h" +#include "livarot/Path.h" +#include "util/unordered-containers.h" struct font_style_hash : public std::unary_function<font_style, size_t> { @@ -40,7 +37,7 @@ struct font_style_equal : public std::binary_function<font_style, font_style, bo bool operator()(font_style const &a, font_style const &b) const; }; -typedef optim_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; +typedef INK_UNORDERED_MAP<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; |