[pango/kill-ft-face] Drop some gratitious use of FT types
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/kill-ft-face] Drop some gratitious use of FT types
- Date: Thu, 4 Jul 2019 15:20:50 +0000 (UTC)
commit a6a382acc592443fcb955ee5ca21eabaa79b9cac
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 4 15:00:23 2019 +0000
Drop some gratitious use of FT types
pango/pangofc-font.c | 14 +++-----------
pango/pangofc-private.h | 2 +-
2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 1ad08401..9814a5e1 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -189,16 +189,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;
@@ -807,7 +799,7 @@ _pango_fc_font_set_font_key (PangoFcFont *fcfont,
**/
void
pango_fc_font_get_raw_extents (PangoFcFont *fcfont,
- FT_Int32 load_flags,
+ int load_flags,
PangoGlyph glyph,
PangoRectangle *ink_rect,
PangoRectangle *logical_rect)
diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h
index f3987044..629289f0 100644
--- a/pango/pangofc-private.h
+++ b/pango/pangofc-private.h
@@ -70,7 +70,7 @@ void _pango_fc_font_set_font_key (PangoFcFont *fcfont,
_PANGO_EXTERN
void pango_fc_font_get_raw_extents (PangoFcFont *font,
- FT_Int32 load_flags,
+ int load_flags,
PangoGlyph glyph,
PangoRectangle *ink_rect,
PangoRectangle *logical_rect);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]