diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-08-16 22:00:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-08-16 22:00:28 +0000 |
| commit | 2c1bc52c9d3429c34a26ad643eff8f84c339034e (patch) | |
| tree | f75461f1804c334783f86d3092204a70bf3cd86e /pango/pangoft2-private.h | |
| parent | c968ee2b826db913e4ccda3389009d1e2e9047df (diff) | |
| download | pango-2c1bc52c9d3429c34a26ad643eff8f84c339034e.tar.gz | |
Move the common code between PangoXftFontmap and PangoFT2Fontmap into a
Fri Aug 16 17:49:38 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.cI pango/pangoxft-fontmap.c
pango/pangoft2-fontmap.c pango/pangoxft-private.h
pango/pangoft2-private.h pango/pangoxft-font.c
pango/pangoft2.h: Move the common code between PangoXftFontmap
and PangoFT2Fontmap into a new file that is included from both
with appropriate #defines. This provides most of the
recent Xft backend improvements for the FT2 backend
as well.
Diffstat (limited to 'pango/pangoft2-private.h')
| -rw-r--r-- | pango/pangoft2-private.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index 2fe8f719..d8d20eae 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -55,8 +55,6 @@ typedef struct _PangoFT2Font PangoFT2Font; typedef struct _PangoFT2GlyphInfo PangoFT2GlyphInfo; -typedef struct _PangoFT2Face PangoFT2Face; -typedef struct _PangoFT2Family PangoFT2Family; struct _PangoFT2Font @@ -89,24 +87,11 @@ struct _PangoFT2GlyphInfo void *cached_glyph; }; -struct _PangoFT2Face -{ - PangoFontFace parent_instance; - - PangoFT2Family *family; - char *style; -}; - PangoFT2Font * _pango_ft2_font_new (PangoFontMap *font, FcPattern *pattern); PangoMap *_pango_ft2_get_shaper_map (PangoLanguage *language); -void _pango_ft2_font_map_set_coverage (PangoFontMap *fontmap, - const char *name, - PangoCoverage *coverage); PangoCoverage *_pango_ft2_font_map_get_coverage (PangoFontMap *fontmap, - const char *name); -void _pango_ft2_face_remove (PangoFT2Face *face, - PangoFont *font); + FcPattern *pattern); FT_Library _pango_ft2_font_map_get_library (PangoFontMap *fontmap); void _pango_ft2_font_map_cache_add (PangoFontMap *fontmap, PangoFT2Font *ft2font); |