From ace5266b94dde5c90f3cc270abc1b698124fe343 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 22 Oct 2018 17:11:57 +0200 Subject: Remove struct print_stuff->{is,storename} --- src/print.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/print.c b/src/print.c index c50a3c5..18a083e 100644 --- a/src/print.c +++ b/src/print.c @@ -54,9 +54,6 @@ struct print_stuff struct frame *top; int start_paras[256]; int slide_number; - - ImageStore *is; - const char *storename; }; @@ -194,13 +191,11 @@ static void begin_narrative_print(GtkPrintOperation *op, GtkPrintContext *ctx, sc_callback_list_add_callback(cbl, "slide", print_create_thumbnail, print_render_thumbnail, NULL, ps); - ps->is = imagestore_new(ps->storename); - pc = gtk_print_context_create_pango_context(ctx); dummy_top = sc_block_new_parent(ps->p->scblocks, "presentation"); ps->top = interp_and_shape(dummy_top, ps->p->stylesheet, cbl, - ps->is, 0, pc, + ps->p->is, 0, pc, gtk_print_context_get_width(ctx), gtk_print_context_get_height(ctx), ps->p->lang); @@ -242,7 +237,7 @@ static void print_narrative(GtkPrintOperation *op, GtkPrintContext *ctx, h += paragraph_height(ps->top->paras[i]); if ( h > page_height ) return; - render_paragraph(cr, ps->top->paras[i], ps->is); + render_paragraph(cr, ps->top->paras[i], ps->p->is); cairo_translate(cr, 0.0, paragraph_height(ps->top->paras[i])); } -- cgit v1.2.3