3 files changed, 15 insertions, 15 deletions

diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 5a83adc0..0b5de93e 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -101,7 +101,7 @@ cbz_create_page_list(fz_context *ctx, cbz_document *doc)
 }
 
 static void
-cbz_close_document(fz_context *ctx, cbz_document *doc)
+cbz_drop_document(fz_context *ctx, cbz_document *doc)
 {
 	fz_drop_archive(ctx, doc->zip);
 	fz_free(ctx, (char **)doc->page);
@@ -143,7 +143,7 @@ cbz_run_page(fz_context *ctx, cbz_page *page, fz_device *dev, const fz_matrix *c
 }
 
 static void
-cbz_drop_page_imp(fz_context *ctx, cbz_page *page)
+cbz_drop_page(fz_context *ctx, cbz_page *page)
 {
 	if (!page)
 		return;
@@ -169,7 +169,7 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
 		page = fz_new_page(ctx, sizeof *page);
 		page->super.bound_page = (fz_page_bound_page_fn *)cbz_bound_page;
 		page->super.run_page_contents = (fz_page_run_page_contents_fn *)cbz_run_page;
-		page->super.drop_page_imp = (fz_page_drop_page_imp_fn *)cbz_drop_page_imp;
+		page->super.drop_page = (fz_page_drop_page_fn *)cbz_drop_page;
 		page->image = fz_new_image_from_buffer(ctx, buf);
 	}
 	fz_always(ctx)
@@ -179,7 +179,7 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
 	fz_catch(ctx)
 	{
 		fz_free(ctx, data);
-		cbz_drop_page_imp(ctx, page);
+		cbz_drop_page(ctx, page);
 		fz_rethrow(ctx);
 	}
 
@@ -199,7 +199,7 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 {
 	cbz_document *doc = fz_new_document(ctx, cbz_document);
 
-	doc->super.close = (fz_document_close_fn *)cbz_close_document;
+	doc->super.drop_document = (fz_document_drop_fn *)cbz_drop_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)cbz_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)cbz_load_page;
 	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)cbz_lookup_metadata;
@@ -211,7 +211,7 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	}
 	fz_catch(ctx)
 	{
-		cbz_close_document(ctx, doc);
+		cbz_drop_document(ctx, doc);
 		fz_rethrow(ctx);
 	}
 	return doc;
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index de99679f..5292c365 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -18,7 +18,7 @@ struct img_document_s
 };
 
 static void
-img_close_document(fz_context *ctx, img_document *doc)
+img_drop_document(fz_context *ctx, img_document *doc)
 {
 	fz_drop_image(ctx, doc->image);
 	fz_free(ctx, doc);
@@ -57,7 +57,7 @@ img_run_page(fz_context *ctx, img_page *page, fz_device *dev, const fz_matrix *c
 }
 
 static void
-img_drop_page_imp(fz_context *ctx, img_page *page)
+img_drop_page(fz_context *ctx, img_page *page)
 {
 	fz_drop_image(ctx, page->image);
 }
@@ -74,7 +74,7 @@ img_load_page(fz_context *ctx, img_document *doc, int number)
 
 	page->super.bound_page = (fz_page_bound_page_fn *)img_bound_page;
 	page->super.run_page_contents = (fz_page_run_page_contents_fn *)img_run_page;
-	page->super.drop_page_imp = (fz_page_drop_page_imp_fn *)img_drop_page_imp;
+	page->super.drop_page = (fz_page_drop_page_fn *)img_drop_page;
 
 	page->image = fz_keep_image(ctx, doc->image);
 
@@ -94,7 +94,7 @@ img_new_document(fz_context *ctx, fz_image *image)
 {
 	img_document *doc = fz_new_document(ctx, img_document);
 
-	doc->super.close = (fz_document_close_fn *)img_close_document;
+	doc->super.drop_document = (fz_document_drop_fn *)img_drop_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)img_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)img_load_page;
 	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)img_lookup_metadata;
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index ad859987..64da4c5a 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -47,7 +47,7 @@ tiff_run_page(fz_context *ctx, tiff_page *page, fz_device *dev, const fz_matrix
 }
 
 static void
-tiff_drop_page_imp(fz_context *ctx, tiff_page *page)
+tiff_drop_page(fz_context *ctx, tiff_page *page)
 {
 	if (!page)
 		return;
@@ -76,7 +76,7 @@ tiff_load_page(fz_context *ctx, tiff_document *doc, int number)
 		page = fz_new_page(ctx, sizeof *page);
 		page->super.bound_page = (fz_page_bound_page_fn *)tiff_bound_page;
 		page->super.run_page_contents = (fz_page_run_page_contents_fn *)tiff_run_page;
-		page->super.drop_page_imp = (fz_page_drop_page_imp_fn *)tiff_drop_page_imp;
+		page->super.drop_page = (fz_page_drop_page_fn *)tiff_drop_page;
 		page->image = fz_keep_image(ctx, image);
 	}
 	fz_always(ctx)
@@ -108,7 +108,7 @@ tiff_lookup_metadata(fz_context *ctx, tiff_document *doc, const char *key, char
 }
 
 static void
-tiff_close_document(fz_context *ctx, tiff_document *doc)
+tiff_drop_document(fz_context *ctx, tiff_document *doc)
 {
 	fz_drop_buffer(ctx, doc->buffer);
 	fz_free(ctx, doc);
@@ -121,7 +121,7 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 
 	doc = fz_new_document(ctx, tiff_document);
 
-	doc->super.close = (fz_document_close_fn *)tiff_close_document;
+	doc->super.drop_document = (fz_document_drop_fn *)tiff_drop_document;
 	doc->super.count_pages = (fz_document_count_pages_fn *)tiff_count_pages;
 	doc->super.load_page = (fz_document_load_page_fn *)tiff_load_page;
 	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)tiff_lookup_metadata;
@@ -133,7 +133,7 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	}
 	fz_catch(ctx)
 	{
-		tiff_close_document(ctx, doc);
+		tiff_drop_document(ctx, doc);
 		fz_rethrow(ctx);
 	}