diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-29 05:07:29 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-29 05:07:29 +0000 |
commit | 76eca4dce1d308780b5b6712896eebebdd77e79f (patch) | |
tree | 25422edd1ef388a8b015e7d2561e1425212ce6e6 | |
parent | 0f661af32fe4bc7401ef11f9e66b9869df6a365c (diff) | |
parent | af036f7be3a92642ac0a1c5794970de4cede5505 (diff) | |
download | pango-76eca4dce1d308780b5b6712896eebebdd77e79f.tar.gz |
Merge branch 'matthiasc/for-main' into 'main'
fcfont: Cosmetics
See merge request GNOME/pango!455
-rw-r--r-- | pango/fonts.c | 18 | ||||
-rw-r--r-- | pango/pango-font-private.h | 2 | ||||
-rw-r--r-- | pango/pango-font.h | 2 | ||||
-rw-r--r-- | pango/pango-fontmap.h | 3 | ||||
-rw-r--r-- | pango/pango-item-private.h | 2 | ||||
-rw-r--r-- | pango/pangofc-font.c | 2 | ||||
-rw-r--r-- | pango/pangofc-fontmap.c | 2 |
7 files changed, 23 insertions, 8 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 45d05b38..f144097d 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1727,6 +1727,16 @@ pango_font_default_get_scale_factors (PangoFont *font, *x_scale = *y_scale = 1.0; } +static gboolean +pango_font_default_has_char (PangoFont *font, + gunichar wc) +{ + PangoCoverage *coverage = pango_font_get_coverage (font, pango_language_get_default ()); + PangoCoverageLevel result = pango_coverage_get (coverage, wc); + pango_coverage_unref (coverage); + return result != PANGO_COVERAGE_NONE; +} + static void pango_font_class_init (PangoFontClass *class G_GNUC_UNUSED) { @@ -1740,6 +1750,7 @@ pango_font_class_init (PangoFontClass *class G_GNUC_UNUSED) pclass->get_languages = pango_font_default_get_languages; pclass->is_hinted = pango_font_default_is_hinted; pclass->get_scale_factors = pango_font_default_get_scale_factors; + pclass->has_char = pango_font_default_has_char; } static void @@ -2626,10 +2637,9 @@ gboolean pango_font_has_char (PangoFont *font, gunichar wc) { - PangoCoverage *coverage = pango_font_get_coverage (font, pango_language_get_default ()); - PangoCoverageLevel result = pango_coverage_get (coverage, wc); - pango_coverage_unref (coverage); - return result != PANGO_COVERAGE_NONE; + PangoFontClassPrivate *pclass = PANGO_FONT_GET_CLASS_PRIVATE (font); + + return pclass->has_char (font, wc); } /** diff --git a/pango/pango-font-private.h b/pango/pango-font-private.h index d9845fab..1f31f559 100644 --- a/pango/pango-font-private.h +++ b/pango/pango-font-private.h @@ -42,6 +42,8 @@ typedef struct { double *x_scale, double *y_scale); + gboolean (* has_char) (PangoFont *font, + gunichar wc); } PangoFontClassPrivate; gboolean pango_font_is_hinted (PangoFont *font); diff --git a/pango/pango-font.h b/pango/pango-font.h index e7272e3e..6b78c2ed 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -664,6 +664,8 @@ PangoLanguage ** pango_font_get_languages (PangoFont *font); #endif #endif +G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoFont, g_object_unref) + G_END_DECLS #endif /* __PANGO_FONT_H__ */ diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h index 0e0edd43..cc85899b 100644 --- a/pango/pango-fontmap.h +++ b/pango/pango-fontmap.h @@ -124,6 +124,9 @@ PANGO_AVAILABLE_IN_1_46 PangoFontFamily *pango_font_map_get_family (PangoFontMap *fontmap, const char *name); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoFontMap, g_object_unref) + G_END_DECLS #endif /* __PANGO_FONTMAP_H__ */ diff --git a/pango/pango-item-private.h b/pango/pango-item-private.h index 8bb7e1cd..8680fa4b 100644 --- a/pango/pango-item-private.h +++ b/pango/pango-item-private.h @@ -59,7 +59,7 @@ struct _PangoItemPrivate int num_chars; PangoAnalysis analysis; int char_offset; -} +}; #endif diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 8543b85e..79bc166f 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -103,7 +103,6 @@ pango_fc_font_class_init (PangoFcFontClass *class) font_class->get_font_map = pango_fc_font_get_font_map; font_class->get_features = pango_fc_font_get_features; font_class->create_hb_font = pango_fc_font_create_hb_font; - font_class->get_features = pango_fc_font_get_features; pclass = g_type_class_get_private ((GTypeClass *) class, PANGO_TYPE_FONT); @@ -472,7 +471,6 @@ pango_fc_font_get_metrics (PangoFont *font, /* Compute derived metrics */ PangoLayout *layout; PangoRectangle extents; - const char *sample_str = pango_language_get_sample_string (language); PangoFontDescription *desc = pango_font_describe_with_absolute_size (font); gulong sample_str_width; diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index dcc2c08d..388ed2d3 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -155,7 +155,7 @@ struct _PangoFcFontMapPrivate GHashTable *font_face_data_hash; /* Maps font file name/id -> data */ - /* List of all families availible */ + /* List of all families available */ PangoFcFamily **families; int n_families; /* -1 == uninitialized */ |