(no commit message)

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 61107f39611584189e13320e6e499ff12fc37fd8..ebc699ab5fa1cfa115d4232a14c047fa7bdd437c 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -1324,7 +1324,6 @@ MagickExport void MagickCoreGenesis(const char *path,
   (void) ConfigureComponentGenesis();
   (void) PolicyComponentGenesis();
   (void) CacheComponentGenesis();
-  (void) RegistryComponentGenesis();
   (void) ResourceComponentGenesis();
   (void) CoderComponentGenesis();
   (void) MagickComponentGenesis();
@@ -1340,6 +1339,7 @@ MagickExport void MagickCoreGenesis(const char *path,
 #if defined(MAGICKCORE_X11_DELEGATE)
   (void) XComponentGenesis();
 #endif
+  (void) RegistryComponentGenesis();
   instantiate_magickcore=MagickTrue;
   UnlockMagickMutex();
 }
@@ -1371,6 +1371,7 @@ MagickExport void MagickCoreTerminus(void)
       UnlockMagickMutex();
       return;
     }
+  RegistryComponentTerminus();
 #if defined(MAGICKCORE_X11_DELEGATE)
   XComponentTerminus();
 #endif
@@ -1392,7 +1393,6 @@ MagickExport void MagickCoreTerminus(void)
 #endif
   CoderComponentTerminus();
   ResourceComponentTerminus();
-  RegistryComponentTerminus();
   CacheComponentTerminus();
   PolicyComponentTerminus();
   ConfigureComponentTerminus();

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index b67b13745ffffcafcb3b187ddb05d28ec5c4a24e..d74f4b0215b39ee778bfea8658553b32a25d62d1 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1794,9 +1794,6 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
   char
     *passes;
 
-  ExceptionInfo
-    *exception;
-
   int
     file,
     status;
@@ -1815,11 +1812,7 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
 
   if ((path == (const char *) NULL) || (*path == '\0'))
     return(MagickFalse);
-  exception=AcquireExceptionInfo();
-  passes=(char *) GetImageRegistry(StringRegistryType,"shred-passes",exception);
-  exception=DestroyExceptionInfo(exception);
-  if (passes == (char *) NULL)
-    passes=GetEnvironmentValue("MAGICK_SHRED_PASSES");
+  passes=GetEnvironmentValue("MAGICK_SHRED_PASSES");
   if (passes == (char *) NULL)
     {
       /*