diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-05-19 15:24:24 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-05-19 15:24:24 +0000 |
| commit | 8cc05633d24576a6ebce59cf7e1701a594b81957 (patch) | |
| tree | 884f64fecb0ed57520d34d30585e5eb12464934a /editor | |
| parent | bd0e223d1bfa19c1ed4997d37e27e22db94ed538 (diff) | |
| download | netpbm-mirror-8cc05633d24576a6ebce59cf7e1701a594b81957.tar.gz netpbm-mirror-8cc05633d24576a6ebce59cf7e1701a594b81957.tar.xz netpbm-mirror-8cc05633d24576a6ebce59cf7e1701a594b81957.zip | |
Fix PBM input + -nomix
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@628 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/pamscale.c | 5 |
1 files changed, 4 insertions, 1 deletions
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"); |