[pango/wip/kill-shape-engine-win32: 39/59] fc: Make pangofc_shape backend-neutral
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/wip/kill-shape-engine-win32: 39/59] fc: Make pangofc_shape backend-neutral
- Date: Wed, 17 Jul 2019 02:55:31 +0000 (UTC)
commit f7e32685536351266f2d0c8bbd91d3e77a694c23
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Nov 19 13:59:26 2018 -0500
fc: Make pangofc_shape backend-neutral
Use typechecks for the two remaining bits of
code that use PangoFcFont.
pango/pangofc-shape.c | 91 ++++++++++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 44 deletions(-)
---
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index e64b8deb..59b90c40 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -122,7 +122,6 @@ _pango_fc_shape (PangoFont *font,
const char *paragraph_text,
unsigned int paragraph_length)
{
- PangoFcFont *fc_font;
hb_font_t *hb_font;
hb_buffer_t *hb_buffer;
hb_direction_t hb_direction;
@@ -161,8 +160,8 @@ _pango_fc_shape (PangoFont *font,
hb_buffer_add_utf8 (hb_buffer, paragraph_text, paragraph_length, item_offset, item_length);
- pango_font_get_features (font, features, 32, &num_features);
- apply_extra_attributes (analysis->extra_attrs, features, 32, &num_features);
+ pango_font_get_features (font, features, G_N_ELEMENTS (features), &num_features);
+ apply_extra_attributes (analysis->extra_attrs, features, G_N_ELEMENTS (features), &num_features);
hb_shape (hb_font, hb_buffer, features, num_features);
@@ -203,57 +202,61 @@ _pango_fc_shape (PangoFont *font,
hb_position++;
}
- if (fc_font->is_hinted)
- {
- double x_scale_inv, y_scale_inv;
- double x_scale, y_scale;
- PangoFcFontKey *key;
+ if (PANGO_IS_FC_FONT (font))
+ {
+ PangoFcFont *fc_font = PANGO_FC_FONT (font);
+ if (fc_font->is_hinted)
+ {
+ double x_scale_inv, y_scale_inv;
+ double x_scale, y_scale;
+ PangoFcFontKey *key;
- x_scale_inv = y_scale_inv = 1.0;
- key = _pango_fc_font_get_font_key (fc_font);
- if (key)
- {
- const PangoMatrix *matrix = pango_fc_font_key_get_matrix (key);
- pango_matrix_get_font_scale_factors (matrix, &x_scale_inv, &y_scale_inv);
- }
- if (PANGO_GRAVITY_IS_IMPROPER (analysis->gravity))
- {
- x_scale_inv = -x_scale_inv;
- y_scale_inv = -y_scale_inv;
- }
- x_scale = 1. / x_scale_inv;
- y_scale = 1. / y_scale_inv;
+ x_scale_inv = y_scale_inv = 1.0;
+ key = _pango_fc_font_get_font_key (fc_font);
+ if (key)
+ {
+ const PangoMatrix *matrix = pango_fc_font_key_get_matrix (key);
+ pango_matrix_get_font_scale_factors (matrix, &x_scale_inv, &y_scale_inv);
+ }
+ if (PANGO_GRAVITY_IS_IMPROPER (analysis->gravity))
+ {
+ x_scale_inv = -x_scale_inv;
+ y_scale_inv = -y_scale_inv;
+ }
+ x_scale = 1. / x_scale_inv;
+ y_scale = 1. / y_scale_inv;
- if (x_scale == 1.0 && y_scale == 1.0)
- {
- for (i = 0; i < num_glyphs; i++)
- infos[i].geometry.width = PANGO_UNITS_ROUND (infos[i].geometry.width);
- }
- else
- {
+ if (x_scale == 1.0 && y_scale == 1.0)
+ {
+ for (i = 0; i < num_glyphs; i++)
+ infos[i].geometry.width = PANGO_UNITS_ROUND (infos[i].geometry.width);
+ }
+ else
+ {
#if 0
- if (PANGO_GRAVITY_IS_VERTICAL (analysis->gravity))
- {
- /* XXX */
- double tmp = x_scale;
- x_scale = y_scale;
- y_scale = -tmp;
- }
+ if (PANGO_GRAVITY_IS_VERTICAL (analysis->gravity))
+ {
+ /* XXX */
+ double tmp = x_scale;
+ x_scale = y_scale;
+ y_scale = -tmp;
+ }
#endif
#define HINT(value, scale_inv, scale) (PANGO_UNITS_ROUND ((int) ((value) * scale)) * scale_inv)
#define HINT_X(value) HINT ((value), x_scale, x_scale_inv)
#define HINT_Y(value) HINT ((value), y_scale, y_scale_inv)
- for (i = 0; i < num_glyphs; i++)
- {
- infos[i].geometry.width = HINT_X (infos[i].geometry.width);
- infos[i].geometry.x_offset = HINT_X (infos[i].geometry.x_offset);
- infos[i].geometry.y_offset = HINT_Y (infos[i].geometry.y_offset);
- }
+ for (i = 0; i < num_glyphs; i++)
+ {
+ infos[i].geometry.width = HINT_X (infos[i].geometry.width);
+ infos[i].geometry.x_offset = HINT_X (infos[i].geometry.x_offset);
+ infos[i].geometry.y_offset = HINT_Y (infos[i].geometry.y_offset);
+ }
#undef HINT_Y
#undef HINT_X
#undef HINT
- }
- }
+ }
+ }
+ }
release_buffer (hb_buffer, free_buffer);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]