Typedef function pointers consistently.

21 files changed, 111 insertions, 89 deletions

diff --git a/include/mupdf/fitz/font.h b/include/mupdf/fitz/font.h
index eae2e4cf..7d655222 100644
--- a/include/mupdf/fitz/font.h
+++ b/include/mupdf/fitz/font.h
@@ -165,7 +165,7 @@ fz_rect *fz_font_bbox(fz_context *ctx, fz_font *font);
 
 	Returns a new font handle, or NULL if no font found (or on error).
 */
-typedef fz_font *(*fz_load_system_font_fn)(fz_context *ctx, const char *name, int bold, int italic, int needs_exact_metrics);
+typedef fz_font *(fz_load_system_font_fn)(fz_context *ctx, const char *name, int bold, int italic, int needs_exact_metrics);
 
 /*
 	fz_load_system_cjk_font_fn: Type for user supplied cjk font loading hook.
@@ -176,7 +176,7 @@ typedef fz_font *(*fz_load_system_font_fn)(fz_context *ctx, const char *name, in
 
 	Returns a new font handle, or NULL if no font found (or on error).
 */
-typedef fz_font *(*fz_load_system_cjk_font_fn)(fz_context *ctx, const char *name, int ros, int serif);
+typedef fz_font *(fz_load_system_cjk_font_fn)(fz_context *ctx, const char *name, int ros, int serif);
 
 /*
 	fz_load_system_fallback_font_fn: Type for user supplied fallback font loading hook.
@@ -188,7 +188,7 @@ typedef fz_font *(*fz_load_system_cjk_font_fn)(fz_context *ctx, const char *name
 
 	Returns a new font handle, or NULL if no font found (or on error).
 */
-typedef fz_font *(*fz_load_system_fallback_font_fn)(fz_context *ctx, int script, int language, int serif, int bold, int italic);
+typedef fz_font *(fz_load_system_fallback_font_fn)(fz_context *ctx, int script, int language, int serif, int bold, int italic);
 
 /*
 	fz_install_load_system_font_fn: Install functions to allow
@@ -197,9 +197,9 @@ typedef fz_font *(*fz_load_system_fallback_font_fn)(fz_context *ctx, int script,
 	Only one set of hooks can be in use at a time.
 */
 void fz_install_load_system_font_funcs(fz_context *ctx,
-	fz_load_system_font_fn f,
-	fz_load_system_cjk_font_fn f_cjk,
-	fz_load_system_fallback_font_fn f_fallback);
+	fz_load_system_font_fn *f,
+	fz_load_system_cjk_font_fn *f_cjk,
+	fz_load_system_fallback_font_fn *f_fallback);
 
 /* fz_load_*_font returns NULL if no font could be loaded (also on error) */
 /*
diff --git a/include/mupdf/fitz/hash.h b/include/mupdf/fitz/hash.h
index b5077554..22bcff0f 100644
--- a/include/mupdf/fitz/hash.h
+++ b/include/mupdf/fitz/hash.h
@@ -18,15 +18,15 @@
  */
 
 typedef struct fz_hash_table_s fz_hash_table;
-typedef void (*fz_hash_table_drop_fn)(fz_context *ctx, void *val);
-typedef void (*fz_hash_table_for_each_fn)(fz_context *ctx, void *state, void *key, int keylen, void *val);
+typedef void (fz_hash_table_drop_fn)(fz_context *ctx, void *val);
+typedef void (fz_hash_table_for_each_fn)(fz_context *ctx, void *state, void *key, int keylen, void *val);
 
-fz_hash_table *fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_hash_table_drop_fn drop_val);
+fz_hash_table *fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_hash_table_drop_fn *drop_val);
 void fz_drop_hash_table(fz_context *ctx, fz_hash_table *table);
 
 void *fz_hash_find(fz_context *ctx, fz_hash_table *table, const void *key);
 void *fz_hash_insert(fz_context *ctx, fz_hash_table *table, const void *key, void *val);
 void fz_hash_remove(fz_context *ctx, fz_hash_table *table, const void *key);
-void fz_hash_for_each(fz_context *ctx, fz_hash_table *table, void *state, fz_hash_table_for_each_fn callback);
+void fz_hash_for_each(fz_context *ctx, fz_hash_table *table, void *state, fz_hash_table_for_each_fn *callback);
 
 #endif
