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 | |
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
-rw-r--r-- | Makefile.version | 2 | ||||
-rw-r--r-- | converter/other/pnmtopclxl.c | 4 | ||||
-rw-r--r-- | doc/HISTORY | 8 | ||||
-rw-r--r-- | editor/pnmremap.c | 7 |
4 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.version b/Makefile.version index f3089b29..d90042fb 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 24 +NETPBM_POINT_RELEASE = 25 diff --git a/converter/other/pnmtopclxl.c b/converter/other/pnmtopclxl.c index 79ee092c..fe4833d8 100644 --- a/converter/other/pnmtopclxl.c +++ b/converter/other/pnmtopclxl.c @@ -115,9 +115,9 @@ parseCommandLine(int argc, char ** argv, &cmdlineP->colorok, 0); OPTENT3(0, "center", OPT_FLAG, NULL, &cmdlineP->center, 0 ); - OPTENT3(0, "feeder", OPT_STRING, &cmdlineP->feeder, + OPTENT3(0, "feeder", OPT_UINT, &cmdlineP->feeder, &cmdlineP->feederSpec, 0); - OPTENT3(0, "outtray", OPT_STRING, &cmdlineP->outtray, + OPTENT3(0, "outtray", OPT_UINT, &cmdlineP->outtray, &cmdlineP->outtraySpec, 0); OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0); diff --git a/doc/HISTORY b/doc/HISTORY index 3ae17ed1..97f3fa80 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +07.03.23 BJH Release 10.35.25 + + pnmremap: fix incorrect output with map file deeper than + input file. + + Pnmtopclxl: fix -feeder, -outtray options. Thanks + "Eric K. Olson" <olson@mauicomputing.com>. + 07.03.09 BJH Release 10.35.24 libnetpbm: fix crash with PBM images < 8 columns on MMX/SSE 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[] ) { |