From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 Jun 2013 02:48:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaaff84e53c6dba4988fc076523eb820fdecd084;p=imagemagick

---

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 4dfd0b6f8..3f12cbbb3 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -470,8 +470,7 @@ MagickExport char **GetModuleList(const char *pattern,
       modules=(char **) RelinquishMagickMemory(modules);
       return((char **) NULL);
     }
-  buffer=(struct dirent *) AcquireMagickMemory(sizeof(*buffer)+
-    FILENAME_MAX+1);
+  buffer=(struct dirent *) AcquireMagickMemory(sizeof(*buffer)+FILENAME_MAX+1);
   if (buffer == (struct dirent *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   i=0;
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 526f6268e..175d42e4c 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -140,6 +140,9 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     skip,
     status;
 
+  MemoryInfo
+    *segment_info;
+
   PixelInfo
     fill_color,
     pixel;
@@ -190,14 +193,14 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   (void) QueryColorCompliance("#000",AllCompliance,
     &floodplane_image->background_color,exception);
   (void) SetImageBackgroundColor(floodplane_image,exception);
-  segment_stack=(SegmentInfo *) AcquireQuantumMemory(MaxStacksize,
-    sizeof(*segment_stack));
-  if (segment_stack == (SegmentInfo *) NULL)
+  segment_info=AcquireVirtualMemory(MaxStacksize,sizeof(*segment_stack));
+  if (segment_info == (MemoryInfo *) NULL)
     {
       floodplane_image=DestroyImage(floodplane_image);
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
+  segment_stack=(SegmentInfo *) GetVirtualMemoryBlob(segment_info);
   /*
     Push initial segment on stack.
   */
@@ -349,7 +352,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   }
   floodplane_view=DestroyCacheView(floodplane_view);
   image_view=DestroyCacheView(image_view);
-  segment_stack=(SegmentInfo *) RelinquishMagickMemory(segment_stack);
+  segment_info=RelinquishVirtualMemory(segment_info);
   floodplane_image=DestroyImage(floodplane_image);
   return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
 }
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index a7fe9afaf..83cc6aa18 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -3362,8 +3362,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image,
     image->colormap[i].alpha=(double) i;
   qsort((void *) image->colormap,image->colors,sizeof(PixelInfo),
     IntensityCompare);
-  colormap=(PixelInfo *) AcquireQuantumMemory(image->colors,
-    sizeof(*colormap));
+  colormap=(PixelInfo *) AcquireQuantumMemory(image->colors,sizeof(*colormap));
   if (colormap == (PixelInfo *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index f7a31b4d3..ff4b6669d 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1780,6 +1780,9 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
   MagickBooleanType
     status;
 
+  MemoryInfo
+    *pixel_info;
+
   register gfloat
     *q;
 
@@ -1823,10 +1826,11 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
       resize_image=DestroyImage(resize_image);
       return(rescale_image);
     }
-  pixels=(gfloat *) AcquireQuantumMemory(image->columns,image->rows*
+  pixel_info=AcquireVirtualMemory(image->columns,image->rows*
     GetPixelChannels(image)*sizeof(*pixels));
-  if (pixels == (gfloat *) NULL)
+  if (pixel_info == (MemoryInfo *) NULL)
     return((Image *) NULL);
+  pixels=(gfloat *) GetVirtualMemoryBlob(pixel_info);
   status=MagickTrue;
   q=pixels;
   image_view=AcquireVirtualCacheView(image,exception);
@@ -1861,7 +1865,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
     GetPixelChannels(image),LQR_COLDEPTH_32F);
   if (carver == (LqrCarver *) NULL)
     {
-      pixels=(gfloat *) RelinquishMagickMemory(pixels);
+      pixel_info=RelinquishVirtualMemory(pixel_info);
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
   lqr_status=lqr_carver_init(carver,(int) delta_x,rigidity);
@@ -1871,12 +1875,12 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
     lqr_carver_get_height(carver),MagickTrue,exception);
   if (rescale_image == (Image *) NULL)
     {
-      pixels=(gfloat *) RelinquishMagickMemory(pixels);
+      pixel_info=RelinquishVirtualMemory(pixel_info);
       return((Image *) NULL);
     }
   if (SetImageStorageClass(rescale_image,DirectClass,exception) == MagickFalse)
     {
-      pixels=(gfloat *) RelinquishMagickMemory(pixels);
+      pixel_info=RelinquishVirtualMemory(pixel_info);
       rescale_image=DestroyImage(rescale_image);
       return((Image *) NULL);
     }
@@ -1916,6 +1920,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
       break;
   }
   rescale_view=DestroyCacheView(rescale_view);
+  pixel_info=RelinquishVirtualMemory(pixel_info);
   lqr_carver_destroy(carver);
   return(rescale_image);
 }