Attachment 4478 Details for Bug 5734 – patch 2

[patch] patch 2

cairo-ft-bitmap-2.patch (text/plain), 1.06 KB, created by Behdad Esfahbod on 2006-01-26 18:41:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Behdad Esfahbod

Created: 2006-01-26 18:41:42 UTC

Size: 1.06 KB

patch

obsolete

>Index: src/cairo-ft-font.c
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
>retrieving revision 1.115
>diff -u -p -r1.115 cairo-ft-font.c
>--- src/cairo-ft-font.c	21 Dec 2005 16:19:47 -0000	1.115
>+++ src/cairo-ft-font.c	26 Jan 2006 01:04:11 -0000
>@@ -715,12 +715,7 @@ _get_bitmap_surface (FT_Bitmap		     *bi
>     width = bitmap->width;
>     height = bitmap->rows;
>     
>-    if (width * height == 0) {
>-	if (own_buffer && bitmap->buffer)
>-	    free (bitmap->buffer);
>-	
>-	*surface = NULL;
>-    } else {
>+    {
> 	switch (bitmap->pixel_mode) {
> 	case FT_PIXEL_MODE_MONO:
> 	    stride = (((width + 31) & ~31) >> 3);
>@@ -1074,7 +1069,9 @@ _render_glyph_bitmap (FT_Face		      fac
>     if (error)
> 	return CAIRO_STATUS_NO_MEMORY;
> 
>-    _get_bitmap_surface (&glyphslot->bitmap, FALSE, font_options, surface);
>+    status = _get_bitmap_surface (&glyphslot->bitmap, FALSE, font_options, surface);
>+    if (status)
>+	return status;
>     
>     /*
>      * Note: the font's coordinate system is upside down from ours, so the

Actions: View | Splinter Review

Attachments on bug 5734: 4477 | 4478

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.