[pango/pango2: 37/63] Drop non-hb coretext support
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/pango2: 37/63] Drop non-hb coretext support
- Date: Fri, 10 Jun 2022 03:41:34 +0000 (UTC)
commit 883b7f336a51ece55f91e95d1084fa7e67cc4624
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jun 7 20:40:17 2022 -0400
Drop non-hb coretext support
Untested.
pango/meson.build | 5 +-
pango/pangocairo-coretext.h | 50 -
pango/pangocairo-coretextfont.c | 215 ----
pango/pangocairo-coretextfont.h | 37 -
pango/pangocairo-coretextfontmap.c | 190 ----
pango/pangocairo-fontmap.c | 4 +-
pango/pangocoretext-fontmap.c | 1918 ------------------------------------
pango/pangocoretext-private.h | 139 ---
pango/pangocoretext.c | 284 ------
pango/pangocoretext.h | 42 -
10 files changed, 3 insertions(+), 2881 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index 14802eea..fec3afe3 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -124,10 +124,7 @@ if cairo_dep.found()
if pango_font_backends.contains('quartz')
pango_sources += [
- 'pangocoretext.c',
- 'pangocoretext-fontmap.c',
- 'pangocairo-coretextfont.c',
- 'pangocairo-coretextfontmap.c',
+ 'pangocoretext-hbfontmap.c',
]
endif
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index 55fa755e..01dd5218 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -26,7 +26,7 @@
#include "pango-impl-utils.h"
#if defined (HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
-# include "pangocairo-coretext.h"
+# include "pangocoretext-hbfontmap.h"
#endif
#if defined (HAVE_CAIRO_WIN32)
# include "pangocairo-win32.h"
@@ -77,7 +77,7 @@ pango_cairo_font_map_new (void)
backend = NULL;
#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
if (!backend || 0 == strcmp (backend, "coretext"))
- return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL);
+ return (PangoFontMap *) pango_core_text_hb_font_map_new ();
#endif
#if defined(HAVE_CAIRO_WIN32)
if (!backend || 0 == strcmp (backend, "win32"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]