correct null reference

Author: Cristy

coders/icon.c

@@ -250,8 +250,9 @@ static Image *Read1XImage(Image *image,ExceptionInfo *exception)
   (void) ReadBlobLSBShort(image);  /* cursor color */
   if (((rows != 32) && (rows != 64)) || ((columns != 32) && (columns != 64)))
     {
-      image=DestroyImageList(image);
-      ThrowImageException(CorruptImageError,"ImproperImageHeader");
+      (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError,
+        "ImproperImageHeader","`%s'",image->filename);
+      return(DestroyImageList(image));
     }
   /*
     Convert bitmap scanline.

filters/analyze.c

@@ -36,12 +36,6 @@
 /*
   Include declarations.
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-#include <math.h>
 #include "magick/studio.h"
 #include "magick/MagickCore.h"