(no commit message)

[imagemagick] / magick / signature.c

diff --git a/magick/signature.c b/magick/signature.c
index dd1a0076371212185df85c1f573b6438870ebd75..1a7d0007d3f0d2049532a78a023d59794e0142eb 100644 (file)
--- a/magick/signature.c
+++ b/magick/signature.c
@@ -81,10 +81,10 @@ struct _SignatureInfo
   MagickBooleanType
     lsb_first;
 
-  long
+  ssize_t
     timestamp;
 
-  unsigned long
+  size_t
     signature;
 };
 \f
@@ -120,7 +120,7 @@ MagickExport SignatureInfo *AcquireSignatureInfo(void)
   unsigned int
     lsb_first;
 
-  signature_info=(SignatureInfo *) AcquireMagickMemory(sizeof(*signature_info));
+  signature_info=(SignatureInfo *) AcquireAlignedMemory(1,sizeof(*signature_info));
   if (signature_info == (SignatureInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(signature_info,0,sizeof(*signature_info));
@@ -135,7 +135,7 @@ MagickExport SignatureInfo *AcquireSignatureInfo(void)
   lsb_first=1;
   signature_info->lsb_first=(int) (*(char *) &lsb_first) == 1 ? MagickTrue :
     MagickFalse;
-  signature_info->timestamp=(long) time(0);
+  signature_info->timestamp=(ssize_t) time(0);
   signature_info->signature=MagickSignature;
   InitializeSignature(signature_info);
   return(signature_info);
@@ -205,7 +205,7 @@ MagickExport SignatureInfo *DestroySignatureInfo(SignatureInfo *signature_info)
 */
 MagickExport void FinalizeSignature(SignatureInfo *signature_info)
 {
-  register long
+  register ssize_t
     i;
 
   register unsigned char
@@ -467,13 +467,16 @@ MagickExport void SetSignatureDigest(SignatureInfo *signature_info,
 */
 MagickExport MagickBooleanType SignatureImage(Image *image)
 {
+  CacheView
+    *image_view;
+
   char
     *hex_signature;
 
   ExceptionInfo
     *exception;
 
-  long
+  ssize_t
     y;
 
   QuantumInfo
@@ -497,9 +500,6 @@ MagickExport MagickBooleanType SignatureImage(Image *image)
   unsigned char
     *pixels;
 
-  CacheView
-    *image_view;
-
   /*
     Compute image digital signature.
   */
@@ -525,7 +525,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image)
   pixels=GetQuantumPixels(quantum_info);
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-  for (y=0; y < (long) image->rows; y++)
+  for (y=0; y < (ssize_t) image->rows; y++)
   {
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     if (p == (const PixelPacket *) NULL)
@@ -601,10 +601,10 @@ static void TransformSignature(SignatureInfo *signature_info)
 #define Suma0(x)  (RotateRight(x,2) ^ RotateRight(x,13) ^ RotateRight(x,22))
 #define Suma1(x)  (RotateRight(x,6) ^ RotateRight(x,11) ^ RotateRight(x,25))
 
-  long
+  ssize_t
     j;
 
-  register long
+  register ssize_t
     i;
 
   register unsigned char