Attachment 26170 Details for Bug 20255 – Patch to remove broken error handling

[patch] Patch to remove broken error handling

diff.txt (text/plain), 1.04 KB, created by Elmar Braun on 2009-05-24 08:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elmar Braun

Created: 2009-05-24 08:00:23 UTC

Size: 1.04 KB

patch

obsolete

>diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
>index d99c261..92aba26 100644
>--- a/src/cairo-win32-font.c
>+++ b/src/cairo-win32-font.c
>@@ -977,16 +977,14 @@ _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_f
> 	if (GetGlyphOutlineW (hdc, _cairo_scaled_glyph_index (scaled_glyph),
> 			      GGO_METRICS | GGO_GLYPH_INDEX,
> 			      &metrics, 0, NULL, &matrix) == GDI_ERROR) {
> 	  status = _cairo_win32_print_gdi_error ("_cairo_win32_scaled_font_init_glyph_metrics:GetGlyphOutlineW");
> 	  memset (&metrics, 0, sizeof (GLYPHMETRICS));
> 	}
> 	cairo_win32_scaled_font_done_font (&scaled_font->base);
>-	if (status)
>-	    return status;
> 
> 	if (scaled_font->swap_axes) {
> 	    extents.x_bearing = - metrics.gmptGlyphOrigin.y / scaled_font->y_scale;
> 	    extents.y_bearing = metrics.gmptGlyphOrigin.x / scaled_font->x_scale;
> 	    extents.width = metrics.gmBlackBoxY / scaled_font->y_scale;
> 	    extents.height = metrics.gmBlackBoxX / scaled_font->x_scale;
> 	    extents.x_advance = metrics.gmCellIncY / scaled_font->x_scale;

Actions: View | Splinter Review

Attachments on bug 20255: 23180 | 26170 | 26171

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.