commit 1460f26c740619877283a50656e43db099ebfa1c
author cristy <urban-warrior@git.imagemagick.org> Sat Mar 15 17:38:05 2014 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sat Mar 15 17:38:05 2014 +0000
tree 6f2928253c54f3154084df4290007addb9dc2524
parent 63dda21d61ea58ffff08ad985230fe73b54af241

MagickCore/magick.c

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 11c79c2..e59d6e9 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -121,7 +121,6 @@
   *magick_list = (SplayTreeInfo *) NULL;
 
 static volatile MagickBooleanType
-  instantiate_magick = MagickFalse,
   instantiate_magickcore = MagickFalse;
 
 /*
@@ -413,8 +412,7 @@
     *p;
 
   assert(exception != (ExceptionInfo *) NULL);
-  if ((magick_list == (SplayTreeInfo *) NULL) ||
-      (instantiate_magick == MagickFalse))
+  if (magick_list == (SplayTreeInfo *) NULL)
     if (InitializeMagickList(exception) == MagickFalse)
       return((const MagickInfo *) NULL);
   if ((name == (const char *) NULL) || (LocaleCompare(name,"*") == 0))
@@ -840,48 +838,39 @@
 static MagickBooleanType InitializeMagickList(ExceptionInfo *exception)
 {
   (void) exception;
-  if ((magick_list == (SplayTreeInfo *) NULL) ||
-      (instantiate_magick == MagickFalse))
+  if (magick_semaphore == (SemaphoreInfo *) NULL)
+    ActivateSemaphoreInfo(&magick_semaphore);
+  LockSemaphoreInfo(magick_semaphore);
+  if (magick_list == (SplayTreeInfo *) NULL)
     {
-      if (magick_semaphore == (SemaphoreInfo *) NULL)
-        ActivateSemaphoreInfo(&magick_semaphore);
-      LockSemaphoreInfo(magick_semaphore);
-      if ((magick_list == (SplayTreeInfo *) NULL) ||
-          (instantiate_magick == MagickFalse))
-        {
-          MagickBooleanType
-            status;
+      MagickBooleanType
+        status;
 
-          MagickInfo
-            *magick_info;
+      MagickInfo
+        *magick_info;
 
-          magick_list=NewSplayTree(CompareSplayTreeString,
-            (void *(*)(void *)) NULL,DestroyMagickNode);
-          if (magick_list == (SplayTreeInfo *) NULL)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
-          magick_info=SetMagickInfo("ephemeral");
-          magick_info->stealth=MagickTrue;
-          status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
-          if (status == MagickFalse)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
-          magick_info=SetMagickInfo("clipmask");
-          magick_info->stealth=MagickTrue;
-          status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
-          if (status == MagickFalse)
-            ThrowFatalException(ResourceLimitFatalError,
-              "MemoryAllocationFailed");
+      magick_list=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
+        DestroyMagickNode);
+      if (magick_list == (SplayTreeInfo *) NULL)
+        ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+      magick_info=SetMagickInfo("ephemeral");
+      magick_info->stealth=MagickTrue;
+      status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
+      if (status == MagickFalse)
+        ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+      magick_info=SetMagickInfo("clipmask");
+      magick_info->stealth=MagickTrue;
+      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);
+      (void) GetModuleInfo((char *) NULL,exception);
 #endif
 #if !defined(MAGICKCORE_BUILD_MODULES)
-          RegisterStaticModules();
+      RegisterStaticModules();
 #endif
-          instantiate_magick=MagickTrue;
-        }
-      UnlockSemaphoreInfo(magick_semaphore);
     }
+  UnlockSemaphoreInfo(magick_semaphore);
   return(magick_list != (SplayTreeInfo *) NULL ? MagickTrue : MagickFalse);
 }
 
@@ -1104,7 +1093,6 @@
   LockSemaphoreInfo(magick_semaphore);
   if (magick_list != (SplayTreeInfo *) NULL)
     magick_list=DestroySplayTree(magick_list);
-  instantiate_magick=MagickFalse;
   UnlockSemaphoreInfo(magick_semaphore);
   RelinquishSemaphoreInfo(&magick_semaphore);
 }
@@ -1175,7 +1163,6 @@
   (void) signal(signal_number,SIG_IGN);
 #endif
   AsynchronousResourceComponentTerminus();
-  instantiate_magick=MagickFalse;
   (void) SetMagickSignalHandler(signal_number,signal_handlers[signal_number]);
 #if defined(SIGQUIT)
   if (signal_number == SIGQUIT)