Typedef function pointers consistently.

7 files changed, 21 insertions, 19 deletions

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;