(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 872eac6ce278ec25d1c23355439617ae16b7edbb..7d697507b2d00c831026fec7a2f5e5961703efa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-2010-01-02  6.6.7-0 Glenn Randers-Pehrson <glennrp@image...>
+2011-01-03  6.6.7-0 Cristy  <quetzlzacatenango@image...>
+  * Handle negative heights for ICO images.
+
+2011-01-02  6.6.7-0 Glenn Randers-Pehrson <glennrp@image...>
   * Recent changes sometimes caused the PNG encoder to select colortype=2
     (Truecolor) instead of 0 (Grayscale) for grayscale images.
 
-2010-01-01  6.6.6-10 Glenn Randers-Pehrson <glennrp@image...>
+2011-01-01  6.6.6-10 Glenn Randers-Pehrson <glennrp@image...>
   * The PNG decoder now checks whether the image actually has any transparency
     when the input file contains an alpha channel.  (Reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=17748)

diff --git a/coders/icon.c b/coders/icon.c
index ffc44080ebd6aeba26c9f5f0ce2d1db333df07da..b26ea02b8e61b77862c9da548ccaa4446d971390 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -255,8 +255,8 @@ static Image *ReadICONImage(const ImageInfo *image_info,
     if (offset < 0)
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     icon_info.size=ReadBlobLSBLong(image);
-    icon_info.width=(unsigned char) ReadBlobLSBLong(image);
-    icon_info.height=(unsigned char) ReadBlobLSBLong(image)/2;
+    icon_info.width=(unsigned char) ((int) ReadBlobLSBLong(image));
+    icon_info.height=(unsigned char) ((int) ReadBlobLSBLong(image)/2);
     if ((icon_file.directory[i].width == 0) && 
         (icon_file.directory[i].height == 0))
       {