diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-08-28 03:58:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-28 03:58:54 +0000 |
| commit | 54e1aed0c2a32a8a5486220751f1100d01aef9b7 (patch) | |
| tree | 0f1fc19e139c5507d3d1ad41574f9e59e42c75a9 | |
| parent | 3c6176158e76399e4e5520efa744b9a88d3d9b64 (diff) | |
| parent | 9c2c7e994bedf0a87c434eeaa5ba9d296453203b (diff) | |
| download | pango-54e1aed0c2a32a8a5486220751f1100d01aef9b7.tar.gz | |
Merge branch 'coretext-warnings' into 'main'
Fix compiler warnings in CoreText code
See merge request GNOME/pango!449
| -rw-r--r-- | pango/pangocairo-coretextfont.c | 5 | ||||
| -rw-r--r-- | pango/pangocoretext-fontmap.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c index fa9f383a..07a71871 100644 --- a/pango/pangocairo-coretextfont.c +++ b/pango/pangocairo-coretextfont.c @@ -102,11 +102,6 @@ pango_cairo_core_text_font_create_base_metrics_for_context (PangoCairoFont *font { PangoCoreTextFont *cfont = (PangoCoreTextFont *) font; PangoFontMetrics *metrics; - PangoFontDescription *font_desc; - PangoLayout *layout; - PangoRectangle extents; - PangoLanguage *language = pango_context_get_language (context); - const char *sample_str = pango_language_get_sample_string (language); CTFontRef ctfont; metrics = pango_font_metrics_new (); diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c index 81bf7bf7..0980303b 100644 --- a/pango/pangocoretext-fontmap.c +++ b/pango/pangocoretext-fontmap.c @@ -849,7 +849,7 @@ get_scaled_size (PangoCoreTextFontMap *fontmap, const PangoFontDescription *desc) { double size = pango_font_description_get_size (desc); - PangoMatrix *matrix = pango_context_get_matrix (context); + const PangoMatrix *matrix = pango_context_get_matrix (context); double scale_factor = pango_matrix_get_font_scale_factor (matrix); if (!pango_font_description_get_size_is_absolute(desc)) @@ -1422,7 +1422,7 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, /* Cannot use pango_core_text_fontset_key_free() here */ pango_font_description_free (key.desc); - return g_object_ref (fontset); + return g_object_ref (PANGO_FONTSET (fontset)); } static void |