5 files changed, 34 insertions, 14 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))