(no commit message)

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index d35765926905eeee5603e033f6d411b672817f19..a55f6f05806d0b8f8f4dc6c9b48880a455181449 100644 (file)
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -293,7 +293,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception)
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   current_depth=(size_t *) AcquireQuantumMemory(number_threads,
     sizeof(*current_depth));
   if (current_depth == (size_t *) NULL)

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 84eecb1f1b860918010e19023e534befaf2e3477..b80d414a4e78c8eaf75898e2d0742a21f13a267e 100644 (file)
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -165,7 +165,7 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(cache_view,0,sizeof(*cache_view));
   cache_view->image=ReferenceImage((Image *) image);
-  cache_view->number_threads=GetOpenMPMaximumThreads();
+  cache_view->number_threads=GetMagickResourceLimit(ThreadResource);
   cache_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads);
   cache_view->virtual_pixel_method=GetImageVirtualPixelMethod(image);
   cache_view->debug=IsEventLogging();

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index a210b6547e1d2bcec740c59ca5bf50b39210953f..312a323405a2898d2c349bbc5d483e01c6ccb0ae 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -203,7 +203,7 @@ MagickPrivate Cache AcquirePixelCache(const size_t number_threads)
   cache_info->id=GetMagickThreadId();
   cache_info->number_threads=number_threads;
   if (number_threads == 0)
-    cache_info->number_threads=GetOpenMPMaximumThreads();
+    cache_info->number_threads=GetMagickResourceLimit(ThreadResource);
   cache_info->nexus_info=AcquirePixelCacheNexus(cache_info->number_threads);
   if (cache_info->nexus_info == (NexusInfo **) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index fce9b2182bb0fbc60d6eca7b7865bfbfc3b47234..c8126eec578f253847ae4d6a9fafd545ca345a65 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3589,7 +3589,7 @@ static PolygonInfo **AcquirePolygonThreadSet(const DrawInfo *draw_info,
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   polygon_info=(PolygonInfo **) AcquireQuantumMemory(number_threads,
     sizeof(*polygon_info));
   if (polygon_info == (PolygonInfo **) NULL)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index d5cace908ee244fa777120baa39b7d8fa4664c38..ad135ae81b0e660fb8921d2a13839c887483b4cf 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -2972,7 +2972,7 @@ static FxInfo **AcquireFxThreadSet(const Image *image,const char *expression,
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   fx_info=(FxInfo **) AcquireQuantumMemory(number_threads,sizeof(*fx_info));
   if (fx_info == (FxInfo **) NULL)
     return((FxInfo **) NULL);

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 3a91b0c5b4c8d1664ee02e57ab7091e053782977..6a6d6b76ca69b79b1ae806911b1989c1fc5eadbf 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -515,7 +515,7 @@ static size_t **AcquireHistogramThreadSet(const size_t count)
     **histogram,
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   histogram=(size_t **) AcquireQuantumMemory(number_threads,sizeof(*histogram));
   if (histogram == (size_t **) NULL)
     return((size_t **) NULL);

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index ab14b9e07a724564819977d126508bcbad353c4b..4309e81d8f437b8e2f9fed72071c417b051ec5d9 100644 (file)
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -377,7 +377,7 @@ static unsigned short **AcquirePixelThreadSet(const size_t columns,
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   pixels=(unsigned short **) AcquireQuantumMemory(number_threads,
     sizeof(*pixels));
   if (pixels == (unsigned short **) NULL)
@@ -420,7 +420,7 @@ static cmsHTRANSFORM *AcquireTransformThreadSet(Image *image,
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   transform=(cmsHTRANSFORM *) AcquireQuantumMemory(number_threads,
     sizeof(*transform));
   if (transform == (cmsHTRANSFORM *) NULL)

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index f860aa7a6e07820ec49bbe4b9bcc2a6a1e95760b..cadabd90cb7a0f74b7ee09691b9c8b26c2b7cd3a 100644 (file)
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -1434,7 +1434,7 @@ static RealPixelInfo **AcquirePixelThreadSet(const size_t count)
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   pixels=(RealPixelInfo **) AcquireQuantumMemory(number_threads,
     sizeof(*pixels));
   if (pixels == (RealPixelInfo **) NULL)

diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index 0f7c211517f55c65a8cb33862074b4ef0c413077..f8204532f90da9f92d6a37fc5ca2a2f1fb0ae237 100644 (file)
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -168,7 +168,7 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info,
 
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickSignature);
-  quantum_info->number_threads=GetOpenMPMaximumThreads();
+  quantum_info->number_threads=GetMagickResourceLimit(ThreadResource);
   quantum_info->pixels=(unsigned char **) AcquireQuantumMemory(
     quantum_info->number_threads,sizeof(*quantum_info->pixels));
   if (quantum_info->pixels == (unsigned char **) NULL)

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 121206bf48e17ad903b4bda48136d2bf55933f4b..d0450e262fb8bd3a451a6d44dd26906d9e74848d 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2141,7 +2141,7 @@ static ContributionInfo **AcquireContributionThreadSet(const size_t count)
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   contribution=(ContributionInfo **) AcquireQuantumMemory(number_threads,
     sizeof(*contribution));
   if (contribution == (ContributionInfo **) NULL)

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index f87c1661140515ad82609789c0b27b6f9e18ae9e..6a35113f98f6293bd96ca12f17054cb4ed9fd54a 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -161,7 +161,7 @@ static PixelChannels **AcquirePixelThreadSet(const Image *image,
     length,
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   pixels=(PixelChannels **) AcquireQuantumMemory(number_threads,
     sizeof(*pixels));
   if (pixels == (PixelChannels **) NULL)
@@ -1879,7 +1879,7 @@ static PixelList **AcquirePixelListThreadSet(const size_t width,
   size_t
     number_threads;
 
-  number_threads=GetOpenMPMaximumThreads();
+  number_threads=GetMagickResourceLimit(ThreadResource);
   pixel_list=(PixelList **) AcquireQuantumMemory(number_threads,
     sizeof(*pixel_list));
   if (pixel_list == (PixelList **) NULL)