diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-03-27 18:51:04 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-03-27 18:51:04 +0000 |
| commit | e722d4426fa43a12dcba8369808b28af4e38b526 (patch) | |
| tree | 258b7d8c8bdc28a3805348893179f3a9bece0e06 /converter | |
| parent | 70281e0860cc4ef71cd1f4c25a45f45bf2cbdb6d (diff) | |
| download | netpbm-mirror-e722d4426fa43a12dcba8369808b28af4e38b526.tar.gz netpbm-mirror-e722d4426fa43a12dcba8369808b28af4e38b526.tar.xz netpbm-mirror-e722d4426fa43a12dcba8369808b28af4e38b526.zip | |
Release 10.73.35
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@4072 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/pnmtopng.c | 7 | ||||
| -rw-r--r-- | converter/other/pnmtops.c | 4 | ||||
| -rw-r--r-- | converter/ppm/hpcdtoppm/Makefile | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 3899a9d2..009d8bb8 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -962,6 +962,8 @@ tryTransparentColor(FILE * const ifp, } } } + *singleColorIsTransP = singleColorIsTrans; + pnm_freerow(xelrow); } @@ -1469,9 +1471,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/converter/other/pnmtops.c b/converter/other/pnmtops.c index c1dadc3e..200c7520 100644 --- a/converter/other/pnmtops.c +++ b/converter/other/pnmtops.c @@ -1011,8 +1011,8 @@ validateComputableBoundingBox(float const scols, float const bbWidth = llx + scols + 0.5; float const bbHeight = lly + srows + 0.5; - if (bbHeight < INT_MIN || bbHeight > INT_MAX || - bbWidth < INT_MIN || bbWidth > INT_MAX) + if ((double)bbHeight < INT_MIN || (double)bbHeight > INT_MAX || + (double)bbWidth < INT_MIN || (double)bbWidth > INT_MAX) pm_error("Bounding box dimensions %.1f x %.1f are too large " "for computations. " "This probably means input image width, height, " diff --git a/converter/ppm/hpcdtoppm/Makefile b/converter/ppm/hpcdtoppm/Makefile index ddf79ee5..ede71a75 100644 --- a/converter/ppm/hpcdtoppm/Makefile +++ b/converter/ppm/hpcdtoppm/Makefile @@ -19,7 +19,7 @@ install: install.bin.local install.bin.local: $(PKGDIR)/bin # In June 2002, pcdovtoppm replaced pcdindex cd $(PKGDIR)/bin ; \ - $(SYMLINK) pcdindex$(EXE) pcdovtoppm$(EXE) + $(SYMLINK) pcdovtoppm pcdindex FORCE: |