diff options
Diffstat (limited to 'MagickWand/pixel-iterator.c')
| -rw-r--r-- | MagickWand/pixel-iterator.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c index 5b7808269..7f468769c 100644 --- a/MagickWand/pixel-iterator.c +++ b/MagickWand/pixel-iterator.c @@ -162,10 +162,8 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator) assert(iterator->signature == MagickWandSignature); if (iterator->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name); - clone_iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*clone_iterator)); - if (clone_iterator == (PixelIterator *) NULL) - ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", - iterator->name); + clone_iterator=(PixelIterator *) AcquireCriticalMemory( + sizeof(*clone_iterator)); (void) memset(clone_iterator,0,sizeof(*clone_iterator)); clone_iterator->id=AcquireWandId(); (void) FormatLocaleString(clone_iterator->name,MagickPathExtent,"%s-%.20g", @@ -316,10 +314,7 @@ WandExport PixelIterator *NewPixelIterator(MagickWand *wand) view=AcquireVirtualCacheView(image,exception); if (view == (CacheView *) NULL) return((PixelIterator *) NULL); - iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator)); - if (iterator == (PixelIterator *) NULL) - ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", - GetExceptionMessage(errno)); + iterator=(PixelIterator *) AcquireCriticalMemory(sizeof(*iterator)); (void) memset(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); (void) FormatLocaleString(iterator->name,MagickPathExtent,"%s-%.20g", @@ -435,10 +430,7 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand, view=AcquireVirtualCacheView(image,exception); if (view == (CacheView *) NULL) return((PixelIterator *) NULL); - iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator)); - if (iterator == (PixelIterator *) NULL) - ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", - wand->name); + iterator=(PixelIterator *) AcquireCriticalMemory(sizeof(*iterator)); (void) memset(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); (void) FormatLocaleString(iterator->name,MagickPathExtent,"%s-%.20g", @@ -561,7 +553,8 @@ WandExport char *PixelGetIteratorException(const PixelIterator *iterator, *description='\0'; if (iterator->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( - iterator->exception->severity,iterator->exception->reason),MagickPathExtent); + iterator->exception->severity,iterator->exception->reason), + MagickPathExtent); if (iterator->exception->description != (char *) NULL) { (void) ConcatenateMagickString(description," (",MagickPathExtent); |