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

---

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index d265cc90a..55a0f3ad6 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -1003,7 +1003,9 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
       limit=DestroyString(limit);
     }
   (void) SetMagickResourceLimit(ThreadResource,GetOpenMPMaximumThreads());
-  limit=GetEnvironmentValue("MAGICK_THREAD_LIMIT");
+  limit=GetEnvironmentValue("OMP_NUM_THREADS");
+  if (limit == (char *) NULL)
+    limit=GetEnvironmentValue("MAGICK_THREAD_LIMIT");
   if (limit == (char *) NULL)
     limit=GetPolicyValue("thread");
   if (limit != (char *) NULL)