(no commit message)

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 7447ca22e3ea9ac4b731d85e1dc4ef4173f94137..b4d8aad6c1f4b356826acf1cb9dd96220d909916 100644 (file)
--- 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);
     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)
     {
   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);
     }
         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)
     {
   (void) CopyMagickString(blob_info->magick,images->magick,MaxTextExtent);
   if (GetMagickBlobSupport(magick_info) != MagickFalse)
     {