From bdfe9682bafe326f6b40c563dfcb4875a83e6acd Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 24 Dec 2009 07:23:28 +0000 Subject: [PATCH] Add patch file to Cairo directory for bug 534260. (NPOTB) --- gfx/cairo/README | 2 ++ gfx/cairo/quartz-glyph-extents.patch | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gfx/cairo/quartz-glyph-extents.patch diff --git a/gfx/cairo/README b/gfx/cairo/README index f4ab6c1fa8f..8be928251c6 100644 --- a/gfx/cairo/README +++ b/gfx/cairo/README @@ -62,6 +62,8 @@ quartz-minimze-gradient-repeat.patch: reduce the number of gradient stop repetit quartz-first-stop.patch: return the first stop for negative positions on the gradient line of a nonrepeating linear gradient +quartz-glyph-extents.patch: bug 534260; work around incorrect glyph extents returned by quartz for anomalous empty glyphs + ==== pixman patches ==== pixman-neon.patch: add ARM NEON optimized compositing functions diff --git a/gfx/cairo/quartz-glyph-extents.patch b/gfx/cairo/quartz-glyph-extents.patch new file mode 100644 index 00000000000..3114042921c --- /dev/null +++ b/gfx/cairo/quartz-glyph-extents.patch @@ -0,0 +1,19 @@ +--- a/gfx/cairo/cairo/src/cairo-quartz-font.c Wed Dec 23 14:17:44 2009 -0500 ++++ b/gfx/cairo/cairo/src/cairo-quartz-font.c Wed Dec 23 20:45:00 2009 +0000 +@@ -420,6 +420,16 @@ _cairo_quartz_init_glyph_metrics (cairo_ + !CGFontGetGlyphBBoxesPtr (font_face->cgFont, &glyph, 1, &bbox)) + goto FAIL; + ++ /* broken fonts like Al Bayan return incorrect bounds for some null characters, ++ see https://bugzilla.mozilla.org/show_bug.cgi?id=534260 */ ++ if (unlikely (bbox.origin.x == -32767 && ++ bbox.origin.y == -32767 && ++ bbox.size.width == 65534 && ++ bbox.size.height == 65534)) { ++ bbox.origin.x = bbox.origin.y = 0; ++ bbox.size.width = bbox.size.height = 0; ++ } ++ + status = _cairo_matrix_compute_basis_scale_factors (&font->base.scale, + &xscale, &yscale, 1); + if (status)