Some refactoring of reading the tiff image.

dlemstra · dlemstra · commit e00ca022aa4e · 2020-04-05T10:36:02.000+02:00
diff --git a/coders/ept.c b/coders/ept.c
@@ -164,7 +164,8 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     ept_info;
 
   Image
-    *image;
+    *image,
+    *tiff_image;
 
   ImageInfo
     *read_info;
@@ -256,20 +257,13 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception)
   (void) CopyMagickString(read_info->magick,"EPS",MagickPathExtent);
   image=BlobToImage(read_info,postscript_data,ept_info.postscript_length,
     exception);
-  if (image == (Image *) NULL)
+  (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
+  tiff_image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception);
+  if (tiff_image != (Image*) NULL)
     {
-      (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
-      image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception);
-    }
-  else
-    {
-      Image
-        *tiff_image;
-
-      (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
-      tiff_image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,
-        exception);
-      if (tiff_image != (Image *) NULL)
+      if (image == (Image*) NULL)
+        image=tiff_image;
+      else
         AppendImageToList(&image,tiff_image);
     }
   read_info=DestroyImageInfo(read_info);
