diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-03-23 17:42:33 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-03-23 17:42:33 +0000 |
| commit | b7f956fd3d90224c988299f64a0e0185792d358f (patch) | |
| tree | 3d371551fc74c882b8fc3c7bc3dd76d519b99562 | |
| parent | 71c20fe12a4c0b6720e2d7e5798396be0589d96a (diff) | |
| download | netpbm-mirror-b7f956fd3d90224c988299f64a0e0185792d358f.tar.gz netpbm-mirror-b7f956fd3d90224c988299f64a0e0185792d358f.tar.xz netpbm-mirror-b7f956fd3d90224c988299f64a0e0185792d358f.zip | |
Release 10.37.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@251 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 bc174237..6d3a1b47 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 37 -NETPBM_POINT_RELEASE = 04 +NETPBM_POINT_RELEASE = 05 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 f63be0aa..9f6593bb 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +07.03.23 BJH Release 10.37.05 + + 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.37.04 pamtogif: fix crash with -mapfile. diff --git a/editor/pnmremap.c b/editor/pnmremap.c index e9466fe5..0260839a 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[] ) { |