diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-11 02:25:17 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-11 02:25:17 +0000 |
| commit | 1a18acd6b6178ce81340c42143a36e789ba13c75 (patch) | |
| tree | 62f165a4a229f14ee079ee9a7abe0e6ced9068a3 | |
| parent | 6e629f983aa205c3eaa5f339f1c71bb5e7938049 (diff) | |
| download | netpbm-mirror-1a18acd6b6178ce81340c42143a36e789ba13c75.tar.gz netpbm-mirror-1a18acd6b6178ce81340c42143a36e789ba13c75.tar.xz netpbm-mirror-1a18acd6b6178ce81340c42143a36e789ba13c75.zip | |
Release 10.97.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4240 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/picttoppm.c | 6 | ||||
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | other/pamendian.c | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index 4bc53378..bf60748f 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -1393,7 +1393,7 @@ doDiffSize(struct Rect const srcRect, } } break; case 32: { - unsigned int const planeSize = srcwid / 4; + unsigned int const planeSize = rectwidth(&srcRect); unsigned int row; for (row = 0; row < rectheight(&srcRect); ++row) { @@ -1520,7 +1520,7 @@ doSameSize(transfer_func trf, } } break; case 32: { - unsigned int const planeSize = srcwid / 4; + unsigned int const planeSize = xsize; unsigned int rowNumber; for (rowNumber = 0; rowNumber < ysize; ++rowNumber) { @@ -1605,7 +1605,7 @@ blitIdempotent(unsigned int const pixSize, } } break; case 32: { - unsigned int const planeSize = srcwid / 4; + unsigned int const planeSize = xsize; unsigned int rowNumber; for (rowNumber = 0; rowNumber < ysize; ++rowNumber) { diff --git a/doc/HISTORY b/doc/HISTORY index b6e777b4..6093817a 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +not yet BJH Release 10.98.00 + + picttoppm: Fix incorrect output for 32 bit per pixel images + that have only 3 planes. Broken in Netpbm 10.34 (June 2006). + + pamendian: fix bogus "sample exceeds maxval" failure. + Introduced in Netpbm 10.66 (March 2014). + 21.12.27 BJH Release 10.97.00 Add pbnnoise. diff --git a/other/pamendian.c b/other/pamendian.c index d82ebd38..c24d9629 100644 --- a/other/pamendian.c +++ b/other/pamendian.c @@ -49,6 +49,8 @@ int main(int argc, char *argv[]) { intuplerow = pnm_allocpamrow(&inpam); outtuplerow = pnm_allocpamrow(&outpam); + inpam.maxval = 65535; + for (row = 0; row < inpam.height; row++) { unsigned int col; pnm_readpamrow(&inpam, intuplerow); diff --git a/version.mk b/version.mk index ba898559..41870e8a 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 97 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |