diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-03-10 03:22:18 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-03-10 03:22:18 +0000 |
| commit | b722c09c991306f5ce77a310195e9b1262547ef1 (patch) | |
| tree | 211d5440a0c784eddc7c1a4f0052c60b46c50d50 | |
| parent | 7f8184372a7db4ad9ac7b30ce892b61e3d375dac (diff) | |
| download | netpbm-mirror-b722c09c991306f5ce77a310195e9b1262547ef1.tar.gz netpbm-mirror-b722c09c991306f5ce77a310195e9b1262547ef1.tar.xz netpbm-mirror-b722c09c991306f5ce77a310195e9b1262547ef1.zip | |
Release 10.93.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4048 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/pnmtopng.c | 7 | ||||
| -rw-r--r-- | doc/HISTORY | 11 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index b7bd6d07..8ad21a6a 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -961,6 +961,8 @@ tryTransparentColor(FILE * const ifp, } } } + *singleColorIsTransP = singleColorIsTrans; + pnm_freerow(xelrow); } @@ -1468,9 +1470,14 @@ computeUnsortedAlphaPalette(FILE * const ifP, int row; xel * xelrow; unsigned int alphaColorPairCnt; + /* Number of different alpha/color pairs we've seen so far as we + iterate through the image. + */ cht = ppm_colorhisttocolorhash(chv, colors); + /* We have not seen any alphas of any color yet. */ + alphaColorPairCnt = 0; for (colorIndex = 0; colorIndex < colors; ++colorIndex) { alphasOfColor[colorIndex] = NULL; alphasOfColorCnt[colorIndex] = 0; diff --git a/doc/HISTORY b/doc/HISTORY index 76824787..dd608210 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,17 @@ Netpbm. CHANGE HISTORY -------------- +21.03.10 BJH Release 10.93.02 + + pnmtopng: fix incorrect transparency in output when requesting + transparency. Introduced after Netpbm 10.35 (August 2006) but + not after Netpbm 10.47 (June 2009). + + pnmtopng: fix buffer overrun or bogus "too many color/ + transparency pairs" failure when requesting transparency. + Introduced after Netpbm 10.26 (January 2005) but not after + Netpbm 10.35 (August 2006). + 21.03.07 BJH Release 10.93.01 pamscale: fix bogus "bad magic number" or similar failure most diff --git a/version.mk b/version.mk index 6bc0edfe..2d079536 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 93 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 |