summaryrefslogtreecommitdiff
path: root/devel/pango/patches/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'devel/pango/patches/patch-ad')
-rw-r--r--devel/pango/patches/patch-ad44
1 files changed, 0 insertions, 44 deletions
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
deleted file mode 100644
index 1f71fcdd828..00000000000
--- a/devel/pango/patches/patch-ad
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ad,v 1.12 2011/01/27 14:04:51 drochner Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639882
-
---- pango/pangoft2-render.c.orig 2010-02-09 12:06:28.000000000 +0000
-+++ pango/pangoft2-render.c
-@@ -121,9 +121,14 @@ pango_ft2_font_render_box_glyph (int
-
- box->bitmap.width = width;
- box->bitmap.rows = height;
-- box->bitmap.pitch = height;
-+ box->bitmap.pitch = width;
-
-- box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch);
-+ box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch);
-+
-+ if (G_UNLIKELY (!box->bitmap.buffer)) {
-+ g_slice_free (PangoFT2RenderedGlyph, box);
-+ return NULL;
-+ }
-
- /* draw the box */
- for (j = 0; j < line_width; j++)
-@@ -226,6 +231,11 @@ pango_ft2_font_render_glyph (PangoFont *
- rendered->bitmap_left = face->glyph->bitmap_left;
- rendered->bitmap_top = face->glyph->bitmap_top;
-
-+ if (G_UNLIKELY (!rendered->bitmap.buffer)) {
-+ g_slice_free (PangoFT2RenderedGlyph, rendered);
-+ return NULL;
-+ }
-+
- return rendered;
- }
- else
-@@ -276,6 +286,8 @@ pango_ft2_renderer_draw_glyph (PangoRend
- if (rendered_glyph == NULL)
- {
- rendered_glyph = pango_ft2_font_render_glyph (font, glyph);
-+ if (rendered_glyph == NULL)
-+ return;
- add_glyph_to_cache = TRUE;
- }
-