(no commit message)

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 70c898bf8e1957e91705cbbdaacf3b37a2bee56d..5bd21cbc517a652ed106262b94841a60255a2cf2 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -8748,7 +8748,7 @@ Mogrify(ref,...)
             (void) GammaImage(image,argument_list[0].string_reference);
           else
             (void) GammaImageChannel(image,channel,
-              StringToDouble(argument_list[0].string_reference));
+              StringToDouble(argument_list[0].string_reference,(char **) NULL));
           break;
         }
         case 41:  /* Map */

diff --git a/coders/cin.c b/coders/cin.c
index 5cb0588e733bb5ccc0257e777dc55de926ccf23c..fd2d4bc1e1c06c07dc271ba71375ab97e77fe146 100644 (file)
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -380,9 +380,6 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #define MonoColorType  1
 #define RGBColorType  3
 
-  char
-    magick[4];
-
   CINInfo
     cin;
 
@@ -415,6 +412,7 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
     y;
 
   unsigned char
+    magick[4],
     *pixels;
 
   /*
@@ -438,13 +436,13 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
     File information.
   */
   offset=0;
-  count=ReadBlob(image,4,(unsigned char *) magick);
+  count=ReadBlob(image,4,magick);
   offset+=count;
   if ((count != 4) ||
       ((LocaleNCompare((char *) magick,"\200\052\137\327",4) != 0)))
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
-  image->endian=(magick[0]==0x80) && (magick[1]==0x2a) && (magick[2]==0x5f) &&
-    (magick[3]==0xd7) ? MSBEndian : LSBEndian;
+  image->endian=(magick[0] == 0x80) && (magick[1] == 0x2a) &&
+    (magick[2] == 0x5f) && (magick[3] == 0xd7) ? MSBEndian : LSBEndian;
   cin.file.image_offset=ReadBlobLong(image);
   offset+=4;
   cin.file.generic_length=ReadBlobLong(image);