[pango/pango2-windows: 220/222] examples: Use pango_cairo_font_map_new()




commit 84d0fb759f5e8e87ff684503624bb26a555a9763
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jun 9 11:15:57 2022 +0800

    examples: Use pango_cairo_font_map_new()
    
    ...instead of relying on the FontConfig-specific pango_fc_hb_font_map_new().
    
    The pango_cairo_font_map_new() should cover the PangoFontMap we need use
    depending on what backend we have and choose to use.

 examples/cairoshape.c | 3 +--
 examples/userfont.c   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/examples/cairoshape.c b/examples/cairoshape.c
index 4dc43ec2..b8dea9fb 100644
--- a/examples/cairoshape.c
+++ b/examples/cairoshape.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <pango/pangocairo.h>
-#include <pango/pangofc-hbfontmap.h>
 
 static PangoFontMap *fontmap;
 
@@ -307,7 +306,7 @@ main (int argc, char **argv)
 
   filename = argv[1];
 
-  fontmap = PANGO_FONT_MAP (pango_fc_hb_font_map_new (NULL));
+  fontmap = PANGO_FONT_MAP (pango_cairo_font_map_new ());
   setup_fontmap (PANGO_HB_FONT_MAP (fontmap));
 
   surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 0, 0);
diff --git a/examples/userfont.c b/examples/userfont.c
index 0f49e15d..858b5fb4 100644
--- a/examples/userfont.c
+++ b/examples/userfont.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 
 #include <pango/pangocairo.h>
-#include <pango/pangofc-hbfontmap.h>
 
 static PangoFontMap *fontmap;
 
@@ -321,7 +320,7 @@ main (int argc, char **argv)
 
   filename = argv[1];
 
-  fontmap = PANGO_FONT_MAP (pango_fc_hb_font_map_new (NULL));
+  fontmap = PANGO_FONT_MAP (pango_cairo_font_map_new ());
   setup_fontmap (PANGO_HB_FONT_MAP (fontmap));
 
   layout = get_layout ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]