(no commit message)

[imagemagick] / MagickCore / random-private.h

diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h
index 112faa8a4e64c5e3da723aa0df7814ca7bf3cca6..79d0b62da5ed5c8f35dedbabc964b18bb2b5dc7e 100644 (file)
--- a/MagickCore/random-private.h
+++ b/MagickCore/random-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -37,10 +37,10 @@ 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 **) RelinquishAlignedMemory(random_info));
+  return((RandomInfo **) RelinquishMagickMemory(random_info));
 }
 
 static inline RandomInfo **AcquireRandomInfoThreadSet(void)
@@ -54,8 +54,8 @@ static inline RandomInfo **AcquireRandomInfoThreadSet(void)
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
-  random_info=(RandomInfo **) AcquireAlignedMemory(number_threads,
+  number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
+  random_info=(RandomInfo **) AcquireQuantumMemory(number_threads,
     sizeof(*random_info));
   if (random_info == (RandomInfo **) NULL)
     return((RandomInfo **) NULL);