From 0e8200f78c4cb859725d32da48fcaf6f41f6ca02 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 13 Sep 2009 21:10:06 +0000 Subject: [PATCH] --- ChangeLog | 3 +++ coders/icon.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fb5917d6..4c72af986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-09-13 6.5.6-0 Cristy + * Fix ICON alpha mask scanline pad. + 2009-09-11 6.5.5-10 Cristy * 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 b595ea0cc..e2e82a530 100644 --- 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; } -- 2.40.0