diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-22 19:01:08 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2022-01-22 19:01:08 +0000 |
| commit | 00e73ee5efa865643eaad76565c7375f3fa834be (patch) | |
| tree | d2623539a08941402dc17f14d9183b50b8509e34 /converter | |
| parent | 64f542175bd276397a333b73397ac3e2d7effaf3 (diff) | |
| download | netpbm-mirror-00e73ee5efa865643eaad76565c7375f3fa834be.tar.gz netpbm-mirror-00e73ee5efa865643eaad76565c7375f3fa834be.tar.xz netpbm-mirror-00e73ee5efa865643eaad76565c7375f3fa834be.zip | |
Release 10.86.28
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4254 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/ppm/picttoppm.c | 6 | ||||
| -rw-r--r-- | converter/ppm/ppmtoilbm.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index 06074684..21030b03 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -1273,7 +1273,7 @@ doDiffSize(struct Rect const clipsrc, } break; case 32: { - unsigned int const planeSize = srcwid / 4; + unsigned int const planeSize = rectwidth(&srcRect); unsigned int rowNumber; for (rowNumber = 0; rowNumber < ysize; ++rowNumber) { @@ -1443,7 +1443,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) { @@ -1526,7 +1526,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/converter/ppm/ppmtoilbm.c b/converter/ppm/ppmtoilbm.c index 595aa3f4..c5fa4d00 100644 --- a/converter/ppm/ppmtoilbm.c +++ b/converter/ppm/ppmtoilbm.c @@ -2274,6 +2274,7 @@ main(int argc, char ** argv) { if (colors == 0) pm_error("empty colormap??"); pm_message("%d colors found in colormap", colors); + nPlanes = pm_maxvaltobits(colors-1); } if (maskmethod != mskNone) { |