diff options
| author | St??phane Gimenez <dev@gim.name> | 2006-12-02 13:33:58 +0000 |
|---|---|---|
| committer | sgimenez <sgimenez@users.sourceforge.net> | 2006-12-02 13:33:58 +0000 |
| commit | cdfd4aeecebdcb1efc9f5d88e2e389e9e0bc5376 (patch) | |
| tree | 7e3eff0d42ae5082fef6454c943d087ad4027c90 /src | |
| parent | open window ON-screen (diff) | |
| download | inkscape-cdfd4aeecebdcb1efc9f5d88e2e389e9e0bc5376.tar.gz inkscape-cdfd4aeecebdcb1efc9f5d88e2e389e9e0bc5376.zip | |
fix for bug #1600900, freetype internals must not be used.
but, the replacement "FT_Get_X11_Font_Format" is still a hack,
headers says:
"It should only be used by the FreeType 2 font backend of
the XFree86 font server."
(bzr r2060)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/ps.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp index 1301e888a..6392c33d8 100644 --- a/src/extension/internal/ps.cpp +++ b/src/extension/internal/ps.cpp @@ -64,7 +64,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/internal/ftobjs.h> +#include <freetype/ftxf86.h> #include <pango/pangoft2.h> #include <string> #include <iostream> @@ -928,7 +928,7 @@ PrintPS::embed_t1 (SVGOStringStream &os, font_instance* font) { //check font type FT_Face font_face = pango_ft2_font_get_face(font->pFont); - const FT_String* font_type = FT_MODULE_CLASS(font_face->driver)->module_name; + const FT_String* font_type = FT_Get_X11_Font_Format(font_face); g_return_val_if_fail (_fontTypesMap[font_type] == FONT_TYPE1, false); //get font filename, stream to font file and size FT_Stream font_stream = font_face->stream; @@ -1150,7 +1150,7 @@ bool PrintPS::embed_font(SVGOStringStream &os, font_instance* font) //Hinted at by a comment in libgnomeprint/fcpattern_to_gp_font_entry() //Determining the font type in the "Pango way" FT_Face font_face = pango_ft2_font_get_face(font->pFont); - const FT_String* font_type = FT_MODULE_CLASS(font_face->driver)->module_name; + const FT_String* font_type = FT_Get_X11_Font_Format(font_face); /** * Possible values of "font_type" variable, not supported (font types): |