From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 26 Jan 2014 15:25:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2777
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f1f3e874e2010638922539d306dd51fe60738bd;p=imagemagick

---

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 7447ca22e..b4d8aad6c 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -1769,11 +1769,6 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info,
     exception);
   if (*blob_info->magick != '\0')
     (void) CopyMagickString(images->magick,blob_info->magick,MaxTextExtent);
-  if (blob_info->adjoin == MagickFalse)
-    {
-      blob_info=DestroyImageInfo(blob_info);
-      return(ImageToBlob(image_info,images,length,exception));
-    }
   magick_info=GetMagickInfo(images->magick,exception);
   if (magick_info == (const MagickInfo *) NULL)
     {
@@ -1782,6 +1777,11 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info,
         images->filename);
       return(blob);
     }
+  if (GetMagickAdjoin(magick_info) == MagickFalse)
+    {
+      blob_info=DestroyImageInfo(blob_info);
+      return(ImageToBlob(image_info,images,length,exception));
+    }
   (void) CopyMagickString(blob_info->magick,images->magick,MaxTextExtent);
   if (GetMagickBlobSupport(magick_info) != MagickFalse)
     {