diff options
| -rw-r--r-- | doc/HISTORY | 6 | ||||
| -rw-r--r-- | editor/pamscale.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 395c2c26..0c7b1913 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -12,12 +12,14 @@ not yet BJH Release 10.43.00 pnmnorm: adjust bvalue, wvalue when -bpercent and/or -wpercent would cause an overlap, instead of failing. + pamscale: fix PBM input + -nomix. + + pbmtext: remove meaningless "no output" from error messages. + pbm_loadbdffont(): handle zero size glyph. Affects pbmtext. pbmtext: fail properly if input contains no text. - pbmtext: remove meaningless "no output" from error messages. - pnmnorm: fix -colorvalue, -saturation, -keephues options. pnmnorm: fix resolution of conflicting -wpercent and -wvalue. diff --git a/editor/pamscale.c b/editor/pamscale.c index ad7c319b..4f205064 100644 --- a/editor/pamscale.c +++ b/editor/pamscale.c @@ -2049,6 +2049,9 @@ scaleWithoutMixing(const struct pam * const inpamP, int row; int rowInInput; + assert(outpamP->maxval == inpamP->maxval); + assert(outpamP->depth == inpamP->depth); + tuplerow = pnm_allocpamrow(inpamP); rowInInput = -1; @@ -2095,7 +2098,7 @@ main(int argc, char **argv ) { outpam = inpam; /* initial value */ outpam.file = stdout; - if (PNM_FORMAT_TYPE(inpam.format) == PBM_TYPE) { + if (PNM_FORMAT_TYPE(inpam.format) == PBM_TYPE && !cmdline.nomix) { outpam.format = PGM_TYPE; outpam.maxval = PGM_MAXMAXVAL; pm_message("promoting from PBM to PGM"); |