commit b41ee108904d5e1e75fd6a944caeceb5c7d6e64a
author cristy <urban-warrior@git.imagemagick.org> Mon Oct 04 16:46:15 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon Oct 04 16:46:15 2010 +0000
tree 8ec347f2e4e59297631eee217d6768419bdf5086
parent cfae90a336a521609913688472c10f0eff8a7af1

wand/deprecate.c

diff --git a/wand/deprecate.c b/wand/deprecate.c
index 36ba26b..44db734 100644
--- a/wand/deprecate.c
+++ b/wand/deprecate.c
@@ -129,7 +129,7 @@
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  clone_wand=(MagickWand *) AcquireAlignedMemory(1,sizeof(*clone_wand));
+  clone_wand=(MagickWand *) AcquireQuantumMemory(1,sizeof(*clone_wand));
   if (clone_wand == (MagickWand *) NULL)
     ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
       images->filename);
@@ -201,7 +201,7 @@
   assert(pixel_view->signature == WandSignature);
   if (pixel_view->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",pixel_view->name);
-  clone_view=(PixelView *) AcquireAlignedMemory(1,sizeof(*clone_view));
+  clone_view=(PixelView *) AcquireQuantumMemory(1,sizeof(*clone_view));
   if (clone_view == (PixelView *) NULL)
     ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
       pixel_view->name);
@@ -262,7 +262,7 @@
   for (i=0; i < (ssize_t) number_threads; i++)
     if (pixel_wands[i] != (PixelWand **) NULL)
       pixel_wands[i]=DestroyPixelWands(pixel_wands[i],number_wands);
-  pixel_wands=(PixelWand ***) RelinquishAlignedMemory(pixel_wands);
+  pixel_wands=(PixelWand ***) RelinquishMagickMemory(pixel_wands);
   return(pixel_wands);
 }
 
@@ -2332,7 +2332,7 @@
   register ssize_t
     i;
 
-  pixel_wands=(PixelWand ***) AcquireAlignedMemory(number_threads,
+  pixel_wands=(PixelWand ***) AcquireQuantumMemory(number_threads,
     sizeof(*pixel_wands));
   if (pixel_wands == (PixelWand ***) NULL)
     return((PixelWand ***) NULL);
@@ -2353,7 +2353,7 @@
 
   assert(wand != (MagickWand *) NULL);
   assert(wand->signature == MagickSignature);
-  pixel_view=(PixelView *) AcquireAlignedMemory(1,sizeof(*pixel_view));
+  pixel_view=(PixelView *) AcquireQuantumMemory(1,sizeof(*pixel_view));
   if (pixel_view == (PixelView *) NULL)
     ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
       GetExceptionMessage(errno));
@@ -2412,7 +2412,7 @@
 
   assert(wand != (MagickWand *) NULL);
   assert(wand->signature == MagickSignature);
-  pixel_view=(PixelView *) AcquireAlignedMemory(1,sizeof(*pixel_view));
+  pixel_view=(PixelView *) AcquireQuantumMemory(1,sizeof(*pixel_view));
   if (pixel_view == (PixelView *) NULL)
     ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
       GetExceptionMessage(errno));