Add context to mupdf.

Huge pervasive change to lots of files, adding a context for exception
handling and allocation.

In time we'll move more statics into there.

Also fix some for(i = 0; i < function(...); i++) calls.

1 files changed, 18 insertions, 18 deletions

diff --git a/draw/draw_glyph.c b/draw/draw_glyph.c
index 95f3955d..1d94f767 100644
--- a/draw/draw_glyph.c
+++ b/draw/draw_glyph.c
@@ -22,19 +22,19 @@ struct fz_glyph_key_s
 };
 
 fz_glyph_cache *
-fz_new_glyph_cache(void)
+fz_new_glyph_cache(fz_context *ctx)
 {
 	fz_glyph_cache *cache;
 
-	cache = fz_malloc(sizeof(fz_glyph_cache));
-	cache->hash = fz_new_hash_table(509, sizeof(fz_glyph_key));
+	cache = fz_malloc(ctx, sizeof(fz_glyph_cache));
+	cache->hash = fz_new_hash_table(ctx, 509, sizeof(fz_glyph_key));
 	cache->total = 0;
 
 	return cache;
 }
 
 static void
-fz_evict_glyph_cache(fz_glyph_cache *cache)
+fz_evict_glyph_cache(fz_context *ctx, fz_glyph_cache *cache)
 {
 	fz_glyph_key *key;
 	fz_pixmap *pixmap;
@@ -44,10 +44,10 @@ fz_evict_glyph_cache(fz_glyph_cache *cache)
 	{
 		key = fz_hash_get_key(cache->hash, i);
 		if (key->font)
-			fz_drop_font(key->font);
+			fz_drop_font(ctx, key->font);
 		pixmap = fz_hash_get_val(cache->hash, i);
 		if (pixmap)
-			fz_drop_pixmap(pixmap);
+			fz_drop_pixmap(ctx, pixmap);
 	}
 
 	cache->total = 0;
@@ -56,23 +56,23 @@ fz_evict_glyph_cache(fz_glyph_cache *cache)
 }
 
 void
-fz_free_glyph_cache(fz_glyph_cache *cache)
+fz_free_glyph_cache(fz_context *ctx, fz_glyph_cache *cache)
 {
-	fz_evict_glyph_cache(cache);
-	fz_free_hash(cache->hash);
-	fz_free(cache);
+	fz_evict_glyph_cache(ctx, cache);
+	fz_free_hash(ctx, cache->hash);
+	fz_free(ctx, cache);
 }
 
 fz_pixmap *
-fz_render_stroked_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix trm, fz_matrix ctm, fz_stroke_state *stroke)
+fz_render_stroked_glyph(fz_context *ctx, fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix trm, fz_matrix ctm, fz_stroke_state *stroke)
 {
 	if (font->ft_face)
-		return fz_render_ft_stroked_glyph(font, gid, trm, ctm, stroke);
-	return fz_render_glyph(cache, font, gid, trm, NULL);
+		return fz_render_ft_stroked_glyph(ctx, font, gid, trm, ctm, stroke);
+	return fz_render_glyph(ctx, cache, font, gid, trm, NULL);
 }
 
 fz_pixmap *
-fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix ctm, fz_colorspace *model)
+fz_render_glyph(fz_context *ctx, fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix ctm, fz_colorspace *model)
 {
 	fz_glyph_key key;
 	fz_pixmap *val;
@@ -104,11 +104,11 @@ fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix ctm, fz
 
 	if (font->ft_face)
 	{
-		val = fz_render_ft_glyph(font, gid, ctm);
+		val = fz_render_ft_glyph(ctx, font, gid, ctm);
 	}
 	else if (font->t3procs)
 	{
-		val = fz_render_t3_glyph(font, gid, ctm, model);
+		val = fz_render_t3_glyph(ctx, font, gid, ctm, model);
 	}
 	else
 	{
@@ -121,9 +121,9 @@ fz_render_glyph(fz_glyph_cache *cache, fz_font *font, int gid, fz_matrix ctm, fz
 		if (val->w < MAX_GLYPH_SIZE && val->h < MAX_GLYPH_SIZE)
 		{
 			if (cache->total + val->w * val->h > MAX_CACHE_SIZE)
-				fz_evict_glyph_cache(cache);
+				fz_evict_glyph_cache(ctx, cache);
 			fz_keep_font(key.font);
-			fz_hash_insert(cache->hash, &key, val);
+			fz_hash_insert(ctx, cache->hash, &key, val);
 			cache->total += val->w * val->h;
 			return fz_keep_pixmap(val);
 		}