summaryrefslogtreecommitdiff
path: root/src/cairo-pdf-operators.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2008-08-17 14:55:30 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2008-08-17 15:19:12 +0100
commit96d45cfeeeb6dba94f134589486b894eeac82651 (patch)
tree1333cfb06b10c913de1e3fdb0051a7f4a6a7ebe1 /src/cairo-pdf-operators.c
parent63f64ff3369f3768fe80a1b002a1d057e3886d4c (diff)
downloadcairo-96d45cfeeeb6dba94f134589486b894eeac82651.tar.gz
[pdf-operators] Propagate error from emit_glyph_string*().
Do not overwrite the error status if returned by either of the emit_glyph_string*() routines.
Diffstat (limited to 'src/cairo-pdf-operators.c')
-rw-r--r--src/cairo-pdf-operators.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c
index c01acdfec..027bbad3d 100644
--- a/src/cairo-pdf-operators.c
+++ b/src/cairo-pdf-operators.c
@@ -927,7 +927,7 @@ static cairo_status_t
_cairo_pdf_operators_flush_glyphs (cairo_pdf_operators_t *pdf_operators)
{
cairo_output_stream_t *word_wrap_stream;
- cairo_status_t status;
+ cairo_status_t status, status2;
int i;
double x;
@@ -955,11 +955,11 @@ _cairo_pdf_operators_flush_glyphs (cairo_pdf_operators_t *pdf_operators)
}
pdf_operators->num_glyphs = 0;
- status = _cairo_output_stream_destroy (word_wrap_stream);
- if (status)
- return status;
+ status2 = _cairo_output_stream_destroy (word_wrap_stream);
+ if (status == CAIRO_STATUS_SUCCESS)
+ status = status2;
- return CAIRO_STATUS_SUCCESS;
+ return status;
}
static cairo_status_t