summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2008-08-17 15:01:21 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2008-08-17 15:19:19 +0100
commit418ebb09303aa4b9b212fad4b45e458332a3afde (patch)
tree99ba105e0ad396fc55727f15f26b13cfb80b4e0e /src
parent2ab700f21af7a98d82e74fd4d04884b2b0ca1b20 (diff)
[scaled-font-subsets] Propagate error status from index_to_ucs4().
Check for an error status from ->index_to_ucs4() and propagate.
Diffstat (limited to 'src')
-rw-r--r--src/cairo-scaled-font-subsets.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 1f87838b..4b7b633d 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -331,8 +331,13 @@ _cairo_sub_font_glyph_lookup_unicode (cairo_sub_font_glyph_t *sub_font_glyph,
if (status == CAIRO_INT_STATUS_UNSUPPORTED)
unicode = -1;
- if (unicode == (uint32_t)-1 && scaled_font->backend->index_to_ucs4)
- status = scaled_font->backend->index_to_ucs4 (scaled_font, scaled_font_glyph_index, &unicode);
+ if (unicode == (uint32_t)-1 && scaled_font->backend->index_to_ucs4) {
+ status = scaled_font->backend->index_to_ucs4 (scaled_font,
+ scaled_font_glyph_index,
+ &unicode);
+ if (status)
+ return status;
+ }
sub_font_glyph->unicode = unicode;
sub_font_glyph->utf8 = NULL;