Release 10.35.89

git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1898 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 15 insertions, 10 deletions

diff --git a/Makefile.version b/Makefile.version
index 0f2c4fbf..17010890 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 88
+NETPBM_POINT_RELEASE = 89
diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c
index 2aa65df8..cc135ab6 100644
--- a/analyzer/pamtilt.c
+++ b/analyzer/pamtilt.c
@@ -252,7 +252,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 bcaa0e08..b9a64cbd 100644
--- a/converter/ppm/ppmtowinicon.c
+++ b/converter/ppm/ppmtowinicon.c
@@ -203,18 +203,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 953280d6..29e5f928 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,10 +4,20 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+13.05.03 BJH  Release 10.35.89
+
+              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.35.88
 
               ppmpat: fix wrong output with -poles.
-
+              
               Windows build: fix compile error on urt/rle_open_f.c due to
               Unix process management stuff.