Pango: use more macros from the public API.

These are easier to read, and they've been around since Pango 1.3.

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 8dded740af427b4467d64afb482348ee5aba4216..4470e805d15fc61bf6bad7537fa31dd0485122de 100644 (file)
--- 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 a45c64f83001d05f95e779c48ab06795adb78c5e..2ed7ccf9724b2b215d277c1bc8bb5db1beaa5249 100644 (file)
--- 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);