summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-02-11 20:34:14 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-11 20:34:14 +0000
commit441246c5c5b5632abd44a13823e5171c915c67df (patch)
tree6cf089f7912cdbdf916b471de47dcb28ceba4abd
parentdda40c3b6221b1371a12a50fcff535e82112b573 (diff)
downloadpango-441246c5c5b5632abd44a13823e5171c915c67df.tar.gz
Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call the
2006-02-11 Behdad Esfahbod <behdad@gnome.org> Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call the class vfunc Opened by Torsten Schoenfeld * pango/pango-renderer.c (pango_renderer_draw_trapezoid, pango_renderer_draw_glyph): Bail if method is not implemented.
-rw-r--r--ChangeLog9
-rw-r--r--pango/pango-renderer.c10
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e4b6f60..bf67dfa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-02-11 Behdad Esfahbod <behdad@gnome.org>
+ Bug 330795 – pango_renderer_draw_glyph segfaults when trying to call
+ the class vfunc
+ Opened by Torsten Schoenfeld
+
+ * pango/pango-renderer.c (pango_renderer_draw_trapezoid,
+ pango_renderer_draw_glyph): Bail if method is not implemented.
+
+2006-02-11 Behdad Esfahbod <behdad@gnome.org>
+
* === Released 1.11.5 ===
* configure.in: Version 1.11.5
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index 67bef8cf..cdb876f7 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -938,9 +938,10 @@ pango_renderer_draw_trapezoid (PangoRenderer *renderer,
g_return_if_fail (PANGO_IS_RENDERER (renderer));
g_return_if_fail (renderer->active_count > 0);
- PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part,
- y1_, x11, x21,
- y2, x12, x22);
+ if (PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid)
+ PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part,
+ y1_, x11, x21,
+ y2, x12, x22);
}
/**
@@ -968,7 +969,8 @@ pango_renderer_draw_glyph (PangoRenderer *renderer,
if (glyph == PANGO_GLYPH_EMPTY) /* glyph PANGO_GLYPH_EMPTY never renders */
return;
- PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph (renderer, font, glyph, x, y);
+ if (PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph)
+ PANGO_RENDERER_GET_CLASS (renderer)->draw_glyph (renderer, font, glyph, x, y);
}
/**