(no commit message)

diff --git a/magick/cache-view.c b/magick/cache-view.c
index 6f9f6e25feeca8c3f08e0339b21582d428b838f8..f770b2c5a15faa5fcc5bf9de1a592a3845fa38b8 100644 (file)
--- a/magick/cache-view.c
+++ b/magick/cache-view.c
@@ -303,12 +303,12 @@ MagickExport ExceptionInfo *GetCacheViewException(const CacheView *cache_view)
 */
 MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
 {
-  ssize_t
-    id;
-
   MagickSizeType
     extent;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   if (cache_view->debug != MagickFalse)
@@ -391,12 +391,12 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
   Cache
     cache;
 
-  ssize_t
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
@@ -447,12 +447,12 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
   Cache
     cache;
 
-  ssize_t
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
@@ -538,12 +538,12 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
 */
 MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 {
-  ssize_t
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
@@ -662,8 +662,7 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
 %
 %      const PixelPacket *GetCacheViewVirtualPixels(
 %        const CacheView *cache_view,const ssize_t x,const ssize_t y,
-%        const size_t columns,const size_t rows,
-%        ExceptionInfo *exception)
+%        const size_t columns,const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -849,12 +848,12 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
   Cache
     cache;
 
-  ssize_t
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   cache=GetImagePixelCache(cache_view->image,MagickFalse,exception);
@@ -972,18 +971,14 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
 MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
   CacheView *cache_view,ExceptionInfo *exception)
 {
-  ssize_t
-    id;
-
   MagickBooleanType
     status;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-if (0)
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   id=GetOpenMPThreadId();
   assert(id < (ssize_t) cache_view->number_threads);
   status=SyncAuthenticPixelCacheNexus(cache_view->image,

diff --git a/magick/cache.c b/magick/cache.c
index 0af1ded3d4a7b79e44b1062dd859f1cd2af5098c..c0d523747512f93d5faa8b4807f52b27999af535 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -250,12 +250,12 @@ MagickExport Cache AcquirePixelCache(const size_t number_threads)
 MagickExport NexusInfo **AcquirePixelCacheNexus(
   const size_t number_threads)
 {
-  register ssize_t
-    i;
-
   NexusInfo
     **nexus_info;
 
+  register ssize_t
+    i;
+
   nexus_info=(NexusInfo **) AcquireAlignedMemory(number_threads,
     sizeof(*nexus_info));
   if (nexus_info == (NexusInfo **) NULL)
@@ -422,13 +422,13 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image,
     *restrict nexus_indexes,
     *restrict indexes;
 
-  register ssize_t
-    i;
-
   register PixelPacket
     *restrict p,
     *restrict q;
 
+  register ssize_t
+    i;
+
   /*
     Apply clip mask.
   */
@@ -584,15 +584,15 @@ static MagickBooleanType ClonePixelCacheNexus(CacheInfo *destination,
   MagickSizeType
     number_pixels;
 
-  register ssize_t
-    i;
-
   register const NexusInfo
     *p;
 
   register NexusInfo
     *q;
 
+  register ssize_t
+    i;
+
   status=MagickTrue;
   for (i=0; i < (ssize_t) source->number_threads; i++)
   {
@@ -878,12 +878,12 @@ static MagickBooleanType CloneDiskToDiskPixelCache(CacheInfo *clone_info,
   MagickSizeType
     length;
 
-  register ssize_t
-    y;
-
   register PixelPacket
     *restrict pixels;
 
+  register ssize_t
+    y;
+
   size_t
     columns,
     rows;
@@ -1043,13 +1043,13 @@ static MagickBooleanType CloneDiskToMemoryPixelCache(CacheInfo *clone_info,
   MagickSizeType
     length;
 
-  register ssize_t
-    y;
-
   register PixelPacket
     *restrict pixels,
     *restrict q;
 
+  register ssize_t
+    y;
+
   size_t
     columns,
     rows;
@@ -1155,13 +1155,13 @@ static MagickBooleanType CloneMemoryToDiskPixelCache(CacheInfo *clone_info,
   MagickSizeType
     length;
 
-  register ssize_t
-    y;
-
   register PixelPacket
     *restrict p,
     *restrict pixels;
 
+  register ssize_t
+    y;
+
   size_t
     columns,
     rows;
@@ -1302,18 +1302,16 @@ static MagickBooleanType CloneMemoryToDiskPixelCache(CacheInfo *clone_info,
 static MagickBooleanType CloneMemoryToMemoryPixelCache(CacheInfo *clone_info,
   CacheInfo *cache_info,ExceptionInfo *magick_unused(exception))
 {
-  register ssize_t
-    y;
-
   register PixelPacket
     *restrict pixels,
     *restrict source_pixels;
 
-  size_t
-    length;
+  register ssize_t
+    y;
 
   size_t
     columns,
+    length,
     rows;
 
   if (cache_info->debug != MagickFalse)
@@ -1818,8 +1816,8 @@ static inline MagickBooleanType IsNexusInCore(const CacheInfo *cache_info,
   return(MagickTrue);
 }
 
-MagickExport PixelPacket *GetAuthenticPixelCacheNexus(Image *image,const ssize_t x,
-  const ssize_t y,const size_t columns,const size_t rows,
+MagickExport PixelPacket *GetAuthenticPixelCacheNexus(Image *image,
+  const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
   NexusInfo *nexus_info,ExceptionInfo *exception)
 {
   CacheInfo
@@ -3281,13 +3279,13 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
   register IndexPacket
     *restrict indexes;
 
+  register PixelPacket
+    *restrict q;
+
   register ssize_t
     u,
     v;
 
-  register PixelPacket
-    *restrict q;
-
   /*
     Acquire pixels.
   */
@@ -3899,13 +3897,13 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
     *restrict nexus_indexes,
     *restrict indexes;
 
-  register ssize_t
-    i;
-
   register PixelPacket
     *restrict p,
     *restrict q;
 
+  register ssize_t
+    i;
+
   /*
     Apply clip mask.
   */
@@ -4057,11 +4055,9 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
     status;
 
   size_t
+    columns,
     packet_size;
 
-  size_t
-    columns;
-
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if ((image->columns == 0) || (image->rows == 0))
@@ -4289,12 +4285,12 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
   Image
     clone_image;
 
-  ssize_t
-    page_size;
-
   MagickBooleanType
     status;
 
+  ssize_t
+    page_size;
+
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
@@ -4766,12 +4762,12 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
     length,
     number_pixels;
 
-  register ssize_t
-    y;
-
   register PixelPacket
     *restrict q;
 
+  register ssize_t
+    y;
+
   size_t
     rows;
 

diff --git a/magick/memory.c b/magick/memory.c
index c930f9d114dadf2a61be69cafed428bcbf91c811..772e3abc527e425e12db68c41d3a1295d887c1c0 100644 (file)
--- a/magick/memory.c
+++ b/magick/memory.c
@@ -186,6 +186,14 @@ static MagickBooleanType
 %    o quantum: the number of bytes in each quantum.
 %
 */
+
+static inline size_t MagickMax(const size_t x,const size_t y)
+{
+  if (x > y)
+    return(x);
+  return(y);
+}
+
 MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum)
 {
   size_t
@@ -202,7 +210,7 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum)
     void
       *memory;
 
-    if (posix_memalign(&memory,AlignedSize,size) == 0)
+    if (posix_memalign(&memory,AlignedSize,MagickMax(size,AlignedSize)) == 0)
       return(memory);
   }
 #endif