diff --git a/include/mupdf/fitz/image.h b/include/mupdf/fitz/image.h
index a853f4ec..5d363332 100644
--- a/include/mupdf/fitz/image.h
+++ b/include/mupdf/fitz/image.h
@@ -147,7 +147,22 @@ typedef size_t (fz_image_get_size_fn)(fz_context *, fz_image *);
 	with the first sizeof(fz_image) bytes initialised as appropriate
 	given the supplied parameters, and the other bytes set to zero.
 */
-fz_image *fz_new_image_of_size(fz_context *ctx, int w, int h, int bpc, fz_colorspace *colorspace, int xres, int yres, int interpolate, int imagemask, float *decode, int *colorkey, fz_image *mask, int size, fz_image_get_pixmap_fn *get, fz_image_get_size_fn *get_size, fz_drop_image_fn *drop);
+fz_image *fz_new_image_of_size(fz_context *ctx,
+		int w,
+		int h,
+		int bpc,
+		fz_colorspace *colorspace,
+		int xres,
+		int yres,
+		int interpolate,
+		int imagemask,
+		float *decode,
+		int *colorkey,
+		fz_image *mask,
+		int size,
+		fz_image_get_pixmap_fn *get_pixmap,
+		fz_image_get_size_fn *get_size,
+		fz_drop_image_fn *drop);
 
 #define fz_new_derived_image(CTX,W,H,B,CS,X,Y,I,IM,D,C,M,T,G,S,Z) \
 	((T*)Memento_label(fz_new_image_of_size(CTX,W,H,B,CS,X,Y,I,IM,D,C,M,sizeof(T),G,S,Z),#T))
diff --git a/include/mupdf/fitz/shade.h b/include/mupdf/fitz/shade.h
index 1665fd1a..51130dce 100644
--- a/include/mupdf/fitz/shade.h
+++ b/include/mupdf/fitz/shade.h
@@ -183,6 +183,8 @@ typedef void (fz_shade_process_fn)(fz_context *ctx, void *arg, fz_vertex *av, fz
 	to callback functions.
 */
 void fz_process_shade(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm,
-			fz_shade_prepare_fn *prepare, fz_shade_process_fn *process, void *process_arg);
+			fz_shade_prepare_fn *prepare,
+			fz_shade_process_fn *process,
+			void *process_arg);
 
 #endif
diff --git a/include/mupdf/fitz/writer.h b/include/mupdf/fitz/writer.h
index a4944b6a..f16334fc 100644
--- a/include/mupdf/fitz/writer.h
+++ b/include/mupdf/fitz/writer.h
@@ -65,8 +65,11 @@ struct fz_document_writer_s
 	structure's function pointers populated correctly, and the extra
 	space zero initialised.
 */
-fz_document_writer *fz_new_document_writer_of_size(fz_context *ctx, size_t size, fz_document_writer_begin_page_fn *begin_page,
-	fz_document_writer_end_page_fn *end_page, fz_document_writer_close_writer_fn *close, fz_document_writer_drop_writer_fn *drop);
+fz_document_writer *fz_new_document_writer_of_size(fz_context *ctx, size_t size,
+		fz_document_writer_begin_page_fn *begin_page,
+		fz_document_writer_end_page_fn *end_page,
+		fz_document_writer_close_writer_fn *close,
+		fz_document_writer_drop_writer_fn *drop);
 
 #define fz_new_derived_document_writer(CTX,TYPE,BEGIN_PAGE,END_PAGE,CLOSE,DROP) \
 	((TYPE *)Memento_label(fz_new_document_writer_of_size(CTX,sizeof(TYPE),BEGIN_PAGE,END_PAGE,CLOSE,DROP),#TYPE))
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 0c3f61e9..e75823a6 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -186,9 +186,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 = (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->image = fz_new_image_from_buffer(ctx, buf);
 	}
 	fz_always(ctx)
@@ -219,10 +219,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 = (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;
 
 	fz_try(ctx)
 	{
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index 8d93d881..d2dd7d19 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -73,9 +73,9 @@ 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 = (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->image = fz_keep_image(ctx, doc->image);
 
@@ -95,10 +95,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 = (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->image = fz_keep_image(ctx, image);
 
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index 82420090..c9dd2fb1 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -77,9 +77,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 = (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->image = fz_keep_image(ctx, image);
 	}
 	fz_always(ctx)
@@ -123,10 +123,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 = (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;
 
 	fz_try(ctx)
 	{
diff --git a/source/fitz/context.c b/source/fitz/context.c
index d0326270..7ab1fefb 100644
--- a/source/fitz/context.c
+++ b/source/fitz/context.c
@@ -98,8 +98,8 @@ static void fz_new_tuning_context(fz_context *ctx)
 	{
 		ctx->tuning = fz_malloc_struct(ctx, fz_tuning_context);
 		ctx->tuning->refs = 1;
-		ctx->tuning->image_decode = &fz_default_image_decode;
-		ctx->tuning->image_scale = &fz_default_image_scale;
+		ctx->tuning->image_decode = fz_default_image_decode;
+		ctx->tuning->image_scale = fz_default_image_scale;
 	}
 }
 
diff --git a/source/fitz/draw-mesh.c b/source/fitz/draw-mesh.c
index 846e6bbc..cbce5dbf 100644
--- a/source/fitz/draw-mesh.c
+++ b/source/fitz/draw-mesh.c
@@ -251,7 +251,7 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, const fz_matrix *ctm, fz_pixmap
 		ptd.bbox = bbox;
 
 		fz_init_cached_color_converter(ctx, &ptd.cc, temp->colorspace, shade->colorspace);
-		fz_process_shade(ctx, shade, &local_ctm, &prepare_mesh_vertex, &do_paint_tri, &ptd);
+		fz_process_shade(ctx, shade, &local_ctm, prepare_mesh_vertex, &do_paint_tri, &ptd);
 
 		if (shade->use_function)
 		{
diff --git a/source/fitz/fitz-imp.h b/source/fitz/fitz-imp.h
index 6cf488d1..d75e2242 100644
--- a/source/fitz/fitz-imp.h
+++ b/source/fitz/fitz-imp.h
@@ -68,8 +68,8 @@ struct fz_tuning_context_s
 	void *image_scale_arg;
 };
 
-fz_tune_image_decode_fn fz_default_image_decode;
-fz_tune_image_scale_fn fz_default_image_scale;
+void fz_default_image_decode(void *arg, int w, int h, int l2factor, fz_irect *subarea);
+int fz_default_image_scale(void *arg, int dst_w, int dst_h, int src_w, int src_h);
 
 fz_context *fz_clone_context_internal(fz_context *ctx);
 
diff --git a/source/fitz/font.c b/source/fitz/font.c
index 37d273ba..ebf66f45 100644
--- a/source/fitz/font.c
+++ b/source/fitz/font.c
@@ -197,9 +197,9 @@ struct fz_font_context_s
 	int ctx_refs;
 	FT_Library ftlib;
 	int ftlib_refs;
-	fz_load_system_font_fn load_font;
-	fz_load_system_cjk_font_fn load_cjk_font;
-	fz_load_system_fallback_font_fn load_fallback_font;
+	fz_load_system_font_fn *load_font;
+	fz_load_system_cjk_font_fn *load_cjk_font;
+	fz_load_system_fallback_font_fn *load_fallback_font;
 
 	/* Cached fallback fonts */
 	struct { fz_font *serif, *sans; } fallback[256];
@@ -257,9 +257,9 @@ void fz_drop_font_context(fz_context *ctx)
 }
 
 void fz_install_load_system_font_funcs(fz_context *ctx,
-		fz_load_system_font_fn f,
-		fz_load_system_cjk_font_fn f_cjk,
-		fz_load_system_fallback_font_fn f_back)
+		fz_load_system_font_fn *f,
+		fz_load_system_cjk_font_fn *f_cjk,
+		fz_load_system_fallback_font_fn *f_back)
 {
 	ctx->font->load_font = f;
 	ctx->font->load_cjk_font = f_cjk;
diff --git a/source/fitz/halftone.c b/source/fitz/halftone.c
index ff7e9cb1..65dbcf07 100644
--- a/source/fitz/halftone.c
+++ b/source/fitz/halftone.c
@@ -542,10 +542,10 @@ fz_bitmap *fz_new_bitmap_from_pixmap_band(fz_context *ctx, fz_pixmap *pix, fz_ha
 	switch(n)
 	{
 	case 1:
-		thresh = &do_threshold_1;
+		thresh = do_threshold_1;
 		break;
 	case 4:
-		thresh = &do_threshold_4;
+		thresh = do_threshold_4;
 		break;
 	default:
 		fz_throw(ctx, FZ_ERROR_GENERIC, "pixmap must be grayscale or CMYK to convert to bitmap");
diff --git a/source/fitz/hash.c b/source/fitz/hash.c
index 245ebbd8..fa7ce93f 100644
--- a/source/fitz/hash.c
+++ b/source/fitz/hash.c
@@ -26,7 +26,7 @@ struct fz_hash_table_s
 	int size;
 	int load;
 	int lock; /* -1 or the lock used to protect this hash table */
-	fz_hash_table_drop_fn drop_val;
+	fz_hash_table_drop_fn *drop_val;
 	fz_hash_entry *ents;
 };
 
@@ -47,7 +47,7 @@ static unsigned hash(const unsigned char *s, int len)
 }
 
 fz_hash_table *
-fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_hash_table_drop_fn drop_val)
+fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_hash_table_drop_fn *drop_val)
 {
 	fz_hash_table *table;
 
@@ -283,7 +283,7 @@ fz_hash_remove(fz_context *ctx, fz_hash_table *table, const void *key)
 }
 
 void
-fz_hash_for_each(fz_context *ctx, fz_hash_table *table, void *state, fz_hash_table_for_each_fn callback)
+fz_hash_for_each(fz_context *ctx, fz_hash_table *table, void *state, fz_hash_table_for_each_fn *callback)
 {
 	int i;
 	for (i = 0; i < table->size; ++i)
diff --git a/source/fitz/image.c b/source/fitz/image.c
index cedb0180..8495098e 100644
--- a/source/fitz/image.c
+++ b/source/fitz/image.c
@@ -754,8 +754,10 @@ fz_new_image_from_pixmap(fz_context *ctx, fz_pixmap *pixmap, fz_image *mask)
 fz_image *
 fz_new_image_of_size(fz_context *ctx, int w, int h, int bpc, fz_colorspace *colorspace,
 		int xres, int yres, int interpolate, int imagemask, float *decode,
-		int *colorkey, fz_image *mask, int size, fz_image_get_pixmap_fn *get,
-		fz_image_get_size_fn *get_size, fz_drop_image_fn *drop)
+		int *colorkey, fz_image *mask, int size,
+		fz_image_get_pixmap_fn *get_pixmap,
+		fz_image_get_size_fn *get_size,
+		fz_drop_image_fn *drop)
 {
 	fz_image *image;
 	int i;
@@ -766,7 +768,7 @@ fz_new_image_of_size(fz_context *ctx, int w, int h, int bpc, fz_colorspace *colo
 	image = Memento_label(fz_calloc(ctx, 1, size), "fz_image");
 	FZ_INIT_KEY_STORABLE(image, 1, fz_drop_image_imp);
 	image->drop_image = drop;
-	image->get_pixmap = get;
+	image->get_pixmap = get_pixmap;
 	image->get_size = get_size;
 	image->w = w;
 	image->h = h;
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
index 0b28e282..26d821f2 100644
--- a/source/html/html-layout.c
+++ b/source/html/html-layout.c
@@ -2620,7 +2620,7 @@ detect_flow_directionality(fz_context *ctx, fz_pool *pool, uni_buf *buffer, fz_b
 		data.pool = pool;
 		data.flow = flow;
 		data.buffer = buffer;
-		fz_bidi_fragment_text(ctx, buffer->data, buffer->len, &bidi_dir, &fragment_cb, &data, 0 /* Flags */);
+		fz_bidi_fragment_text(ctx, buffer->data, buffer->len, &bidi_dir, fragment_cb, &data, 0 /* Flags */);
 	}
 	return bidi_dir;
 }
diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c
index 39792c70..f18204fa 100644
--- a/source/pdf/pdf-page.c
+++ b/source/pdf/pdf-page.c
@@ -658,12 +658,12 @@ pdf_new_page(fz_context *ctx, pdf_document *doc)
 
 	page->doc = (pdf_document*) fz_keep_document(ctx, &doc->super);
 
-	page->super.drop_page = (fz_page_drop_page_fn *)pdf_drop_page_imp;
-	page->super.load_links = (fz_page_load_links_fn *)pdf_load_links;
-	page->super.bound_page = (fz_page_bound_page_fn *)pdf_bound_page;
-	page->super.first_annot = (fz_page_first_annot_fn *)pdf_first_annot;
-	page->super.run_page_contents = (fz_page_run_page_contents_fn *)pdf_run_page_contents;
-	page->super.page_presentation = (fz_page_page_presentation_fn *)pdf_page_presentation;
+	page->super.drop_page = (fz_page_drop_page_fn*)pdf_drop_page_imp;
+	page->super.load_links = (fz_page_load_links_fn*)pdf_load_links;
+	page->super.bound_page = (fz_page_bound_page_fn*)pdf_bound_page;
+	page->super.first_annot = (fz_page_first_annot_fn*)pdf_first_annot;
+	page->super.run_page_contents = (fz_page_run_page_contents_fn*)pdf_run_page_contents;
+	page->super.page_presentation = (fz_page_page_presentation_fn*)pdf_page_presentation;
 
 	page->obj = NULL;
 
diff --git a/source/pdf/pdf-resources.c b/source/pdf/pdf-resources.c
index 024beae3..f3b71e23 100644
--- a/source/pdf/pdf-resources.c
+++ b/source/pdf/pdf-resources.c
@@ -77,7 +77,7 @@ pdf_find_image_resource(fz_context *ctx, pdf_document *doc, fz_image *item, unsi
 
 	if (!doc->resources.images)
 	{
-		doc->resources.images = fz_new_hash_table(ctx, 4096, 16, -1, (fz_hash_table_drop_fn)pdf_drop_obj);
+		doc->resources.images = fz_new_hash_table(ctx, 4096, 16, -1, (fz_hash_table_drop_fn*)pdf_drop_obj);
 		pdf_preload_image_resources(ctx, doc);
 	}
 
@@ -111,7 +111,7 @@ pdf_find_font_resource(fz_context *ctx, pdf_document *doc, fz_buffer *item, unsi
 	pdf_obj *res;
 
 	if (!doc->resources.fonts)
-		doc->resources.fonts = fz_new_hash_table(ctx, 4096, 16, -1, (fz_hash_table_drop_fn)pdf_drop_obj);
+		doc->resources.fonts = fz_new_hash_table(ctx, 4096, 16, -1, (fz_hash_table_drop_fn*)pdf_drop_obj);
 
 	/* Create md5 and see if we have the item in our table */
 	fz_md5_buffer(ctx, item, digest);
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
index 2b1513fe..2d046bbe 100644
--- a/source/pdf/pdf-xref.c
+++ b/source/pdf/pdf-xref.c
@@ -2217,15 +2217,15 @@ pdf_new_document(fz_context *ctx, fz_stream *file)
 {
 	pdf_document *doc = fz_new_derived_document(ctx, pdf_document);
 
-	doc->super.drop_document = (fz_document_drop_fn *)pdf_drop_document_imp;
-	doc->super.needs_password = (fz_document_needs_password_fn *)pdf_needs_password;
-	doc->super.authenticate_password = (fz_document_authenticate_password_fn *)pdf_authenticate_password;
-	doc->super.has_permission = (fz_document_has_permission_fn *)pdf_has_permission;
-	doc->super.load_outline = (fz_document_load_outline_fn *)pdf_load_outline;
-	doc->super.resolve_link = (fz_document_resolve_link_fn *)pdf_resolve_link;
-	doc->super.count_pages = (fz_document_count_pages_fn *)pdf_count_pages;
-	doc->super.load_page = (fz_document_load_page_fn *)pdf_load_page;
-	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)pdf_lookup_metadata;
+	doc->super.drop_document = (fz_document_drop_fn*)pdf_drop_document_imp;
+	doc->super.needs_password = (fz_document_needs_password_fn*)pdf_needs_password;
+	doc->super.authenticate_password = (fz_document_authenticate_password_fn*)pdf_authenticate_password;
+	doc->super.has_permission = (fz_document_has_permission_fn*)pdf_has_permission;
+	doc->super.load_outline = (fz_document_load_outline_fn*)pdf_load_outline;
+	doc->super.resolve_link = (fz_document_resolve_link_fn*)pdf_resolve_link;
+	doc->super.count_pages = (fz_document_count_pages_fn*)pdf_count_pages;
+	doc->super.load_page = (fz_document_load_page_fn*)pdf_load_page;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn*)pdf_lookup_metadata;
 	doc->update_appearance = pdf_update_appearance;
 
 	pdf_lexbuf_init(ctx, &doc->lexbuf.base, PDF_LEXBUF_LARGE);
@@ -2610,17 +2610,17 @@ pdf_obj *pdf_progressive_advance(fz_context *ctx, pdf_document *doc, int pagenum
 
 pdf_document *pdf_document_from_fz_document(fz_context *ctx, fz_document *ptr)
 {
-	return (pdf_document *)((ptr && ptr->count_pages == (void*)pdf_count_pages) ? ptr : NULL);
+	return (pdf_document *)((ptr && ptr->count_pages == (fz_document_count_pages_fn*)pdf_count_pages) ? ptr : NULL);
 }
 
 pdf_page *pdf_page_from_fz_page(fz_context *ctx, fz_page *ptr)
 {
-	return (pdf_page *)((ptr && ptr->bound_page == (void*)pdf_bound_page) ? ptr : NULL);
+	return (pdf_page *)((ptr && ptr->bound_page == (fz_page_bound_page_fn*)pdf_bound_page) ? ptr : NULL);
 }
 
 pdf_annot *pdf_annot_from_fz_annot(fz_context *ctx, fz_annot *ptr)
 {
-	return (pdf_annot *)((ptr && ptr->bound_annot == (void*)pdf_bound_annot) ? ptr : NULL);
+	return (pdf_annot *)((ptr && ptr->bound_annot == (fz_annot_bound_fn*)pdf_bound_annot) ? ptr : NULL);
 }
 
 pdf_document *pdf_specifics(fz_context *ctx, fz_document *doc)
@@ -2740,8 +2740,8 @@ static const char *pdf_mimetypes[] =
 fz_document_handler pdf_document_handler =
 {
 	NULL,
-	(fz_document_open_fn *) pdf_open_document,
-	(fz_document_open_with_stream_fn *) pdf_open_document_with_stream,
+	(fz_document_open_fn*)pdf_open_document,
+	(fz_document_open_with_stream_fn*)pdf_open_document_with_stream,
 	pdf_extensions,
 	pdf_mimetypes
 };
diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c
index 95be593f..c4034d48 100644
--- a/source/xps/xps-doc.c
+++ b/source/xps/xps-doc.c
@@ -421,10 +421,10 @@ xps_load_page(fz_context *ctx, xps_document *doc, int number)
 			fz_try(ctx)
 			{
 				page = fz_new_derived_page(ctx, xps_page);
-				page->super.load_links = (fz_page_load_links_fn *)xps_load_links;
-				page->super.bound_page = (fz_page_bound_page_fn *)xps_bound_page;
-				page->super.run_page_contents = (fz_page_run_page_contents_fn *)xps_run_page;
-				page->super.drop_page = (fz_page_drop_page_fn *)xps_drop_page_imp;
+				page->super.load_links = (fz_page_load_links_fn*)xps_load_links;
+				page->super.bound_page = (fz_page_bound_page_fn*)xps_bound_page;
+				page->super.run_page_contents = (fz_page_run_page_contents_fn*)xps_run_page;
+				page->super.drop_page = (fz_page_drop_page_fn*)xps_drop_page_imp;
 
 				page->doc = (xps_document*) fz_keep_document(ctx, &doc->super);
 				page->fix = fix;
@@ -469,8 +469,8 @@ static const char *xps_mimetypes[] =
 fz_document_handler xps_document_handler =
 {
 	xps_recognize,
-	(fz_document_open_fn *) xps_open_document,
-	(fz_document_open_with_stream_fn *) xps_open_document_with_stream,
+	(fz_document_open_fn*)xps_open_document,
+	(fz_document_open_with_stream_fn*)xps_open_document_with_stream,
 	xps_extensions,
 	xps_mimetypes
 };
diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c
index 83de8ac4..5efccab4 100644
--- a/source/xps/xps-zip.c
+++ b/source/xps/xps-zip.c
@@ -219,10 +219,10 @@ static void
 xps_init_document(fz_context *ctx, xps_document *doc)
 {
 	doc->super.refs = 1;
-	doc->super.drop_document = (fz_document_drop_fn *)xps_drop_document;
-	doc->super.load_outline = (fz_document_load_outline_fn *)xps_load_outline;
-	doc->super.resolve_link = (fz_document_resolve_link_fn *)xps_lookup_link_target;
-	doc->super.count_pages = (fz_document_count_pages_fn *)xps_count_pages;
-	doc->super.load_page = (fz_document_load_page_fn *)xps_load_page;
-	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn *)xps_lookup_metadata;
+	doc->super.drop_document = (fz_document_drop_fn*)xps_drop_document;
+	doc->super.load_outline = (fz_document_load_outline_fn*)xps_load_outline;
+	doc->super.resolve_link = (fz_document_resolve_link_fn*)xps_lookup_link_target;
+	doc->super.count_pages = (fz_document_count_pages_fn*)xps_count_pages;
+	doc->super.load_page = (fz_document_load_page_fn*)xps_load_page;
+	doc->super.lookup_metadata = (fz_document_lookup_metadata_fn*)xps_lookup_metadata;
 }