diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-11-08 13:05:11 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-11-08 13:05:50 +0000 |
| commit | 148341aff5bdc2678239383001328fa8010f2fe9 (patch) | |
| tree | 7e26812caa86c573a7398136354a2b059cae8d23 | |
| parent | 3119f69dd9536cdaab0719fba2898be894e8fc01 (diff) | |
| download | mupdf-148341aff5bdc2678239383001328fa8010f2fe9.tar.xz | |
Fix TGA banded operation.
Also, fix mudraw messages about what types can be banded.
| -rw-r--r-- | source/fitz/output-tga.c | 2 | ||||
| -rw-r--r-- | source/tools/mudraw.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/fitz/output-tga.c b/source/fitz/output-tga.c index 0e7a213c..20d9983e 100644 --- a/source/fitz/output-tga.c +++ b/source/fitz/output-tga.c @@ -125,7 +125,7 @@ tga_write_band(fz_context *ctx, fz_band_writer *writer_, int stride, int band_st int is_bgr = writer->is_bgr; int k; - for (k = 0; k < h; k++) + for (k = 0; k < band_height; k++) { int i, j; const unsigned char *line = samples + stride * k; diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c index 9477919e..6eba8825 100644 --- a/source/tools/mudraw.c +++ b/source/tools/mudraw.c @@ -327,7 +327,7 @@ static void usage(void) "\t-w -\twidth (in pixels) (maximum width if -r is specified)\n" "\t-h -\theight (in pixels) (maximum height if -r is specified)\n" "\t-f -\tfit width and/or height exactly; ignore original aspect ratio\n" - "\t-B -\tmaximum band_height (pgm, ppm, pam, png output only)\n" + "\t-B -\tmaximum band_height (pXm, pcl, pclm, ps, psd and png output only)\n" #ifndef DISABLE_MUTHREADS "\t-T -\tnumber of threads to use for rendering (banded mode only)\n" #else @@ -1693,9 +1693,9 @@ int mudraw_main(int argc, char **argv) if (band_height) { - if (output_format != OUT_PAM && output_format != OUT_PGM && output_format != OUT_PPM && output_format != OUT_PNM && output_format != OUT_PNG && output_format != OUT_PBM && output_format != OUT_PKM && output_format != OUT_PCL && output_format != OUT_PCLM && output_format != OUT_PS && output_format != OUT_PSD) + if (output_format != OUT_PAM && output_format != OUT_PGM && output_format != OUT_PPM && output_format != OUT_PNM && output_format != OUT_PNG && output_format != OUT_PBM && output_format != OUT_PKM && output_format != OUT_PCL && output_format != OUT_PCLM && output_format != OUT_PS && output_format != OUT_PSD && output_format != OUT_TGA) { - fprintf(stderr, "Banded operation only possible with PAM, PBM, PGM, PKM, PPM, PNM, PCL, PCLM, PS, PSD and PNG outputs\n"); + fprintf(stderr, "Banded operation only possible with PxM, PCL, PCLM, PS, PSD, PNG and TGA outputs\n"); exit(1); } if (showmd5) |