From e371ec8e57399308cd1c1e6113d86d99e27dce48 Mon Sep 17 00:00:00 2001 From: "vladimir@pobox.com" Date: Sun, 10 Jun 2007 17:06:24 -0700 Subject: [PATCH] b=383960, Upgrade cairo to 1.4.8, r=me -- moz cairo: no longer needed: quartz-glyph-rounding.patch --- gfx/cairo/README | 2 - gfx/cairo/quartz-glyph-rounding.patch | 53 --------------------------- 2 files changed, 55 deletions(-) delete mode 100755 gfx/cairo/quartz-glyph-rounding.patch diff --git a/gfx/cairo/README b/gfx/cairo/README index 2244c472b316..4df51f9792ba 100644 --- a/gfx/cairo/README +++ b/gfx/cairo/README @@ -24,8 +24,6 @@ max-font-size.patch: Clamp freetype font size to 1000 to avoid overflow issues fbcompose-bandaid.patch: Disable "optimized" code in non-MMX case due to bugs -quartz-glyph-rounding.patch: Round glyph positions, not advances, to float - win32-scaled-font-size.patch: Add cairo_win32_font_face_create_for_logfontw_hfont, allow win32 scaled_fonts to rescale themselves properly to the required CTM and only use the font_face's hfont if we're sure it's appropriate diff --git a/gfx/cairo/quartz-glyph-rounding.patch b/gfx/cairo/quartz-glyph-rounding.patch deleted file mode 100755 index 0a29a84d9c01..000000000000 --- a/gfx/cairo/quartz-glyph-rounding.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: gfx/cairo/cairo/src/cairo-quartz-surface.c -=================================================================== -RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairo-quartz-surface.c,v -retrieving revision 1.9 -diff -u -p -1 -2 -r1.9 cairo-quartz-surface.c ---- gfx/cairo/cairo/src/cairo-quartz-surface.c 24 Jan 2007 23:53:03 -0000 1.9 -+++ gfx/cairo/cairo/src/cairo-quartz-surface.c 15 Mar 2007 03:34:48 -0000 -@@ -1407,37 +1407,39 @@ _cairo_quartz_surface_show_glyphs (void - // XXXtodo/perf: stack storage for glyphs/sizes - #define STATIC_BUF_SIZE 64 - CGGlyph glyphs_static[STATIC_BUF_SIZE]; - CGSize cg_advances_static[STATIC_BUF_SIZE]; - CGGlyph *cg_glyphs = &glyphs_static[0]; - CGSize *cg_advances = &cg_advances_static[0]; - - if (num_glyphs > STATIC_BUF_SIZE) { - cg_glyphs = (CGGlyph*) malloc(sizeof(CGGlyph) * num_glyphs); - cg_advances = (CGSize*) malloc(sizeof(CGSize) * num_glyphs); - } - -- double xprev = glyphs[0].x; -- double yprev = glyphs[0].y; -+ float xprev = glyphs[0].x; -+ float yprev = glyphs[0].y; - - cg_glyphs[0] = glyphs[0].index; - cg_advances[0].width = 0; - cg_advances[0].height = 0; - - for (i = 1; i < num_glyphs; i++) { - cg_glyphs[i] = glyphs[i].index; -- cg_advances[i-1].width = glyphs[i].x - xprev; -- cg_advances[i-1].height = glyphs[i].y - yprev; -- xprev = glyphs[i].x; -- yprev = glyphs[i].y; -+ float xf = glyphs[i].x; -+ float yf = glyphs[i].y; -+ cg_advances[i-1].width = xf - xprev; -+ cg_advances[i-1].height = yf - yprev; -+ xprev = xf; -+ yprev = yf; - } - - #if 0 - for (i = 0; i < num_glyphs; i++) { - ND((stderr, "[%d: %d %f,%f]\n", i, cg_glyphs[i], cg_advances[i].width, cg_advances[i].height)); - } - #endif - - CGContextShowGlyphsWithAdvances (surface->cgContext, - cg_glyphs, - cg_advances, - num_glyphs);