diff options
author | Thomas White <taw@bitwiz.org.uk> | 2014-09-19 23:35:12 +0200 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2014-09-19 23:35:12 +0200 |
commit | 6d3ba40ba7fc98e384e5ee5ca7d90832dde89c1e (patch) | |
tree | 569195a9cae03b0abee0ab91c021964aeb473137 /src/render.c | |
parent | c5068cb535c9088c0051917fe001564aa936deaf (diff) | |
parent | 2112709182f800d70ff2dc8374fcb337bcc89f27 (diff) |
Merge branch 'stylecascade' of ssh://git.bitwiz.org.uk/colloquium into stylecascade
Diffstat (limited to 'src/render.c')
-rw-r--r-- | src/render.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/render.c b/src/render.c index f42d2cc..db41402 100644 --- a/src/render.c +++ b/src/render.c @@ -327,7 +327,7 @@ void free_render_buffers_except_thumb(struct slide *s) static void render_slide_to_surface(struct slide *s, cairo_surface_t *surf, cairo_t *cr, enum is_size isz, - double scale, double w, double h, + double scale, ImageStore *is, int slide_number) { PangoFontMap *fontmap; @@ -337,7 +337,8 @@ static void render_slide_to_surface(struct slide *s, cairo_surface_t *surf, cairo_scale(cr, scale, scale); - cairo_rectangle(cr, 0.0, 0.0, w, h); + cairo_rectangle(cr, 0.0, 0.0, + s->parent->slide_width, s->parent->slide_height); cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); cairo_fill(cr); @@ -402,7 +403,7 @@ cairo_surface_t *render_slide(struct slide *s, int w, double ww, double hh, surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h); cr = cairo_create(surf); - render_slide_to_surface(s, surf, cr, isz, scale, w, h, is, + render_slide_to_surface(s, surf, cr, isz, scale, is, slide_number); cairo_destroy(cr); return surf; @@ -447,7 +448,7 @@ int export_pdf(struct presentation *p, const char *filename) s->top->h = w*r; render_slide_to_surface(s, surf, cr, ISZ_SLIDESHOW, scale, - w, w*r, p->is, i); + p->is, i); cairo_restore(cr); |