From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 21 Jun 2013 19:40:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d4de7ff731caf3b90726fd377255130267ebf21;p=imagemagick

---

diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index 2163020fa..1a3773101 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -475,22 +475,15 @@ MagickExport void *AcquireMagickMemory(const size_t size)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  AcquireMemoryInfo() returns a pointer to a block of memory at least size
-%  bytes suitably aligned for any use.
+%  AcquireMemoryInfo() returns a MemoryInfo structure.  This method always
+%  succeeds.
 %
 %  The format of the AcquireMemoryInfo method is:
 %
-%      MemoryInfo *AcquireMemoryInfo(const size_t count,const size_t quantum)
-%
-%  A description of each parameter follows:
-%
-%    o count: the number of quantum elements to allocate.
-%
-%    o quantum: the number of bytes in each quantum.
+%      MemoryInfo *AcquireMemoryInfo(void)
 %
 */
-MagickExport MemoryInfo *AcquireMemoryInfo(const size_t count,
-  const size_t quantum)
+MagickExport MemoryInfo *AcquireMemoryInfo(void)
 {
   return((MemoryInfo *) NULL);
 }
@@ -763,18 +756,24 @@ MagickExport void GetMagickMemoryMethods(
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GetMemoryInfoMemory() returns a pointer to the allocated memory.
+%  GetMemoryInfoMemory() returns a pointer to a block of memory at least size
+%  bytes suitably aligned for any use.
 %
 %  The format of the GetMemoryInfoMemory method is:
 %
-%      void *GetMemoryInfoMemory(const MemoryInfo *memory_info)
+%      void *GetMemoryInfoMemory(const MemoryInfo *memory_info,
+%        const size_t count,const size_t quantum)
 %
 %  A description of each parameter follows:
 %
 %    o memory: A pointer to a block of memory to free for reuse.
 %
+%    o count: the number of quantum elements to allocate.
+%
+%    o quantum: the number of bytes in each quantum.
 */
-MagickExport void *GetMemoryInfoMemory(const MemoryInfo *memory_info)
+MagickExport void *GetMemoryInfoMemory(const MemoryInfo *memory_info,
+  const size_t count,const size_t quantum)
 {
   assert(memory_info != (const MemoryInfo *) NULL);
   return(memory_info->memory);
diff --git a/MagickCore/memory_.h b/MagickCore/memory_.h
index 839a9ce38..8024a2ccd 100644
--- a/MagickCore/memory_.h
+++ b/MagickCore/memory_.h
@@ -31,7 +31,7 @@ typedef void
   *(*ResizeMemoryHandler)(void *,size_t) magick_alloc_size(2);
 
 extern MagickExport MemoryInfo
-  *AcquireMemoryInfo(const size_t,const size_t),
+  *AcquireMemoryInfo(void),
   *RelinquishMemoryInfo(const MemoryInfo *);
 
 extern MagickExport void
@@ -46,7 +46,8 @@ extern MagickExport void
   DestroyMagickMemory(void),
   GetMagickMemoryMethods(AcquireMemoryHandler *,ResizeMemoryHandler *,
     DestroyMemoryHandler *),
-  *GetMemoryInfoMemory(const MemoryInfo *),
+  *GetMemoryInfoMemory(const MemoryInfo *,const size_t,const size_t)
+    magick_attribute((__malloc__)) magick_alloc_sizes(2,3),
   *RelinquishAlignedMemory(void *),
   *RelinquishMagickMemory(void *),
   *ResetMagickMemory(void *,int,const size_t),