From 4862df326a2ad2ad87da13b58d597f234e7f0922 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Thu, 26 May 2016 15:13:18 +0100 Subject: Bug 696803: Fix pam output. PAM output was broken in the absence of alpha. Fixed now. --- source/tools/mudraw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/tools') diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index b1ab97e9..4b3a6df2 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -854,9 +854,9 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in if (output) { if (output_format == OUT_PGM || output_format == OUT_PPM || output_format == OUT_PNM) - fz_write_pnm_header(ctx, out, pix->w, totalheight, pix->n); + fz_write_pnm_header(ctx, out, pix->w, totalheight, pix->n, pix->alpha); else if (output_format == OUT_PAM) - fz_write_pam_header(ctx, out, pix->w, totalheight, pix->n, savealpha); + fz_write_pam_header(ctx, out, pix->w, totalheight, pix->n, pix->alpha, savealpha); else if (output_format == OUT_PNG) poc = fz_write_png_header(ctx, out, pix->w, totalheight, pix->n, pix->alpha, savealpha); else if (output_format == OUT_PBM) @@ -890,9 +890,9 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in if (output) { if (output_format == OUT_PGM || output_format == OUT_PPM || output_format == OUT_PNM) - fz_write_pnm_band(ctx, out, pix->w, totalheight, pix->n, pix->stride, band, drawheight, pix->samples); + fz_write_pnm_band(ctx, out, pix->w, totalheight, pix->n, pix->alpha, pix->stride, band, drawheight, pix->samples); else if (output_format == OUT_PAM) - fz_write_pam_band(ctx, out, pix->w, totalheight, pix->n, pix->stride, band, drawheight, pix->samples, savealpha); + fz_write_pam_band(ctx, out, pix->w, totalheight, pix->n, pix->alpha, pix->stride, band, drawheight, pix->samples, savealpha); else if (output_format == OUT_PNG) fz_write_png_band(ctx, out, poc, pix->stride, band, drawheight, pix->samples); else if (output_format == OUT_PWG) -- cgit v1.2.3