Attachment 3414 Details for Bug 4612 – metric.gmBlackBox[XY] are unsigned, leading to much fun during comparison

[patch] metric.gmBlackBox[XY] are unsigned, leading to much fun during comparison

cairo-win32-sign.diff (text/plain), 1.25 KB, created by tor on 2005-09-27 15:28:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tor

Created: 2005-09-27 15:28:56 UTC

Size: 1.25 KB

patch

obsolete

>--- cairo-win32-font.c~	2005-09-26 18:55:24.049433600 -0500
>+++ cairo-win32-font.c	2005-09-27 17:21:57.610545600 -0500
>@@ -807,20 +807,20 @@ _cairo_win32_scaled_font_glyph_bbox (voi
> 
> 	    GetGlyphOutlineW (hdc, glyphs[i].index, GGO_METRICS | GGO_GLYPH_INDEX,
> 			     &metrics, 0, NULL, &matrix);
> 
> 	    if (i == 0 || x1 > x + metrics.gmptGlyphOrigin.x)
> 		x1 = x + metrics.gmptGlyphOrigin.x;
> 	    if (i == 0 || y1 > y - metrics.gmptGlyphOrigin.y)
> 		y1 = y - metrics.gmptGlyphOrigin.y;
>-	    if (i == 0 || x2 < x + metrics.gmptGlyphOrigin.x + metrics.gmBlackBoxX)
>-		x2 = x + metrics.gmptGlyphOrigin.x + metrics.gmBlackBoxX;
>-	    if (i == 0 || y2 < y - metrics.gmptGlyphOrigin.y + metrics.gmBlackBoxY)
>-		y2 = y - metrics.gmptGlyphOrigin.y + metrics.gmBlackBoxY;
>+	    if (i == 0 || x2 < x + metrics.gmptGlyphOrigin.x + (int)metrics.gmBlackBoxX)
>+		x2 = x + metrics.gmptGlyphOrigin.x + (int)metrics.gmBlackBoxX;
>+	    if (i == 0 || y2 < y - metrics.gmptGlyphOrigin.y + (int)metrics.gmBlackBoxY)
>+		y2 = y - metrics.gmptGlyphOrigin.y + (int)metrics.gmBlackBoxY;
> 	}
> 
> 	cairo_win32_scaled_font_done_font (&scaled_font->base);
>     }
> 
>     bbox->p1.x = _cairo_fixed_from_int (x1);
>     bbox->p1.y = _cairo_fixed_from_int (y1);
>     bbox->p2.x = _cairo_fixed_from_int (x2);

Actions: View | Splinter Review

Attachments on bug 4612: 3414

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.