From 0760494fcf4f3c7c3fa6e68d14e64f228e2ebcdd Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 23 Feb 2010 19:12:09 -0800 Subject: [PATCH] Pango: use more macros from the public API. These are easier to read, and they've been around since Pango 1.3. --- lily/all-font-metrics.cc | 6 ++---- lily/pango-font.cc | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 8dded740af..4470e805d1 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -49,10 +49,8 @@ All_font_metrics::All_font_metrics (string path) #if HAVE_PANGO_FT2 PangoFontMap *pfm = pango_ft2_font_map_new (); - pango_ft2_fontmap_ - = G_TYPE_CHECK_INSTANCE_CAST (pfm, - PANGO_TYPE_FT2_FONT_MAP, - PangoFT2FontMap); + pango_ft2_fontmap_ = PANGO_FT2_FONT_MAP (pfm); + pango_dpi_ = PANGO_RESOLUTION; pango_ft2_font_map_set_resolution (pango_ft2_fontmap_, pango_dpi_, pango_dpi_); diff --git a/lily/pango-font.cc b/lily/pango-font.cc index a45c64f830..2ed7ccf972 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -124,9 +124,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item, PangoRectangle ink_rect; pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect); - PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST (pa->font, - PANGO_TYPE_FC_FONT, - PangoFcFont); + PangoFcFont *fcfont = PANGO_FC_FONT (pa->font); FT_Face ftface = pango_fc_font_lock_face (fcfont); -- 2.39.5