Avoid typecasting function pointers in subclasses.

Do the typecasting in the functions instead, reducing the risk
of function prototype mismatches.

3 files changed, 72 insertions, 54 deletions

diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index e75823a6..7000dc8f 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -121,21 +121,24 @@ cbz_create_page_list(fz_context *ctx, cbz_document *doc)
 }
 
 static void
-cbz_drop_document(fz_context *ctx, cbz_document *doc)
+cbz_drop_document(fz_context *ctx, fz_document *doc_)
 {
+	cbz_document *doc = (cbz_document*)doc_;
 	fz_drop_archive(ctx, doc->arch);
 	fz_free(ctx, (char **)doc->page);
 }
 
 static int
-cbz_count_pages(fz_context *ctx, cbz_document *doc)
+cbz_count_pages(fz_context *ctx, fz_document *doc_)
 {
+	cbz_document *doc = (cbz_document*)doc_;
 	return doc->page_count;
 }
 
 static fz_rect *
-cbz_bound_page(fz_context *ctx, cbz_page *page, fz_rect *bbox)
+cbz_bound_page(fz_context *ctx, fz_page *page_, fz_rect *bbox)
 {
+	cbz_page *page = (cbz_page*)page_;
 	fz_image *image = page->image;
 	int xres, yres;
 
@@ -147,8 +150,9 @@ cbz_bound_page(fz_context *ctx, cbz_page *page, fz_rect *bbox)
 }
 
 static void
