(no commit message)

diff --git a/MagickWand/ChangeLog b/MagickWand/ChangeLog
index cf1e879a2e6bce5d88dcfbf631a3a7822066b30a..c0021777f56c893b3594b402b09213ab8d7cf475 100644 (file)
--- a/MagickWand/ChangeLog
+++ b/MagickWand/ChangeLog
@@ -3,7 +3,6 @@
   * Remove initialization of unused "quantize_info" in wand
   * Both "quantize_info" and added "draw_info" wand elements for CLI use only
 
-
 2011-09-21  7.0.0-0 Anthony  <anthony@griffith...>
   * new module "operator.c" which will holds the standard CLI options
 

diff --git a/coders/icon.c b/coders/icon.c
index 0ed47e42e57aef3a70cfb5144b94e72846822d42..fa79c4b1537708a2c23bd77f5ac72810b6a13c74 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -288,14 +288,12 @@ static Image *ReadICONImage(const ImageInfo *image_info,
         icon_image=BlobToImage(read_info,png,length+12,exception);
         read_info=DestroyImageInfo(read_info);
         png=(unsigned char *) RelinquishMagickMemory(png);
-        if (icon_image == (Image *) NULL)
+        if (icon_image != (Image *) NULL)
           {
-            image=DestroyImageList(image);
-            return((Image *) NULL);
+            DestroyBlob(icon_image);
+            icon_image->blob=ReferenceBlob(image->blob);
+            ReplaceImageInList(&image,icon_image);
           }
-        DestroyBlob(icon_image);
-        icon_image->blob=ReferenceBlob(image->blob);
-        ReplaceImageInList(&image,icon_image);
       }
     else
       {