Use display list for type 3 glyphs.

We still need to have the callback for type 3 fonts that are uncacheable.
With this change the callback is only ever called directly from the
interpreter in fz_prepare_t3_glyph and fz_render_t3_glyph_direct.

2 files changed, 42 insertions, 15 deletions

diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h
index 914bed68..569fc694 100644
--- a/fitz/fitz-internal.h
+++ b/fitz/fitz-internal.h
@@ -1011,6 +1011,7 @@ struct fz_font_s
 	fz_matrix t3matrix;
 	void *t3resources;
 	fz_buffer **t3procs; /* has 256 entries if used */
+	fz_display_list **t3lists; /* has 256 entries if used */
 	float *t3widths; /* has 256 entries if used */
 	char *t3flags; /* has 256 entries if used */
 	void *t3doc; /* a pdf_document for the callback */
@@ -1157,6 +1158,7 @@ fz_pixmap *fz_render_ft_stroked_glyph(fz_context *ctx, fz_font *font, int gid, f
 fz_pixmap *fz_render_glyph(fz_context *ctx, fz_font*, int, fz_matrix, fz_colorspace *model, fz_bbox scissor);
 fz_pixmap *fz_render_stroked_glyph(fz_context *ctx, fz_font*, int, fz_matrix, fz_matrix, fz_stroke_state *stroke, fz_bbox scissor);
 void fz_render_t3_glyph_direct(fz_context *ctx, fz_device *dev, fz_font *font, int gid, fz_matrix trm, void *gstate);
+void fz_prepare_t3_glyph(fz_context *ctx, fz_font *font, int gid);
 
 /*
  * Text buffer.
diff --git a/fitz/res_font.c b/fitz/res_font.c
index b7304e55..32f2a89c 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -38,6 +38,7 @@ fz_new_font(fz_context *ctx, char *name, int use_glyph_bbox, int glyph_count)
 	font->t3matrix = fz_identity;
 	font->t3resources = NULL;
 	font->t3procs = NULL;
+	font->t3lists = NULL;
 	font->t3widths = NULL;
 	font->t3flags = NULL;
 	font->t3doc = NULL;
@@ -98,9 +99,14 @@ fz_drop_font(fz_context *ctx, fz_font *font)
 		if (font->t3resources)
 			font->t3freeres(font->t3doc, font->t3resources);
 		for (i = 0; i < 256; i++)
+		{
 			if (font->t3procs[i])
 				fz_drop_buffer(ctx, font->t3procs[i]);
+			if (font->t3lists[i])
+				fz_free_display_list(ctx, font->t3lists[i]);
+		}
 		fz_free(ctx, font->t3procs);
+		fz_free(ctx, font->t3lists);
 		fz_free(ctx, font->t3widths);
 		fz_free(ctx, font->t3flags);
 	}
@@ -815,6 +821,7 @@ fz_new_type3_font(fz_context *ctx, char *name, fz_matrix matrix)
 
 	font = fz_new_font(ctx, name, 1, 256);
 	font->t3procs = fz_malloc_array(ctx, 256, sizeof(fz_buffer*));
+	font->t3lists = fz_malloc_array(ctx, 256, sizeof(fz_display_list*));
 	font->t3widths = fz_malloc_array(ctx, 256, sizeof(float));
 	font->t3flags = fz_malloc_array(ctx, 256, sizeof(char));
 
@@ -822,6 +829,7 @@ fz_new_type3_font(fz_context *ctx, char *name, fz_matrix matrix)
 	for (i = 0; i < 256; i++)
 	{
 		font->t3procs[i] = NULL;
+		font->t3lists[i] = NULL;
 		font->t3widths[i] = 0;
 		font->t3flags[i] = 0;
 	}
@@ -829,21 +837,19 @@ fz_new_type3_font(fz_context *ctx, char *name, fz_matrix matrix)
 	return font;
 }
 
-static fz_rect
-fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm)
+void
+fz_prepare_t3_glyph(fz_context *ctx, fz_font *font, int gid)
 {
-	fz_matrix ctm;
-	void *contents;
-	fz_rect bounds;
-	fz_bbox bbox;
+	fz_buffer *contents;
 	fz_device *dev;
 
 	contents = font->t3procs[gid];
 	if (!contents)
-		return fz_transform_rect(trm, fz_empty_rect);
+		return;
 
-	ctm = fz_concat(font->t3matrix, trm);
-	dev = fz_new_bbox_device(ctx, &bbox);
+	font->t3lists[gid] = fz_new_display_list(ctx);
+
+	dev = fz_new_list_device(ctx, font->t3lists[gid]);
 	dev->flags = FZ_DEVFLAG_FILLCOLOR_UNDEFINED |
 			FZ_DEVFLAG_STROKECOLOR_UNDEFINED |
 			FZ_DEVFLAG_STARTCAP_UNDEFINED |
@@ -852,9 +858,28 @@ fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm)
 			FZ_DEVFLAG_LINEJOIN_UNDEFINED |
 			FZ_DEVFLAG_MITERLIMIT_UNDEFINED |
 			FZ_DEVFLAG_LINEWIDTH_UNDEFINED;
-	font->t3run(font->t3doc, font->t3resources, contents, dev, ctm, NULL);
+	font->t3run(font->t3doc, font->t3resources, contents, dev, fz_identity, NULL);
 	font->t3flags[gid] = dev->flags;
 	fz_free_device(dev);
+}
+
+static fz_rect
+fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm)
+{
+	fz_display_list *list;
+	fz_matrix ctm;
+	fz_rect bounds;
+	fz_bbox bbox;
+	fz_device *dev;
+
+	list = font->t3lists[gid];
+	if (!list)
+		return fz_transform_rect(trm, fz_empty_rect);
+
+	ctm = fz_concat(font->t3matrix, trm);
+	dev = fz_new_bbox_device(ctx, &bbox);
+	fz_run_display_list(list, dev, ctm, fz_infinite_bbox, NULL);
+	fz_free_device(dev);
 
 	bounds.x0 = bbox.x0;
 	bounds.y0 = bbox.y0;
@@ -866,8 +891,8 @@ fz_bound_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm)
 fz_pixmap *
 fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_colorspace *model, fz_bbox scissor)
 {
+	fz_display_list *list;
 	fz_matrix ctm;
-	void *contents;
 	fz_bbox bbox;
 	fz_device *dev;
 	fz_pixmap *glyph;
@@ -876,8 +901,8 @@ fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_co
 	if (gid < 0 || gid > 255)
 		return NULL;
 
-	contents = font->t3procs[gid];
-	if (!contents)
+	list = font->t3lists[gid];
+	if (!list)
 		return NULL;
 
 	if (font->t3flags[gid] & FZ_DEVFLAG_MASK)
@@ -910,7 +935,7 @@ fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_co
 
 	ctm = fz_concat(font->t3matrix, trm);
 	dev = fz_new_draw_device_type3(ctx, glyph);
-	font->t3run(font->t3doc, font->t3resources, contents, dev, ctm, NULL);
+	fz_run_display_list(list, dev, ctm, fz_infinite_bbox, NULL);
 	fz_free_device(dev);
 
 	if (!model)
@@ -991,7 +1016,7 @@ fz_bound_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm)
 		{
 			if (font->ft_face)
 				font->bbox_table[gid] = fz_bound_ft_glyph(ctx, font, gid, fz_identity);
-			else if (font->t3procs)
+			else if (font->t3lists)
 				font->bbox_table[gid] = fz_bound_t3_glyph(ctx, font, gid, fz_identity);
 			else
 				font->bbox_table[gid] = fz_empty_rect;