From 1b81931936c65774dce13864f632f0630325bace Mon Sep 17 00:00:00 2001 From: John Ralls Date: Wed, 22 Aug 2012 09:38:47 -0700 Subject: Still more atsui removal CoreText works now! --- pango/pangocairo-coretextfontmap.c | 2 +- pango/pangocairo-fontmap.c | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pango/pangocairo-coretextfontmap.c b/pango/pangocairo-coretextfontmap.c index 107c8289..40c04408 100644 --- a/pango/pangocairo-coretextfontmap.c +++ b/pango/pangocairo-coretextfontmap.c @@ -57,7 +57,7 @@ pango_cairo_core_text_font_map_get_font_type (PangoCairoFontMap *cfontmap) /* This is a bit misleading, but Cairo takes a CoreGraphics font * for rendering and does not use ATSUI. */ - return CAIRO_FONT_TYPE_ATSUI; + return CAIRO_FONT_TYPE_QUARTZ; } static void diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index d5bff788..e0ff95f9 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -25,12 +25,8 @@ #include "pangocairo-private.h" #include "pango-impl-utils.h" -#if defined (HAVE_CAIRO_ATSUI) -# if defined (HAVE_CORE_TEXT) -# include "pangocairo-coretext.h" -# else -# include "pangocairo-atsui.h" -# endif +#if defined (HAVE_CORE_TEXT) +# include "pangocairo-coretext.h" #endif #if defined (HAVE_CAIRO_WIN32) # include "pangocairo-win32.h" @@ -73,12 +69,8 @@ pango_cairo_font_map_new (void) /* Make sure that the type system is initialized */ g_type_init (); -#if defined(HAVE_CAIRO_ATSUI) #if defined(HAVE_CORE_TEXT) return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); -#else - return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); -#endif #elif defined(HAVE_CAIRO_WIN32) return g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT_MAP, NULL); #elif defined(HAVE_CAIRO_FREETYPE) @@ -115,13 +107,9 @@ pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype) switch ((int) fonttype) { -#if defined(HAVE_CAIRO_ATSUI) - case CAIRO_FONT_TYPE_QUARTZ: #if defined(HAVE_CORE_TEXT) + case CAIRO_FONT_TYPE_QUARTZ: return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); -#else - return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); -#endif #endif #if defined(HAVE_CAIRO_WIN32) case CAIRO_FONT_TYPE_WIN32: -- cgit v1.2.1