diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-04 15:00:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-18 12:47:53 -0700 |
| commit | e32db1e971d80ec12d095b2180a9ebbcd8217317 (patch) | |
| tree | 3b51bf85371c313cb2882099fde3146e8df6a440 | |
| parent | dbd32b0c1ea5829c7ba9b4ed58451840ee896916 (diff) | |
| download | pango-e32db1e971d80ec12d095b2180a9ebbcd8217317.tar.gz | |
fc: Drop some gratitious use of FT types
| -rw-r--r-- | pango/pangofc-font.c | 14 | ||||
| -rw-r--r-- | pango/pangofc-private.h | 1 | ||||
| -rw-r--r-- | pango/pangoft2.c | 2 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 1 |
4 files changed, 3 insertions, 15 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 291c87c5..2bb57e0a 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -195,16 +195,8 @@ pattern_is_transformed (FcPattern *pattern) if (FcPatternGetMatrix (pattern, FC_MATRIX, 0, &fc_matrix) == FcResultMatch) { - FT_Matrix ft_matrix; - - ft_matrix.xx = 0x10000L * fc_matrix->xx; - ft_matrix.yy = 0x10000L * fc_matrix->yy; - ft_matrix.xy = 0x10000L * fc_matrix->xy; - ft_matrix.yx = 0x10000L * fc_matrix->yx; - - return ((ft_matrix.xy | ft_matrix.yx) != 0 || - ft_matrix.xx != 0x10000L || - ft_matrix.yy != 0x10000L); + return fc_matrix->xx != 1 || fc_matrix->xy != 0 || + fc_matrix->yx != 0 || fc_matrix->yy != 1; } else return FALSE; @@ -805,7 +797,6 @@ _pango_fc_font_set_font_key (PangoFcFont *fcfont, /** * pango_fc_font_get_raw_extents: * @fcfont: a #PangoFcFont - * @load_flags: flags to pass to FT_Load_Glyph() * @glyph: the glyph index to load * @ink_rect: (out) (optional): location to store ink extents of the * glyph, or %NULL @@ -826,7 +817,6 @@ _pango_fc_font_set_font_key (PangoFcFont *fcfont, **/ void pango_fc_font_get_raw_extents (PangoFcFont *fcfont, - FT_Int32 load_flags, PangoGlyph glyph, PangoRectangle *ink_rect, PangoRectangle *logical_rect) diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index 658d68fe..8d281ad8 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -70,7 +70,6 @@ void _pango_fc_font_set_font_key (PangoFcFont *fcfont, _PANGO_EXTERN void pango_fc_font_get_raw_extents (PangoFcFont *font, - FT_Int32 load_flags, PangoGlyph glyph, PangoRectangle *ink_rect, PangoRectangle *logical_rect); diff --git a/pango/pangoft2.c b/pango/pangoft2.c index a5ac6fc5..e2d5685f 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -309,7 +309,7 @@ pango_ft2_font_get_glyph_info (PangoFont *font, { info = g_slice_new0 (PangoFT2GlyphInfo); - pango_fc_font_get_raw_extents (fcfont, ft2font->load_flags, + pango_fc_font_get_raw_extents (fcfont, glyph, &info->ink_rect, &info->logical_rect); diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 91856304..2526b13d 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -331,7 +331,6 @@ get_glyph_extents_raw (PangoXftFont *xfont, extents = g_slice_new (Extents); pango_fc_font_get_raw_extents (PANGO_FC_FONT (xfont), - FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING, glyph, &extents->ink_rect, &extents->logical_rect); |