diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-04-21 19:50:21 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-04-21 19:50:21 +0000 |
| commit | 18348c428c2515bd6b0c4b3e97aaf9b0661e9d12 (patch) | |
| tree | a28ff908ef2ba4d1c1e213310f9b794b0dc46302 /pango | |
| parent | e026cad714ef709b680efa8489012b823665d7e7 (diff) | |
| download | pango-18348c428c2515bd6b0c4b3e97aaf9b0661e9d12.tar.gz | |
Require cairo >= 1.6.4. Remove compat cruft that were added to support
2008-04-21 Behdad Esfahbod <behdad@gnome.org>
* configure.in:
* pango/pangocairo-atsui.h:
* pango/pangocairo-atsuifont.c
(pango_cairo_atsui_font_create_font_face):
* pango/pangocairo-fontmap.c
(pango_cairo_font_map_new_for_font_type):
Require cairo >= 1.6.4. Remove compat cruft that were added to
support older cairo that had cairo-atsui instead of cairo-quartz-font.
svn path=/trunk/; revision=2601
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pangocairo-atsui.h | 4 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 7 | ||||
| -rw-r--r-- | pango/pangocairo-fontmap.c | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h index 4d388065..423cffc4 100644 --- a/pango/pangocairo-atsui.h +++ b/pango/pangocairo-atsui.h @@ -24,11 +24,7 @@ #include "pangoatsui-private.h" #include <pango/pangocairo.h> -#ifdef CAIRO_HAS_QUARTZ_FONT #include <cairo-quartz.h> -#else -#include <cairo-atsui.h> -#endif G_BEGIN_DECLS diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index e631b18b..8e14618d 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -78,11 +78,6 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont *font, logical_rect); } -/* XXX remove when we require cairo 1.6 */ -#undef cairo_atsui_font_face_create_for_atsu_font_id -cairo_public cairo_font_face_t * -cairo_atsui_face_create_for_atsu_font_id (ATSUFontID font_id); - static cairo_font_face_t * pango_cairo_atsui_font_create_font_face (PangoCairoFont *font) { @@ -90,7 +85,7 @@ pango_cairo_atsui_font_create_font_face (PangoCairoFont *font) ATSUFontID font_id; font_id = pango_atsui_font_get_atsu_font_id (afont); - return cairo_atsui_font_face_create_for_atsu_font_id (font_id); + return cairo_quartz_font_face_create_for_atsu_font_id (font_id); } static int diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 2dbb588d..70a1c821 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -130,7 +130,7 @@ pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype) switch (fonttype) { #if defined(HAVE_CAIRO_ATSUI) - case CAIRO_FONT_TYPE_ATSUI: + case CAIRO_FONT_TYPE_QUARTZ: return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL); #endif #if defined(HAVE_CAIRO_WIN32) |