diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-24 10:38:38 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-01-28 09:03:03 -0500 |
| commit | a07c85be22ddd119c5d2725d88a383c81403c87c (patch) | |
| tree | 18798c5d6f9af7e77e1941f633d076528c8f5259 | |
| parent | 7c07ffd678f7415479db251be49860b19a92bc37 (diff) | |
| download | pango-a07c85be22ddd119c5d2725d88a383c81403c87c.tar.gz | |
pangocairo: Allow picking the new fc fontmap
Make PANGOCAIRO_BACKEND=fontconfig2 or fc2 work.
| -rw-r--r-- | pango/pangocairo-fontmap.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 70bc66dc..8dc15e20 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -33,6 +33,7 @@ #endif #if defined (HAVE_CAIRO_FREETYPE) # include "pangocairo-fc.h" +# include "pangofc-hbfontmap.h" #endif @@ -87,8 +88,11 @@ pango_cairo_font_map_new (void) #endif #if defined(HAVE_CAIRO_FREETYPE) if (!backend || 0 == strcmp (backend, "fc") - || 0 == strcmp (backend, "fontconfig")) + || 0 == strcmp (backend, "fontconfig")) return g_object_new (PANGO_TYPE_CAIRO_FC_FONT_MAP, NULL); + else if (0 == strcmp (backend, "fc2") || + 0 == strcmp (backend, "fontconfig2")) + return g_object_new (PANGO_TYPE_FC_HB_FONT_MAP, NULL); #endif { const char backends[] = "" @@ -100,9 +104,10 @@ pango_cairo_font_map_new (void) #endif #if defined(HAVE_CAIRO_FREETYPE) " fontconfig" + " fontconfig2" #endif ; - g_critical ("Unknown $PANGOCAIRO_BACKEND value.\n Available backends are:%s", backends); + g_critical ("Unknown PANGOCAIRO_BACKEND value.\nAvailable backends are:%s", backends); } return NULL; } |