]> granicus.if.org Git - imagemagick/commitdiff
Remove support for internal ephemeral coder.
authorCristy <urban-warrior@imagemagick.org>
Sat, 7 May 2016 12:23:15 +0000 (08:23 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 7 May 2016 12:23:15 +0000 (08:23 -0400)
MagickCore/image.c
MagickCore/magick.c

index 7be95a3817b5888c667f7e9d13ab13aab68257e0..1b3519571347de20d99e32b7697b798886623a9c 100644 (file)
@@ -2614,7 +2614,6 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
           "BROWSE",
           "DCRAW",
           "EDIT",
-          "EPHEMERAL",
           "LAUNCH",
           "MPEG:DECODE",
           "MPEG:ENCODE",
@@ -2679,10 +2678,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
       if (IsMagickConflict(magic) == MagickFalse)
         {
           (void) CopyMagickString(image_info->magick,magic,MagickPathExtent);
-          if (LocaleCompare(magic,"EPHEMERAL") != 0)
-            image_info->affirm=MagickTrue;
-          else
-            image_info->temporary=MagickTrue;
+          image_info->affirm=MagickTrue;
         }
     }
   magick_info=GetMagickInfo(magic,sans_exception);
index c62ef307b88a4633c45844a70670f08cd33f014c..6dcc463abe694957d731c8d2e06ceb4852b60f3e 100644 (file)
@@ -1009,12 +1009,6 @@ static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
           if (magick_list == (SplayTreeInfo *) NULL)
             ThrowFatalException(ResourceLimitFatalError,
               "MemoryAllocationFailed");
-          magick_info=AcquireMagickInfo("EPHEMERAL","EPHEMERAL","Internal format");
-          magick_info->flags|=CoderStealthFlag;
-          status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
-          if (status == MagickFalse)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
 #if defined(MAGICKCORE_MODULES_SUPPORT)
           (void) GetModuleInfo((char *) NULL,exception);
 #endif