Separate close and drop functionality for devices and writers.

Closing a device or writer may throw exceptions, but much of the
foreign language bindings (JNI and JS) depend on drop to never throw
an exception (exceptions in finalizers are bad).

1 files changed, 12 insertions, 4 deletions

diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c
index e275ca56..ed8a6f4a 100644
--- a/source/pdf/pdf-appearance.c
+++ b/source/pdf/pdf-appearance.c
@@ -1612,7 +1612,7 @@ void pdf_set_annot_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *ann
 
 		dev = pdf_new_pdf_device(ctx, doc, &fz_identity, &trect, resources, contents);
 		fz_run_display_list(ctx, disp_list, dev, &inv_page_ctm, &fz_infinite_rect, NULL);
-		fz_drop_device(ctx, dev);
+		fz_close_device(ctx, dev);
 
 		pdf_update_stream(ctx, doc, ap_obj, contents, 0);
 		fz_drop_buffer(ctx, contents);
@@ -1627,11 +1627,10 @@ void pdf_set_annot_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *ann
 
 		doc->dirty = 1;
 	}
-	fz_catch(ctx)
-	{
+	fz_always(ctx)
 		fz_drop_device(ctx, dev);
+	fz_catch(ctx)
 		fz_rethrow(ctx);
-	}
 }
 
 static fz_point *
@@ -1745,6 +1744,8 @@ void pdf_set_markup_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *an
 			fz_stroke_path(ctx, dev, path, stroke, &page_ctm, fz_device_rgb(ctx), color, alpha);
 		}
 
+		fz_close_device(ctx, dev);
+
 		fz_transform_rect(&rect, &page_ctm);
 		pdf_set_annot_appearance(ctx, doc, annot, &rect, strike_list);
 	}
@@ -1879,6 +1880,8 @@ void pdf_update_ink_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *an
 			rect.y1 += width;
 		}
 
+		fz_close_device(ctx, dev);
+
 		fz_transform_rect(&rect, &page_ctm);
 		pdf_set_annot_appearance(ctx, doc, annot, &rect, strike_list);
 	}
@@ -2126,6 +2129,8 @@ void pdf_update_text_annot_appearance(fz_context *ctx, pdf_document *doc, pdf_an
 		fz_fill_path(ctx, dev, path, 0, &tm, cs, white, 1.0f);
 		fz_stroke_path(ctx, dev, path, stroke, &tm, cs, black, 1.0f);
 
+		fz_close_device(ctx, dev);
+
 		fz_transform_rect(&rect, &page_ctm);
 		pdf_set_annot_appearance(ctx, doc, annot, &rect, dlist);
 
@@ -2198,6 +2203,7 @@ void pdf_update_free_text_annot_appearance(fz_context *ctx, pdf_document *doc, p
 		dlist = fz_new_display_list(ctx, NULL);
 		dev = fz_new_list_device(ctx, dlist);
 		fz_fill_text(ctx, dev, text, &page_ctm, cs, font_rec.da_rec.col, 1.0f);
+		fz_close_device(ctx, dev);
 
 		fz_transform_rect(&rect, &page_ctm);
 		pdf_set_annot_appearance(ctx, doc, annot, &rect, dlist);
@@ -2415,6 +2421,8 @@ void pdf_set_signature_appearance(fz_context *ctx, pdf_document *doc, pdf_annot
 		text = fit_text(ctx, &font_rec, (char *)bufstr, &rect);
 		fz_fill_text(ctx, dev, text, &page_ctm, cs, font_rec.da_rec.col, 1.0f);
 
+		fz_close_device(ctx, dev);
+
 		rect = annot_rect;
 		fz_transform_rect(&rect, &page_ctm);
 		pdf_set_annot_appearance(ctx, doc, annot, &rect, dlist);