Attachment 110168 Details for Bug 84324 – patch with minor fix

patch with minor fix

ct2.patch (text/plain), 3.44 KB, created by rkdgu+a44zyz19a8hys on 2014-11-28 15:36:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rkdgu+a44zyz19a8hys

Created: 2014-11-28 15:36:26 UTC

Size: 3.44 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index 04479ff..f262dac 100644
>--- a/configure.ac
>+++ b/configure.ac
> <at>  <at>  -200,7 +200,7  <at>  <at>  CAIRO_ENABLE_SURFACE_BACKEND(quartz, Quartz, auto, [
>   if test "x$use_quartz" != "xyes" ; then
>     dnl check for CoreGraphics as a separate framework
>     AC_CHECK_HEADER(CoreGraphics/CoreGraphics.h, , [use_quartz="no (requires CoreGraphics framework)"])
>-    quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics"
>+    quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics -framework -Xlinker CoreText"
>   else
>     quartz_LIBS="-Xlinker -framework -Xlinker ApplicationServices"
>   fi
>diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
>index e6a379a..4518421 100644
>--- a/src/cairo-quartz-font.c
>+++ b/src/cairo-quartz-font.c
> <at>  <at>  -81,8 +81,8  <at>  <at>  static void (*CGFontGetGlyphsForUnicharsPtr) (CGFontRef, const UniChar[], const
> static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
> static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
>
>-/* Not public in the least bit */
>-static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform,
>int unknown, CGGlyph glyph) = NULL;
>+static CTFontRef (*CTFontCreateWithGraphicsFontPtr) (CGFontRef fontRef, CGFloat size, CGAffineTransform *matrix, CTFontDescriptorRef attributes) = NULL;
>+static CGPathRef (*CTFontCreatePathForGlyphPtr) (CTFontRef fontRef, CGGlyph glyph,
>CGAffineTransform *textTransform) = NULL;
>
> /* CGFontGetHMetrics isn't public, but the other functions are public/present in 10.5 */
> typedef struct {
> <at>  <at>  -127,7 +127,8  <at>  <at>  quartz_font_ensure_symbols(void)
>     /* These have the same name in 10.4 and 10.5 */
>     CGFontGetUnitsPerEmPtr = dlsym(RTLD_DEFAULT, "CGFontGetUnitsPerEm");
>     CGFontGetGlyphAdvancesPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphAdvances");
>-    CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphPath");
>+    CTFontCreatePathForGlyphPtr = dlsym(RTLD_DEFAULT, "CTFontCreatePathForGlyph");
>+    CTFontCreateWithGraphicsFontPtr = dlsym(RTLD_DEFAULT, "CTFontCreateWithGraphicsFont");
>
>     CGFontGetHMetricsPtr = dlsym(RTLD_DEFAULT, "CGFontGetHMetrics");
>     CGFontGetAscentPtr = dlsym(RTLD_DEFAULT, "CGFontGetAscent");
> <at>  <at>  -144,7 +145,8  <at>  <at>  quartz_font_ensure_symbols(void)
>    CGFontGetGlyphsForUnicharsPtr &&
>    CGFontGetUnitsPerEmPtr &&
>    CGFontGetGlyphAdvancesPtr &&
>-   CGFontGetGlyphPathPtr &&
>+   CTFontCreateWithGraphicsFontPtr &&
>+   CTFontCreatePathForGlyphPtr &&
>    (CGFontGetHMetricsPtr || (CGFontGetAscentPtr && CGFontGetDescentPtr && CGFontGetLeadingPtr)))
>    _cairo_quartz_font_symbols_present = TRUE;
>
> <at>  <at>  -550,6 +552,7  <at>  <at>  _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
>     CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
>     CGAffineTransform textMatrix;
>     CGPathRef glyphPath;
>+    CTFontRef ctFont;
>     cairo_path_fixed_t *path;
>
>     if (glyph == INVALID_GLYPH) {
> <at>  <at>  -564,7 +567,8  <at>  <at>  _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
>                    -font-Ã¢â°Â¥base.scale.yy,
>                    0, 0);
>
>-    glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
>+    ctFont = CTFontCreateWithGraphicsFontPtr (font_face->cgFont, 0, NULL, NULL);
>+    glyphPath = CTFontCreatePathForGlyphPtr (ctFont, glyph, &textMatrix);
>     if (!glyphPath)
>    return CAIRO_INT_STATUS_UNSUPPORTED;

Actions: View

Attachments on bug 84324: 106845 | 110157 | 110168 | 110634 | 114401 | 115677

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.