From: cristy Date: Wed, 9 May 2012 13:51:24 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5624 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5a7417b235c03decfcd262840c0b09ccac51834;p=imagemagick --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 227645bb4..668abd88d 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -291,7 +291,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=(size_t) 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 5127bdb89..e51b4af32 100644 --- 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=(size_t) 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 cc30124d5..7c63ea257 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -201,7 +201,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=(size_t) 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 024a20e9d..53d40a32f 100644 --- 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=(size_t) 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 971524d21..e49ec7609 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -2963,7 +2963,7 @@ static FxInfo **AcquireFxThreadSet(const Image *image,const char *expression, size_t number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) 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 cf0299dca..6ef6723b0 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -516,7 +516,7 @@ static size_t **AcquireHistogramThreadSet(const size_t count) **histogram, number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) 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 ffb971975..7a64bd364 100644 --- 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=(size_t) 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=(size_t) GetMagickResourceLimit(ThreadResource); transform=(cmsHTRANSFORM *) AcquireQuantumMemory(number_threads, sizeof(*transform)); if (transform == (cmsHTRANSFORM *) NULL) diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 71dbdb2a6..29a1c1d68 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -1437,7 +1437,7 @@ static RealPixelInfo **AcquirePixelThreadSet(const size_t count) size_t number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); pixels=(RealPixelInfo **) AcquireQuantumMemory(number_threads, sizeof(*pixels)); if (pixels == (RealPixelInfo **) NULL) diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c index 223f2eee8..ba0ddf8c9 100644 --- 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=(size_t) 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/random-private.h b/MagickCore/random-private.h index a758de2af..d301552db 100644 --- a/MagickCore/random-private.h +++ b/MagickCore/random-private.h @@ -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..2941ca8a2 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -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) diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 4c165b14c..4e19accd7 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -2129,7 +2129,7 @@ static ContributionInfo **AcquireContributionThreadSet(const size_t count) size_t number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); contribution=(ContributionInfo **) AcquireQuantumMemory(number_threads, sizeof(*contribution)); if (contribution == (ContributionInfo **) NULL) diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index c844b97d7..7d0ef38b9 100644 --- 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=(size_t) GetMagickResourceLimit(ThreadResource); pixels=(PixelChannels **) AcquireQuantumMemory(number_threads, sizeof(*pixels)); if (pixels == (PixelChannels **) NULL) @@ -1855,7 +1855,7 @@ static PixelList **AcquirePixelListThreadSet(const size_t width, size_t number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); pixel_list=(PixelList **) AcquireQuantumMemory(number_threads, sizeof(*pixel_list)); if (pixel_list == (PixelList **) NULL) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index fa62dae97..644a0603b 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -175,7 +175,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, } return(status); } - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); serial=0.0; for (n=1; n <= (ssize_t) number_threads; n++) { diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index bd8e48310..c49b439eb 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -725,7 +725,7 @@ static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands) size_t number_threads; - number_threads=GetOpenMPMaximumThreads(); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); pixel_wands=(PixelWand ***) AcquireQuantumMemory(number_threads, sizeof(*pixel_wands)); if (pixel_wands == (PixelWand ***) NULL)