From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 21 Apr 2012 18:58:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5757
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95fc4ef4eb6ec11ead80614646263032ca048397;p=imagemagick

---

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 4cc6d529a..cdb18542e 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -521,6 +521,17 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
   image=NewImageList();
   if (constitute_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&constitute_semaphore);
+  if ((magick_info == (const MagickInfo *) NULL) ||
+      (GetImageDecoder(magick_info) == (DecodeImageHandler *) NULL))
+    {
+      delegate_info=GetDelegateInfo(read_info->magick,(char *) NULL,exception);
+      if (delegate_info == (const DelegateInfo *) NULL)
+        {
+          (void) SetImageInfo(read_info,0,exception);
+          (void) CopyMagickString(read_info->filename,filename,MaxTextExtent);
+          magick_info=GetMagickInfo(read_info->magick,exception);
+        }
+    }
   if ((magick_info != (const MagickInfo *) NULL) &&
       (GetImageDecoder(magick_info) != (DecodeImageHandler *) NULL))
     {
@@ -1184,10 +1195,20 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
             }
           if ((magick_info == (const MagickInfo *) NULL) ||
               (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
-            (void) ThrowMagickException(exception,GetMagickModule(),
-              MissingDelegateError,"NoEncodeDelegateForThisImageFormat","'%s'",
-              image->filename);
-          else
+            {
+              magick_info=GetMagickInfo(image->magick,exception);
+              if ((magick_info == (const MagickInfo *) NULL) ||
+                  (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
+                (void) ThrowMagickException(exception,GetMagickModule(),
+                  MissingDelegateError,"NoEncodeDelegateForThisImageFormat",
+                  "'%s'",image->filename);
+              else
+                (void) ThrowMagickException(exception,GetMagickModule(),
+                  MissingDelegateWarning,"NoEncodeDelegateForThisImageFormat",
+                  "'%s'",image->filename);
+            }
+          if ((magick_info != (const MagickInfo *) NULL) &&
+              (GetImageEncoder(magick_info) != (EncodeImageHandler *) NULL))
             {
               /*
                 Call appropriate image writer based on image type.
diff --git a/config/english.xml b/config/english.xml
index da5a7f8b6..caaeedd50 100644
--- a/config/english.xml
+++ b/config/english.xml
@@ -555,6 +555,9 @@
           <message name="LCMSLibraryIsNotAvailable">
             LCMS color profile library is not available
           </message>
+          <message name="NoEncodeDelegateForThisImageFormat">
+            no encode delegate for this image format
+          </message>
         </warning>
       </delegate>
     </missing>
diff --git a/config/francais.xml b/config/francais.xml
index eecbb1dd7..4b24790ac 100644
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -549,6 +549,9 @@
           <message name="DelegateLibrarySupportNotBuiltIn">
             delegate library support not built-in
           </message>
+          <message name="NoEncodeDelegateForThisImageFormat">
+            pas de délégué pour encoder ce format d'image
+          </message>
         </warning>
       </delegate>
     </missing>