From a9c6cd66a9bad60f7f48a800cc9c6bb933173add Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 18 May 2011 21:11:35 +0000 Subject: [PATCH] --- PerlMagick/Magick.xs | 2 +- coders/cin.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 70c898bf8..5bd21cbc5 100644 --- 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 5cb0588e7..fd2d4bc1e 100644 --- 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); -- 2.40.0