<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-text-flowed" style="font-family: -moz-fixed;
font-size: 14px;" lang="x-unicode">Hi, I would like to submit the
following two patches to cairo-1.14.0:
<br>
<br>
1) the following patch fixes a configure failure when building
under MinGW on Windows:<br>
<br>
diff -rU 0 a/configure b/configure
<br>
--- cairo-1.14.0/configure 2014-10-13 19:47:29 -0600
<br>
+++ fixed/configure 2015-02-02 21:40:21 -0700
<br>
@@ -18933 +18933 @@
<br>
-if strings - conftest | grep noonsees >/dev/null ; then
<br>
+if strings - conftest$ac_exeext | grep noonsees >/dev/null ;
then
<br>
@@ -18936 +18936 @@
<br>
-if strings - conftest | grep seesnoon >/dev/null ; then
<br>
+if strings - conftest$ac_exeext | grep seesnoon >/dev/null ;
then
<br>
<br>
2) the following patch fixes runtime warnings about
CGFontGetGlyphPath deprecation under OS X 10.10 (Yosemite):<br>
(discussion at <a class="moz-txt-link-freetext"
href="http://comments.gmane.org/gmane.comp.lib.cairo/24875">http://comments.gmane.org/gmane.comp.lib.cairo/24875</a>)
<br>
<br>
diff -rU 0 a/configure.ac b/configure.ac
<br>
--- a/configure.ac 2014-10-13 18:46:33.000000000 -0700
<br>
+++ b/configure.ac 2015-01-22 20:05:02.000000000 -0800
<br>
@@ -205 +205 @@
<br>
- quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics"
<br>
+ quartz_LIBS="-Xlinker -framework -Xlinker CoreGraphics
-framework -Xlinker CoreText"
<br>
diff -rU 0 a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
<br>
--- a/src/cairo-quartz-font.c 2013-09-24 21:38:54.000000000
-0700
<br>
+++ b/src/cairo-quartz-font.c 2015-01-22 20:05:33.000000000
-0800
<br>
@@ -84,2 +84,2 @@
<br>
-/* Not public in the least bit */
<br>
-static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef,
CGAffineTransform *textTransform, int unknown, CGGlyph glyph) =
NULL;
<br>
+static CTFontRef (*CTFontCreateWithGraphicsFontPtr) (CGFontRef
fontRef) = NULL;
<br>
+static CGPathRef (*CTFontCreatePathForGlyphPtr) (CTFontRef
fontRef, CGGlyph glyph, CGAffineTransform *textTransform) = NULL;
<br>
@@ -130 +130,2 @@
<br>
- CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT,
"CGFontGetGlyphPath");
<br>
+ CTFontCreateWithGraphicsFontPtr = dlsym(RTLD_DEFAULT,
"CTFontCreateWithGraphicsFont");
<br>
+ CTFontCreatePathForGlyphPtr = dlsym(RTLD_DEFAULT,
"CTFontCreatePathForGlyph");
<br>
@@ -147 +148,2 @@
<br>
- CGFontGetGlyphPathPtr &&
<br>
+ CTFontCreateWithGraphicsFontPtr &&
<br>
+ CTFontCreatePathForGlyphPtr &&
<br>
@@ -551,0 +554 @@
<br>
+ CTFontRef ctFont;
<br>
@@ -567 +570,3 @@
<br>
- glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont,
&textMatrix, 0, glyph);
<br>
+ ctFont = CTFontCreateWithGraphicsFontPtr
(font_face->cgFont);
<br>
+ glyphPath = CTFontCreatePathForGlyphPtr (ctFont, glyph,
&textMatrix);
<br>
+ CFRelease(ctFont);
<br>
</div>
</body>
</html>