diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-05-03 17:17:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-05-03 17:17:29 +0000 |
| commit | 77fb425477358f9af21e38d2f5e55d9de1375a75 (patch) | |
| tree | 6dc3e82265eb2e69bde4da38b66181dca609118a | |
| parent | 7935c20492d074e202e9529c6f8e60341b1ed3c2 (diff) | |
| download | netpbm-mirror-77fb425477358f9af21e38d2f5e55d9de1375a75.tar.gz netpbm-mirror-77fb425477358f9af21e38d2f5e55d9de1375a75.tar.xz netpbm-mirror-77fb425477358f9af21e38d2f5e55d9de1375a75.zip | |
Release 10.47.44
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1897 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | analyzer/pamtilt.c | 2 | ||||
| -rw-r--r-- | converter/ppm/ppmtowinicon.c | 9 | ||||
| -rw-r--r-- | doc/HISTORY | 10 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c index b1e3df58..d70f491b 100644 --- a/analyzer/pamtilt.c +++ b/analyzer/pamtilt.c @@ -253,7 +253,7 @@ scoreAngleRegion(sample ** const pixels, for (i = 0, t = 0, o = 0.5; i < hsamples; - ++i, t += pixels[(int)(row + o)][i], o += dy) { + t += pixels[(int)(row + o)][i], ++i, o += dy) { } dt = tscale * t; sum += dt * dt; diff --git a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c index 1a8cc3a7..a96840a1 100644 --- a/converter/ppm/ppmtowinicon.c +++ b/converter/ppm/ppmtowinicon.c @@ -204,18 +204,13 @@ createAndBitmap (gray ** const ba, int const cols, int const rows, * How wide should the u1 string for each row be? * each byte is 8 pixels, but must be a multiple of 4 bytes. */ + unsigned int const xBytes = ROUNDUP(cols, 32)/8; ICON_bmp icBitmap; - int xBytes,y,x; - int wt = cols; + int y,x; u1 ** rowData; MALLOCVAR_NOFAIL(icBitmap); - wt >>= 3; - if (wt & 3) { - wt = (wt & ~3) + 4; - } - xBytes = wt; MALLOCARRAY_NOFAIL(rowData, rows); icBitmap->xBytes = xBytes; icBitmap->data = rowData; diff --git a/doc/HISTORY b/doc/HISTORY index 1af1a61c..154d05d9 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,16 @@ Netpbm. CHANGE HISTORY -------------- +13.05.03 BJH Release 10.47.44 + + ppmtowinicon: fix bug: sometimes creates image truncated in the + middle of the AND mask. Always broken (program was new in + Netpbm 9.3 (June 2000)). + + pamtilt: fix bug: incorrect output or invalid memory access + crash. Always broken (program was new in Neptbm 10.30 + (October 2005)). + 13.02.20 BJH Release 10.47.43 pngtopam -alphapam with grayscale input: fix bug: generates diff --git a/version.mk b/version.mk index 9b5461d2..ecc11ea5 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 43 +NETPBM_POINT_RELEASE = 44 |