diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-03-23 17:35:05 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-03-23 17:35:05 +0000 |
| commit | 22b7160c8fd79609d315e34def8a0573ba04eb21 (patch) | |
| tree | d896699e6d224d39c96545d67f11a0efadf86de3 /editor | |
| parent | 1ca92b339a0c65bfadab923c618863b71955c5be (diff) | |
| download | netpbm-mirror-22b7160c8fd79609d315e34def8a0573ba04eb21.tar.gz netpbm-mirror-22b7160c8fd79609d315e34def8a0573ba04eb21.tar.xz netpbm-mirror-22b7160c8fd79609d315e34def8a0573ba04eb21.zip | |
Release 10.35.25
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@250 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/pnmremap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/editor/pnmremap.c b/editor/pnmremap.c index 2102fe63..6e7651d8 100644 --- a/editor/pnmremap.c +++ b/editor/pnmremap.c @@ -743,8 +743,9 @@ copyRaster(struct pam * const inpamP, /* The following modify tuplerow, to make it consistent with *outpamP instead of *inpamP. */ - adjustDepth(inpamP, tuplerow, outpamP->depth); + assert(inpamP->allocation_depth >= outpamP->depth); pnm_scaletuplerow(inpamP, tuplerow, tuplerow, outpamP->maxval); + adjustDepth(inpamP, tuplerow, outpamP->depth); /* The following both consults and adds to 'colorhash' and its associated 'usehash'. It modifies 'tuplerow' too. @@ -764,7 +765,6 @@ copyRaster(struct pam * const inpamP, - static void remap(FILE * const ifP, const struct pam * const outpamCommonP, @@ -801,7 +801,7 @@ remap(FILE * const ifP, missingMethod, defaultColor, &missingCount); if (verbose) - pm_message("%d pixels not matched in color map", missingCount); + pm_message("%u pixels not matched in color map", missingCount); pnm_nextimage(ifP, &eof); } @@ -809,7 +809,6 @@ remap(FILE * const ifP, - int main(int argc, char * argv[] ) { |