16d420b1cc
No ATSUI font stuff on iOS. But otherwise there isn't really anything MacOSX specific there. The code builds against the iOS SDK, too.
66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
|
|
+++ misc/build/cairo-1.8.0/src/cairo-quartz.h
|
|
@@ -40,7 +40,7 @@
|
|
|
|
#if CAIRO_HAS_QUARTZ_SURFACE
|
|
|
|
-#include <ApplicationServices/ApplicationServices.h>
|
|
+#include <CoreGraphics/CoreGraphics.h>
|
|
|
|
CAIRO_BEGIN_DECLS
|
|
|
|
@@ -66,8 +66,12 @@
|
|
cairo_public cairo_font_face_t *
|
|
cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
|
|
|
|
+#if 0
|
|
+
|
|
cairo_public cairo_font_face_t *
|
|
cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
|
|
+
|
|
+#endif /* 0 */
|
|
|
|
#endif /* CAIRO_HAS_QUARTZ_FONT */
|
|
|
|
--- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
|
|
+++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
|
|
@@ -152,10 +152,6 @@
|
|
CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
|
|
CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
|
|
|
|
- if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
|
|
- // assume 10.4
|
|
- _cairo_quartz_osx_version = 0x1040;
|
|
- }
|
|
|
|
_cairo_quartz_symbol_lookup_done = TRUE;
|
|
}
|
|
@@ -2093,7 +2093,10 @@
|
|
yprev = yf;
|
|
}
|
|
|
|
- if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
|
|
+ if (0) {
|
|
+ /* Assume the bug mentioned below is not present in iOS,
|
|
+ * until proven otherwise.
|
|
+ */
|
|
/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
|
|
* bug (apple bug ID #5834794) where the glyph
|
|
* advances/positions are not transformed by the text matrix
|
|
--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
|
|
+++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
|
|
@@ -766,6 +766,8 @@
|
|
}
|
|
|
|
|
|
+#if 0
|
|
+
|
|
/*
|
|
* compat with old ATSUI backend
|
|
*/
|
|
@@ -808,3 +808,5 @@
|
|
{
|
|
return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
|
|
}
|
|
+
|
|
+#endif /* 0 */
|