(no commit message)

[imagemagick] / magick / signature.c

diff --git a/magick/signature.c b/magick/signature.c
index dc4b4d838391ca98848a3c14fe6b00cc3a36c6d8..1b63edec1d8d07acde43bc268b4c6d5a1ef01350 100644 (file)
--- a/magick/signature.c
+++ b/magick/signature.c
@@ -16,7 +16,7 @@
 %                              December 1992                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -120,7 +120,7 @@ MagickExport SignatureInfo *AcquireSignatureInfo(void)
   unsigned int
     lsb_first;
 
-  signature_info=(SignatureInfo *) AcquireQuantumMemory(1,sizeof(*signature_info));
+  signature_info=(SignatureInfo *) AcquireMagickMemory(sizeof(*signature_info));
   if (signature_info == (SignatureInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(signature_info,0,sizeof(*signature_info));
@@ -476,9 +476,6 @@ MagickExport MagickBooleanType SignatureImage(Image *image)
   ExceptionInfo
     *exception;
 
-  ssize_t
-    y;
-
   QuantumInfo
     *quantum_info;
 
@@ -494,6 +491,9 @@ MagickExport MagickBooleanType SignatureImage(Image *image)
   size_t
     length;
 
+  ssize_t
+    y;
+
   StringInfo
     *signature;
 
@@ -601,15 +601,15 @@ 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))
 
-  ssize_t
-    j;
-
   register ssize_t
     i;
 
   register unsigned char
     *p;
 
+  ssize_t
+    j;
+
   static unsigned int
     K[64] =
     {