diff options
-rw-r--r-- | pdf/pdf_device.c | 6 | ||||
-rw-r--r-- | xps/xps_path.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pdf/pdf_device.c b/pdf/pdf_device.c index ff512de1..48963fcd 100644 --- a/pdf/pdf_device.c +++ b/pdf/pdf_device.c @@ -890,7 +890,6 @@ pdf_dev_fill_text(fz_device *dev, fz_text *text, const fz_matrix *ctm, fz_colorspace *colorspace, float *color, float alpha) { pdf_device *pdev = dev->user; - gstate *gs = CURRENT_GSTATE(pdev); pdf_dev_begin_text(pdev, &text->trm, 0); pdf_dev_font(pdev, text->font, 1); @@ -902,7 +901,6 @@ pdf_dev_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, cons fz_colorspace *colorspace, float *color, float alpha) { pdf_device *pdev = dev->user; - gstate *gs = CURRENT_GSTATE(pdev); pdf_dev_begin_text(pdev, &text->trm, 1); pdf_dev_font(pdev, text->font, 1); @@ -913,7 +911,6 @@ static void pdf_dev_clip_text(fz_device *dev, fz_text *text, const fz_matrix *ctm, int accumulate) { pdf_device *pdev = dev->user; - gstate *gs = CURRENT_GSTATE(pdev); pdf_dev_begin_text(pdev, &text->trm, 0); pdf_dev_font(pdev, text->font, 7); @@ -924,7 +921,6 @@ static void pdf_dev_clip_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, const fz_matrix *ctm) { pdf_device *pdev = dev->user; - gstate *gs = CURRENT_GSTATE(pdev); pdf_dev_begin_text(pdev, &text->trm, 0); pdf_dev_font(pdev, text->font, 5); @@ -935,7 +931,6 @@ static void pdf_dev_ignore_text(fz_device *dev, fz_text *text, const fz_matrix *ctm) { pdf_device *pdev = dev->user; - gstate *gs = CURRENT_GSTATE(pdev); pdf_dev_begin_text(pdev, &text->trm, 0); pdf_dev_font(pdev, text->font, 3); @@ -1224,6 +1219,7 @@ fz_device *pdf_new_pdf_device(pdf_document *doc, pdf_obj *contents, pdf_obj *res if (pdev->gstates) fz_drop_buffer(ctx, pdev->gstates[0].buf); fz_free(ctx, pdev); + fz_rethrow(ctx); } dev->free_user = pdf_dev_free_user; diff --git a/xps/xps_path.c b/xps/xps_path.c index ff5fb6be..3236971f 100644 --- a/xps/xps_path.c +++ b/xps/xps_path.c @@ -828,7 +828,7 @@ xps_parse_path(xps_document *doc, const fz_matrix *ctm, char *base_uri, xps_reso fz_matrix transform; float samples[32]; fz_colorspace *colorspace; - fz_path *path; + fz_path *path = NULL; fz_path *stroke_path = NULL; fz_rect area; int fill_rule; |