From: cristy Date: Mon, 30 Jul 2012 12:28:34 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5226 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9357bdd9a30c3d65ef8812e45220f7552dc4376b;p=imagemagick --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index a55f6f058..79a7d9757 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 b80d414a4..b029c69b7 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=GetMagickResourceLimit(ThreadResource); + 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 312a32340..b3d65efab 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 c8126eec5..9aced5b32 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=GetMagickResourceLimit(ThreadResource); + 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 ad135ae81..b845f0b2a 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 6a6d6b76c..5035b9bd1 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 4309e81d8..8944be253 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=GetMagickResourceLimit(ThreadResource); + 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=GetMagickResourceLimit(ThreadResource); + 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 cadabd90c..84eee6a19 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 f8204532f..408f8467d 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=GetMagickResourceLimit(ThreadResource); + 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/resize.c b/MagickCore/resize.c index d0450e262..7d7af3cf5 100644 --- 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=GetMagickResourceLimit(ThreadResource); + 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 6a35113f9..71e16dfb0 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -161,7 +161,7 @@ static PixelChannels **AcquirePixelThreadSet(const Image *image, length, number_threads; - number_threads=GetMagickResourceLimit(ThreadResource); + number_threads=(size_t) 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=GetMagickResourceLimit(ThreadResource); + number_threads=(size_t) GetMagickResourceLimit(ThreadResource); pixel_list=(PixelList **) AcquireQuantumMemory(number_threads, sizeof(*pixel_list)); if (pixel_list == (PixelList **) NULL)