diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-04-10 15:50:27 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-04-10 15:50:27 +0000 |
commit | 13ec8910d04a4b0f192a3b100d16c40898f59a0d (patch) | |
tree | 1bfcb0b83cb7800052b289a929937bfd1582fae6 /converter/ppm | |
parent | 7b477084bbc8c58ff09b34c03d46587665608ce1 (diff) | |
download | netpbm-mirror-13ec8910d04a4b0f192a3b100d16c40898f59a0d.tar.gz netpbm-mirror-13ec8910d04a4b0f192a3b100d16c40898f59a0d.tar.xz netpbm-mirror-13ec8910d04a4b0f192a3b100d16c40898f59a0d.zip |
Fix bug: truncates AND mask with odd image widths
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1876 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm')
-rw-r--r-- | converter/ppm/ppmtowinicon.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c index 836c55d8..c673798f 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; |