[pango] Check for Cairo-Quartz as well as CoreText
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Check for Cairo-Quartz as well as CoreText
- Date: Wed, 22 Aug 2012 18:26:51 +0000 (UTC)
commit 8a4403018787f8692650b2894804d0ec513eb220
Author: John Ralls <jralls ceridwen us>
Date: Wed Aug 22 11:26:39 2012 -0700
Check for Cairo-Quartz as well as CoreText
pango/pangocairo-fontmap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index e0ff95f..0bea979 100644
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -25,7 +25,7 @@
#include "pangocairo-private.h"
#include "pango-impl-utils.h"
-#if defined (HAVE_CORE_TEXT)
+#if defined (HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
# include "pangocairo-coretext.h"
#endif
#if defined (HAVE_CAIRO_WIN32)
@@ -69,7 +69,7 @@ pango_cairo_font_map_new (void)
/* Make sure that the type system is initialized */
g_type_init ();
-#if defined(HAVE_CORE_TEXT)
+#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL);
#elif defined(HAVE_CAIRO_WIN32)
return g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT_MAP, NULL);
@@ -107,7 +107,7 @@ pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype)
switch ((int) fonttype)
{
-#if defined(HAVE_CORE_TEXT)
+#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ)
case CAIRO_FONT_TYPE_QUARTZ:
return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]