(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 3fb5917d602093fdf917599a1d865a18aae9221f..4c72af986a3768c1813d00722c43f09c25207ebc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-09-13  6.5.6-0 Cristy  <quetzlzacatenango@image...>
+  * Fix ICON alpha mask scanline pad.
+
 2009-09-11  6.5.5-10 Cristy  <quetzlzacatenango@image...>
   * Return the global maximum threads to avoid the rare cache view assertions.
   * Throw an end-of-file exception for truncated raw gray images.

diff --git a/coders/icon.c b/coders/icon.c
index b595ea0ccab756ac718235702f42ee9f126878ed..e2e82a530a1ff04b6886e7e8d3a210305f5d3b39 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -590,8 +590,9 @@ static Image *ReadICONImage(const ImageInfo *image_info,
                     q[x+bit].opacity=(Quantum) (((byte & (0x80 >> bit)) != 0) ?
                       TransparentOpacity : OpaqueOpacity);
                 }
-              for (x=0; x < (long) scanline_pad; x++)
-                (void) ReadBlobByte(image);
+              if ((image->columns % 32) != 0)
+                for (x=0; x < (long) ((32-(image->columns % 32))/8); x++)
+                  (void) ReadBlobByte(image);
               if (SyncAuthenticPixels(image,exception) == MagickFalse)
                 break;
             }