From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 30 Jul 2012 22:09:44 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92923f1e6fbf86ce3d345bf8e907e9d0aab70808;p=imagemagick

---

diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h
index a758de2af..79d0b62da 100644
--- a/MagickCore/random-private.h
+++ b/MagickCore/random-private.h
@@ -37,7 +37,7 @@ static inline RandomInfo **DestroyRandomInfoThreadSet(
     i;
 
   assert(random_info != (RandomInfo **) NULL);
-  for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
+  for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++)
     if (random_info[i] != (RandomInfo *) NULL)
       random_info[i]=DestroyRandomInfo(random_info[i]);
   return((RandomInfo **) RelinquishMagickMemory(random_info));
@@ -54,7 +54,7 @@ static inline RandomInfo **AcquireRandomInfoThreadSet(void)
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
   random_info=(RandomInfo **) AcquireQuantumMemory(number_threads,
     sizeof(*random_info));
   if (random_info == (RandomInfo **) NULL)
diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h
index 43f16714a..a67230932 100644
--- a/MagickCore/resample-private.h
+++ b/MagickCore/resample-private.h
@@ -31,7 +31,7 @@ static inline ResampleFilter **DestroyResampleFilterThreadSet(
     i;
 
   assert(filter != (ResampleFilter **) NULL);
-  for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
+  for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++)
     if (filter[i] != (ResampleFilter *) NULL)
       filter[i]=DestroyResampleFilter(filter[i]);
   filter=(ResampleFilter **) RelinquishMagickMemory(filter);
@@ -51,7 +51,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
   filter=(ResampleFilter **) AcquireQuantumMemory(number_threads,
     sizeof(*filter));
   if (filter == (ResampleFilter **) NULL)