summaryrefslogtreecommitdiff
path: root/src/cairo-scaled-font-subsets.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-03-31 10:37:44 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-03-31 12:16:02 +0100
commit180b964aac4e058e6783778d33772f08e13b3669 (patch)
tree7d9287bc98cdebd756c67ffdaaef4f49e872c869 /src/cairo-scaled-font-subsets.c
parent8362c6f726979abc43ad9f7303bd45fcb03f83b3 (diff)
downloadcairo-180b964aac4e058e6783778d33772f08e13b3669.tar.gz
[scaled-font-subset] Propagate error from scaled-font to collection.
Don't attempt to collect the sub_font if it is in error.
Diffstat (limited to 'src/cairo-scaled-font-subsets.c')
-rw-r--r--src/cairo-scaled-font-subsets.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index c802c3143..1d16e4abe 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -542,6 +542,10 @@ _cairo_sub_font_collect (void *entry, void *closure)
if (collection->status)
return;
+ collection->status = sub_font->scaled_font->status;
+ if (collection->status)
+ return;
+
for (i = 0; i <= sub_font->current_subset; i++) {
collection->subset_id = i;
collection->num_glyphs = 0;