From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 Dec 2012 00:33:28 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d320045ed1a9b04894d36f279cd759bffc49e3c1;p=imagemagick

---

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 55a0f3ad6..741018be2 100644
--- 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");