Fix warnings/errors on unix builds.

Fix warnings/errors thrown up by the last few commits (which were
only tested on windows).

13 files changed, 25 insertions, 23 deletions

diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index bfa5f3b1..4dfbd461 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -148,12 +148,6 @@ void closexref(void)
 		psobj = NULL;
 		psobjs = 0;
 	}
-
-	if (xref && xref->store)
-	{
-		pdf_free_store(ctx, xref->store);
-		xref->store = NULL;
-	}
 }
 
 static void
@@ -973,7 +967,7 @@ int main(int argc, char **argv)
 	if (fz_optind == argc)
 		infousage();
 
-	ctx = fz_new_context(&fz_alloc_default);
+	ctx = fz_new_context(&fz_alloc_default, 256<<20);
 	if (!ctx)
 	{
 		fprintf(stderr, "cannot initialise context\n");
diff --git a/apps/x11_main.c b/apps/x11_main.c
index 23649a57..1020350f 100644
--- a/apps/x11_main.c
+++ b/apps/x11_main.c
@@ -587,7 +587,7 @@ int main(int argc, char **argv)
 	struct timeval tmo;
 	struct timeval *timeout;
 
-	ctx = fz_new_context(&fz_alloc_default);
+	ctx = fz_new_context(&fz_alloc_default, 256<<20);
 	if (!ctx)
 	{
 		fprintf(stderr, "cannot initialise context\n");
diff --git a/fitz/fitz.h b/fitz/fitz.h
index aad4b9a2..4989b22f 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -499,7 +499,7 @@ typedef struct fz_storable_s fz_storable;
 
 typedef struct fz_item_s fz_item;
 
-typedef void (fz_store_free_fn)(fz_context *, void *);
+typedef void (fz_store_free_fn)(fz_context *, fz_storable *);
 
 struct fz_storable_s {
 	int refs;
@@ -703,7 +703,7 @@ fz_pixmap *fz_new_pixmap_with_rect_and_data(fz_context *ctx, fz_colorspace *, fz
 fz_pixmap *fz_new_pixmap(fz_context *ctx, fz_colorspace *, int w, int h);
 fz_pixmap *fz_keep_pixmap(fz_pixmap *pix);
 void fz_drop_pixmap(fz_context *ctx, fz_pixmap *pix);
-void fz_free_pixmap_imp(fz_context *ctx, void *pix);
+void fz_free_pixmap_imp(fz_context *ctx, fz_storable *pix);
 void fz_clear_pixmap(fz_pixmap *pix);
 void fz_clear_pixmap_with_color(fz_pixmap *pix, int value);
 void fz_clear_pixmap_rect_with_color(fz_pixmap *pix, int value, fz_bbox r);
@@ -791,7 +791,7 @@ struct fz_colorspace_s
 fz_colorspace *fz_new_colorspace(fz_context *ctx, char *name, int n);
 fz_colorspace *fz_keep_colorspace(fz_colorspace *colorspace);
 void fz_drop_colorspace(fz_context *ctx, fz_colorspace *colorspace);
-void fz_free_colorspace_imp(fz_context *ctx, void *colorspace);
+void fz_free_colorspace_imp(fz_context *ctx, fz_storable *colorspace);
 
 void fz_convert_color(fz_context *ctx, fz_colorspace *srcs, float *srcv, fz_colorspace *dsts, float *dstv);
 void fz_convert_pixmap(fz_context *ctx, fz_pixmap *src, fz_pixmap *dst);
@@ -990,7 +990,7 @@ struct fz_shade_s
 
 fz_shade *fz_keep_shade(fz_shade *shade);
 void fz_drop_shade(fz_context *ctx, fz_shade *shade);
-void fz_free_shade_imp(fz_context *ctx, void *shade);
+void fz_free_shade_imp(fz_context *ctx, fz_storable *shade);
 void fz_debug_shade(fz_shade *shade);
 
 fz_rect fz_bound_shade(fz_shade *shade, fz_matrix ctm);
diff --git a/fitz/res_colorspace.c b/fitz/res_colorspace.c
index 8f145658..8c95f6a4 100644
--- a/fitz/res_colorspace.c
+++ b/fitz/res_colorspace.c
@@ -3,7 +3,7 @@
 #define SLOWCMYK
 
 void
-fz_free_colorspace_imp(fz_context *ctx, void *cs_)
+fz_free_colorspace_imp(fz_context *ctx, fz_storable *cs_)
 {
 	fz_colorspace *cs = (fz_colorspace *)cs_;
 
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index 0f6e192d..a9a89f9f 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -13,9 +13,11 @@ fz_drop_pixmap(fz_context *ctx, fz_pixmap *pix)
 }
 
 void
-fz_free_pixmap_imp(fz_context *ctx, fz_pixmap *pix)
+fz_free_pixmap_imp(fz_context *ctx, fz_storable *pix_)
 {
-	if (pix->mask)
+	fz_pixmap *pix = (fz_pixmap *)pix_;
+
+        if (pix->mask)
 		fz_drop_pixmap(ctx, pix->mask);
 	if (pix->colorspace)
 		fz_drop_colorspace(ctx, pix->colorspace);
diff --git a/fitz/res_shade.c b/fitz/res_shade.c
index c2a8c858..d619dc18 100644
--- a/fitz/res_shade.c
+++ b/fitz/res_shade.c
@@ -7,7 +7,7 @@ fz_keep_shade(fz_shade *shade)
 }
 
 void
-fz_free_shade_imp(fz_context *ctx, void *shade_)
+fz_free_shade_imp(fz_context *ctx, fz_storable *shade_)
 {
 	fz_shade *shade = (fz_shade *)shade_;
 
diff --git a/fitz/res_store.c b/fitz/res_store.c
index 6c1c628d..0b303982 100644
--- a/fitz/res_store.c
+++ b/fitz/res_store.c
@@ -410,7 +410,7 @@ int fz_store_scavenge(fz_context *ctx, unsigned int size, int *phase)
 			max = store->max / 16 * (16 - *phase);
 		else
 			max = store->size / (16 - *phase) * (15 - *phase);
-		*phase++;
+		(*phase)++;
 
 		if (size + store->size > max)
 			if (scavenge(ctx, size + store->size - max))
diff --git a/pdf/mupdf.h b/pdf/mupdf.h
index 890e9f8b..7db1ca36 100644
--- a/pdf/mupdf.h
+++ b/pdf/mupdf.h
@@ -264,7 +264,7 @@ struct pdf_cmap_s
 pdf_cmap *pdf_new_cmap(fz_context *ctx);
 pdf_cmap *pdf_keep_cmap(pdf_cmap *cmap);
 void pdf_drop_cmap(fz_context *ctx, pdf_cmap *cmap);
-void pdf_free_cmap_imp(fz_context *ctx, void *cmap);
+void pdf_free_cmap_imp(fz_context *ctx, fz_storable *cmap);
 unsigned int pdf_cmap_size(pdf_cmap *cmap);
 
 void pdf_debug_cmap(pdf_cmap *cmap);
diff --git a/pdf/pdf_cmap.c b/pdf/pdf_cmap.c
index b92f616e..86d51b32 100644
--- a/pdf/pdf_cmap.c
+++ b/pdf/pdf_cmap.c
@@ -31,7 +31,7 @@
  */
 
 void
-pdf_free_cmap_imp(fz_context *ctx, void *cmap_)
+pdf_free_cmap_imp(fz_context *ctx, fz_storable *cmap_)
 {
 	pdf_cmap *cmap = (pdf_cmap *)cmap_;
 	if (cmap->usecmap)
diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
index da85b2dd..021bfcf9 100644
--- a/pdf/pdf_font.c
+++ b/pdf/pdf_font.c
@@ -315,8 +315,10 @@ pdf_drop_font(fz_context *ctx, pdf_font_desc *fontdesc)
 }
 
 static void
-pdf_free_font_imp(fz_context *ctx, pdf_font_desc *fontdesc)
+pdf_free_font_imp(fz_context *ctx, fz_storable *fontdesc_)
 {
+	pdf_font_desc *fontdesc = (pdf_font_desc *)fontdesc_;
+
 	if (fontdesc->font)
 		fz_drop_font(ctx, fontdesc->font);
 	if (fontdesc->encoding)
diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c
index 31221cb8..ae46e5ec 100644
--- a/pdf/pdf_function.c
+++ b/pdf/pdf_function.c
@@ -1307,7 +1307,7 @@ pdf_drop_function(fz_context *ctx, pdf_function *func)
 }
 
 static void
-pdf_free_function_imp(fz_context *ctx, void *func_)
+pdf_free_function_imp(fz_context *ctx, fz_storable *func_)
 {
 	pdf_function *func = (pdf_function *)func_;
 	int i;
diff --git a/pdf/pdf_pattern.c b/pdf/pdf_pattern.c
index da890079..d6ce5021 100644
--- a/pdf/pdf_pattern.c
+++ b/pdf/pdf_pattern.c
@@ -14,8 +14,10 @@ pdf_drop_pattern(fz_context *ctx, pdf_pattern *pat)
 }
 
 static void
-pdf_free_pattern_imp(fz_context *ctx, pdf_pattern *pat)
+pdf_free_pattern_imp(fz_context *ctx, fz_storable *pat_)
 {
+	pdf_pattern *pat = (pdf_pattern *)pat_;
+
 	if (pat->resources)
 		fz_drop_obj(pat->resources);
 	if (pat->contents)
diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c
index 913ded37..510860e3 100644
--- a/pdf/pdf_xobject.c
+++ b/pdf/pdf_xobject.c
@@ -14,8 +14,10 @@ pdf_drop_xobject(fz_context *ctx, pdf_xobject *xobj)
 }
 
 static void
-pdf_free_xobject_imp(fz_context *ctx, pdf_xobject *xobj)
+pdf_free_xobject_imp(fz_context *ctx, fz_storable *xobj_)
 {
+	pdf_xobject *xobj = (pdf_xobject *)xobj_;
+
 	if (xobj->colorspace)
 		fz_drop_colorspace(ctx, xobj->colorspace);
 	if (xobj->resources)