(no commit message)

diff --git a/magick/constitute.c b/magick/constitute.c
index 7eea55d20f8400dce2b67f5b99f402f15e8ceb8b..0f14cbffededffd33602fce5363ca295aa9a10c3 100644 (file)
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -529,10 +529,6 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       delegate_info=GetDelegateInfo(read_info->magick,(char *) NULL,exception);
       if (delegate_info == (const DelegateInfo *) NULL)
         {
-read_info->affirm=0;
-  (void) SetImageInfo(read_info,1,exception);
-  magick_info=GetMagickInfo(read_info->magick,exception);
-printf("%p\n",magick_info);
           if (IsPathAccessible(read_info->filename) != MagickFalse)
             (void) ThrowMagickException(exception,GetMagickModule(),
               MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'",
@@ -1154,28 +1150,15 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
             }
           if ((magick_info == (const MagickInfo *) NULL) ||
               (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
-            { 
+            {
               magick_info=GetMagickInfo(image->magick,&image->exception);
-              if ((magick_info == (const MagickInfo *) NULL) ||
-                  (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
-                (void) ThrowMagickException(&image->exception,GetMagickModule(),
-                  MissingDelegateError,"NoEncodeDelegateForThisImageFormat",
-                  "`%s'",image->filename);
-              else
-                {
-                  /*
-                    Call appropriate image writer based on image type.
-                  */
-                  (void) CopyMagickString(image->filename,filename,
-                    MaxTextExtent);
-                  thread_support=GetMagickThreadSupport(magick_info);
-                  if ((thread_support & EncoderThreadSupport) == 0)
-                    LockSemaphoreInfo(constitute_semaphore);
-                  status=GetImageEncoder(magick_info)(write_info,image);
-                  if ((thread_support & EncoderThreadSupport) == 0)
-                    UnlockSemaphoreInfo(constitute_semaphore);
-                }
+              (void) CopyMagickString(image->filename,filename,MaxTextExtent);
             }
+          if ((magick_info == (const MagickInfo *) NULL) ||
+              (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
+            (void) ThrowMagickException(&image->exception,GetMagickModule(),
+              MissingDelegateError,"NoEncodeDelegateForThisImageFormat","`%s'",
+              image->filename);
           else
             {
               /*