(no commit message)

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 55a0f3ad6aba901a5b83bf92499ad5b06dbbfe08..741018be22dd55c26c3d825ec0b90082d646ba78 100644 (file)
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -1003,9 +1003,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
       limit=DestroyString(limit);
     }
   (void) SetMagickResourceLimit(ThreadResource,GetOpenMPMaximumThreads());
-  limit=GetEnvironmentValue("OMP_NUM_THREADS");
-  if (limit == (char *) NULL)
-    limit=GetEnvironmentValue("MAGICK_THREAD_LIMIT");
+  limit=GetEnvironmentValue("MAGICK_THREAD_LIMIT");
   if (limit == (char *) NULL)
     limit=GetPolicyValue("thread");
   if (limit != (char *) NULL)
@@ -1014,6 +1012,15 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
         100.0));
       limit=DestroyString(limit);
     }
+  limit=GetEnvironmentValue("OMP_NUM_THREADS");
+  if (limit != (char *) NULL)
+    {
+      if ((MagickSizeType) StringToLong(limit) < 
+          GetMagickResourceLimit(ThreadResource))
+        (void) SetMagickResourceLimit(ThreadResource,StringToSizeType(limit,
+          100.0));
+      limit=DestroyString(limit);
+    }
   limit=GetEnvironmentValue("MAGICK_TIME_LIMIT");
   if (limit == (char *) NULL)
     limit=GetPolicyValue("time");