-cbz_run_page(fz_context *ctx, cbz_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
+cbz_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
 {
+	cbz_page *page = (cbz_page*)page_;
 	fz_matrix local_ctm = *ctm;
 	fz_image *image = page->image;
 	int xres, yres;
@@ -162,14 +166,16 @@ cbz_run_page(fz_context *ctx, cbz_page *page, fz_device *dev, const fz_matrix *c
 }
 
 static void
-cbz_drop_page(fz_context *ctx, cbz_page *page)
+cbz_drop_page(fz_context *ctx, fz_page *page_)
 {
+	cbz_page *page = (cbz_page*)page_;
 	fz_drop_image(ctx, page->image);
 }
 
-static cbz_page *
-cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
+static fz_page *
+cbz_load_page(fz_context *ctx, fz_document *doc_, int number)
 {
+	cbz_document *doc = (cbz_document*)doc_;
 	cbz_page *page = NULL;
 	fz_buffer *buf = NULL;
 
@@ -186,9 +192,9 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
 	fz_try(ctx)
 	{
 		page = fz_new_derived_page(ctx, cbz_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 = (fz_page_drop_page_fn*)cbz_drop_page;
+		page->super.bound_page = cbz_bound_page;
+		page->super.run_page_contents = cbz_run_page;
+		page->super.drop_page = cbz_drop_page;
 		page->image = fz_new_image_from_buffer(ctx, buf);
 	}
 	fz_always(ctx)
@@ -197,16 +203,17 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
 	}
 	fz_catch(ctx)
 	{
-		fz_drop_page(ctx, &page->super);
+		fz_drop_page(ctx, (fz_page*)page);
 		fz_rethrow(ctx);
 	}
 
-	return page;
+	return (fz_page*)page;
 }
 
 static int
-cbz_lookup_metadata(fz_context *ctx, cbz_document *doc, const char *key, char *buf, int size)
+cbz_lookup_metadata(fz_context *ctx, fz_document *doc_, const char *key, char *buf, int size)
 {
+	cbz_document *doc = (cbz_document*)doc_;
 	if (!strcmp(key, "format"))
 		return (int) fz_strlcpy(buf, fz_archive_format(ctx, doc->arch), size);
 	return -1;
@@ -219,10 +226,10 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 
 	doc = fz_new_derived_document(ctx, cbz_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;
+	doc->super.drop_document = cbz_drop_document;
+	doc->super.count_pages = cbz_count_pages;
+	doc->super.load_page = cbz_load_page;
+	doc->super.lookup_metadata = cbz_lookup_metadata;
 
 	fz_try(ctx)
 	{
@@ -231,10 +238,10 @@ cbz_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	}
 	fz_catch(ctx)
 	{
-		fz_drop_document(ctx, &doc->super);
+		fz_drop_document(ctx, (fz_document*)doc);
 		fz_rethrow(ctx);
 	}
-	return &doc->super;
+	return (fz_document*)doc;
 }
 
 static const char *cbz_extensions[] =
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index d2dd7d19..6fe0687d 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -20,20 +20,22 @@ struct img_document_s
 };
 
 static void
-img_drop_document(fz_context *ctx, img_document *doc)
+img_drop_document(fz_context *ctx, fz_document *doc_)
 {
+	img_document *doc = (img_document*)doc_;
 	fz_drop_image(ctx, doc->image);
 }
 
 static int
-img_count_pages(fz_context *ctx, img_document *doc)
+img_count_pages(fz_context *ctx, fz_document *doc_)
 {
 	return 1;
 }
 
 static fz_rect *
-img_bound_page(fz_context *ctx, img_page *page, fz_rect *bbox)
+img_bound_page(fz_context *ctx, fz_page *page_, fz_rect *bbox)
 {
+	img_page *page = (img_page*)page_;
 	fz_image *image = page->image;
 	int xres, yres;
 	fz_image_resolution(image, &xres, &yres);
@@ -44,8 +46,9 @@ img_bound_page(fz_context *ctx, img_page *page, fz_rect *bbox)
 }
 
 static void
-img_run_page(fz_context *ctx, img_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
+img_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
 {
+	img_page *page = (img_page*)page_;
 	fz_matrix local_ctm = *ctm;
 	fz_image *image = page->image;
 	int xres, yres;
@@ -58,14 +61,16 @@ img_run_page(fz_context *ctx, img_page *page, fz_device *dev, const fz_matrix *c
 }
 
 static void
-img_drop_page(fz_context *ctx, img_page *page)
+img_drop_page(fz_context *ctx, fz_page *page_)
 {
+	img_page *page = (img_page*)page_;
 	fz_drop_image(ctx, page->image);
 }
 
-static img_page *
-img_load_page(fz_context *ctx, img_document *doc, int number)
+static fz_page *
+img_load_page(fz_context *ctx, fz_document *doc_, int number)
 {
+	img_document *doc = (img_document*)doc_;
 	img_page *page;
 
 	if (number != 0)
@@ -73,17 +78,17 @@ img_load_page(fz_context *ctx, img_document *doc, int number)
 
 	page = fz_new_derived_page(ctx, img_page);
 
-	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 = (fz_page_drop_page_fn*)img_drop_page;
+	page->super.bound_page = img_bound_page;
+	page->super.run_page_contents = img_run_page;
+	page->super.drop_page = img_drop_page;
 
 	page->image = fz_keep_image(ctx, doc->image);
 
-	return page;
+	return (fz_page*)page;
 }
 
 static int
-img_lookup_metadata(fz_context *ctx, img_document *doc, const char *key, char *buf, int size)
+img_lookup_metadata(fz_context *ctx, fz_document *doc_, const char *key, char *buf, int size)
 {
 	if (!strcmp(key, "format"))
 		return (int)fz_strlcpy(buf, "Image", size);
@@ -95,10 +100,10 @@ img_new_document(fz_context *ctx, fz_image *image)
 {
 	img_document *doc = fz_new_derived_document(ctx, img_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;
+	doc->super.drop_document = img_drop_document;
+	doc->super.count_pages = img_count_pages;
+	doc->super.load_page = img_load_page;
+	doc->super.lookup_metadata = img_lookup_metadata;
 
 	doc->image = fz_keep_image(ctx, image);
 
@@ -129,7 +134,7 @@ img_open_document_with_stream(fz_context *ctx, fz_stream *stm)
 	fz_catch(ctx)
 		fz_rethrow(ctx);
 
-	return &doc->super;
+	return (fz_document*)doc;
 }
 
 static const char *img_extensions[] =
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index c9dd2fb1..9cd306f2 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -21,8 +21,9 @@ struct tiff_document_s
 };
 
 static fz_rect *
-tiff_bound_page(fz_context *ctx, tiff_page *page, fz_rect *bbox)
+tiff_bound_page(fz_context *ctx, fz_page *page_, fz_rect *bbox)
 {
+	tiff_page *page = (tiff_page*)page_;
 	fz_image *image = page->image;
 	int xres, yres;
 
@@ -34,8 +35,9 @@ tiff_bound_page(fz_context *ctx, tiff_page *page, fz_rect *bbox)
 }
 
 static void
-tiff_run_page(fz_context *ctx, tiff_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
+tiff_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie)
 {
+	tiff_page *page = (tiff_page*)page_;
 	fz_matrix local_ctm = *ctm;
 	fz_image *image = page->image;
 	int xres, yres;
@@ -49,14 +51,16 @@ tiff_run_page(fz_context *ctx, tiff_page *page, fz_device *dev, const fz_matrix
 }
 
 static void
-tiff_drop_page(fz_context *ctx, tiff_page *page)
+tiff_drop_page(fz_context *ctx, fz_page *page_)
 {
+	tiff_page *page = (tiff_page*)page_;
 	fz_drop_image(ctx, page->image);
 }
 
-static tiff_page *
-tiff_load_page(fz_context *ctx, tiff_document *doc, int number)
+static fz_page *
+tiff_load_page(fz_context *ctx, fz_document *doc_, int number)
 {
+	tiff_document *doc = (tiff_document*)doc_;
 	fz_pixmap *pixmap = NULL;
 	fz_image *image = NULL;
 	tiff_page *page = NULL;
@@ -77,9 +81,9 @@ tiff_load_page(fz_context *ctx, tiff_document *doc, int number)
 		image = fz_new_image_from_pixmap(ctx, pixmap, NULL);
 
 		page = fz_new_derived_page(ctx, tiff_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 = (fz_page_drop_page_fn*)tiff_drop_page;
+		page->super.bound_page = tiff_bound_page;
+		page->super.run_page_contents = tiff_run_page;
+		page->super.drop_page = tiff_drop_page;
 		page->image = fz_keep_image(ctx, image);
 	}
 	fz_always(ctx)
@@ -93,17 +97,18 @@ tiff_load_page(fz_context *ctx, tiff_document *doc, int number)
 		fz_rethrow(ctx);
 	}
 
-	return page;
+	return (fz_page*)page;
 }
 
 static int
-tiff_count_pages(fz_context *ctx, tiff_document *doc)
+tiff_count_pages(fz_context *ctx, fz_document *doc_)
 {
+	tiff_document *doc = (tiff_document*)doc_;
 	return doc->page_count;
 }
 
 static int
-tiff_lookup_metadata(fz_context *ctx, tiff_document *doc, const char *key, char *buf, int size)
+tiff_lookup_metadata(fz_context *ctx, fz_document *doc_, const char *key, char *buf, int size)
 {
 	if (!strcmp(key, "format"))
 		return (int)fz_strlcpy(buf, "TIFF", size);
@@ -111,8 +116,9 @@ tiff_lookup_metadata(fz_context *ctx, tiff_document *doc, const char *key, char
 }
 
 static void
-tiff_drop_document(fz_context *ctx, tiff_document *doc)
+tiff_drop_document(fz_context *ctx, fz_document *doc_)
 {
+	tiff_document *doc = (tiff_document*)doc_;
 	fz_drop_buffer(ctx, doc->buffer);
 }
 
@@ -123,10 +129,10 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 
 	doc = fz_new_derived_document(ctx, tiff_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;
+	doc->super.drop_document = tiff_drop_document;
+	doc->super.count_pages = tiff_count_pages;
+	doc->super.load_page = tiff_load_page;
+	doc->super.lookup_metadata = tiff_lookup_metadata;
 
 	fz_try(ctx)
 	{
@@ -138,11 +144,11 @@ tiff_open_document_with_stream(fz_context *ctx, fz_stream *file)
 	}
 	fz_catch(ctx)
 	{
-		fz_drop_document(ctx, &doc->super);
+		fz_drop_document(ctx, (fz_document*)doc);
 		fz_rethrow(ctx);
 	}
 
-	return &doc->super;
+	return (fz_document*)doc;
 }
 
 static const char *tiff_extensions[] =