Source code
Revision control
Copy as Markdown
Other Tools
diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
index dc98acaf67c6..c637942e455c 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1443,27 +1443,29 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
if (error)
return _cairo_error (_cairo_ft_to_cairo_error (error));
- FT_Bitmap_Done( library, bitmap );
- *bitmap = tmp;
-
- stride = bitmap->pitch;
+ /* tmp is our locally-managed view of bitmap, which belongs to
+ * the glyph slot. Only access and free tmp. */
+ stride = tmp.pitch;
data = _cairo_malloc_ab (height, stride);
- if (!data)
+ if (!data) {
+ FT_Bitmap_Done( library, &tmp );
return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ }
- if (bitmap->num_grays != 256)
+ if (tmp.num_grays != 256)
{
unsigned int x, y;
- unsigned int mul = 255 / (bitmap->num_grays - 1);
- FT_Byte *p = bitmap->buffer;
+ unsigned int mul = 255 / (tmp.num_grays - 1);
+ FT_Byte *p = tmp.buffer;
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++)
p[x] *= mul;
- p += bitmap->pitch;
+ p += tmp.pitch;
}
}
- memcpy (data, bitmap->buffer, (size_t)stride * height);
+ memcpy (data, tmp.buffer, (size_t)stride * height);
+ FT_Bitmap_Done( library, &tmp );
break;
}
/* fall through */