diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | cairomm/quartz_font.cc | 13 | ||||
| -rw-r--r-- | cairomm/quartz_font.h | 4 |
3 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2010-06-07 Augusto Jun Devegili <monipol@gmx.com> + + Put ifdefs around 32-bit-only API, to fix the build on 64-bit machines. + + * cairomm/quartz_font.[h|cc]: Use #ifndef __LP64__, as cairo does. + 2010-06-07 Daisuke Nishikawa <caffeine@m13.alpha-net.ne.jp> Actually install cairomm-xlib-xrender-1.0.pc. diff --git a/cairomm/quartz_font.cc b/cairomm/quartz_font.cc index 22f9cfe..662d941 100644 --- a/cairomm/quartz_font.cc +++ b/cairomm/quartz_font.cc @@ -30,21 +30,24 @@ QuartzFontFace::QuartzFontFace(CGFontRef font) : check_object_status_and_throw_exception(*this); } -QuartzFontFace::QuartzFontFace(ATSUFontID font_id) : - FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true) +RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font) { - check_object_status_and_throw_exception(*this); + return RefPtr<QuartzFontFace>(new QuartzFontFace(font)); } -RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font) + +#ifndef __LP64__ +QuartzFontFace::QuartzFontFace(ATSUFontID font_id) : + FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true) { - return RefPtr<QuartzFontFace>(new QuartzFontFace(font)); + check_object_status_and_throw_exception(*this); } RefPtr<QuartzFontFace> QuartzFontFace::create(ATSUFontID font_id) { return RefPtr<QuartzFontFace>(new QuartzFontFace(font_id)); } +#endif } diff --git a/cairomm/quartz_font.h b/cairomm/quartz_font.h index 62e082d..d293741 100644 --- a/cairomm/quartz_font.h +++ b/cairomm/quartz_font.h @@ -46,6 +46,7 @@ public: */ static RefPtr<QuartzFontFace> create(CGFontRef font); +#ifndef __LP64__ /** Creates a new font for the Quartz font backend based on an ATSUFontID. * This font can then be used with Context::set_font_face() or * ScaledFont::create(). @@ -55,11 +56,14 @@ public: * @since 1.8 */ static RefPtr<QuartzFontFace> create(ATSUFontID font_id); +#endif protected: QuartzFontFace(CGFontRef font); +#ifndef __LP64__ QuartzFontFace(ATSUFontID font_id); +#endif }; } |