Attachment 26171 Details for Bug 20255 – Alternate patch

[patch] Alternate patch

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

(hide)

Description:

Filename:

MIME Type:

Creator: Elmar Braun

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

Size: 1.08 KB

patch

obsolete

>diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
>index d99c261..5cdc3d7 100644
>--- a/src/cairo-win32-font.c
>+++ b/src/cairo-win32-font.c
>@@ -970,18 +970,20 @@ _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_f
> 	/* If we aren't rotating / skewing the axes, then we get the metrics
> 	 * from the GDI in device space and convert to font space.
> 	 */
> 	status = cairo_win32_scaled_font_select_font (&scaled_font->base, hdc);
> 	if (status)
> 	    return status;
> 
>+	SetLastError(0);
> 	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");
>+	  if (GetLastError())
>+		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) {

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.