From 15893a425ef211a38a5b9bc05945a0a43049e7b1 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 20 Nov 2010 18:57:15 +0000 Subject: [PATCH] --- coders/gif.c | 6 +++--- coders/miff.c | 2 +- magick/quantize.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/coders/gif.c b/coders/gif.c index cf9045494..a72a97412 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -295,12 +295,12 @@ static inline int GetNextLZWCode(LZWInfo *lzw_info,const size_t bits) return(code); } -static inline ssize_t PopLZWStack(LZWStack *stack_info) +static inline int PopLZWStack(LZWStack *stack_info) { if (stack_info->index <= stack_info->codes) return(-1); stack_info->index--; - return((ssize_t) *stack_info->index); + return((int) *stack_info->index); } static inline void PushLZWStack(LZWStack *stack_info,const size_t value) @@ -673,7 +673,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image, indexes=GetVirtualIndexQueue(image); if (y == 0) waiting_code=(short) (*indexes); - for (x=(y == 0) ? 1 : 0; x < (ssize_t) image->columns; x++) + for (x=(ssize_t) (y == 0 ? 1 : 0); x < (ssize_t) image->columns; x++) { /* Probe hash table. diff --git a/coders/miff.c b/coders/miff.c index 561f7c028..619dd61e1 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -927,7 +927,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, { if (LocaleCompare(keyword,"ticks-per-second") == 0) { - image->ticks_per_second=StringToLong(options); + image->ticks_per_second=(ssize_t) StringToLong(options); break; } if (LocaleCompare(keyword,"tile-offset") == 0) diff --git a/magick/quantize.c b/magick/quantize.c index b1a7413e1..00e2882dc 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -1362,12 +1362,12 @@ static inline ssize_t CacheOffset(CubeInfo *cube_info, offset; offset=(ssize_t) - RedShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->red))) | + (RedShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->red))) | GreenShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->green))) | - BlueShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue))); + BlueShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue)))); if (cube_info->associate_alpha != MagickFalse) - offset|= - AlphaShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->opacity))); + offset|=AlphaShift(ScaleQuantumToChar(ClampToUnsignedQuantum( + pixel->opacity))); return(offset); } @@ -2469,9 +2469,6 @@ static MagickBooleanType DirectToColormapImage(Image *image, CacheView *image_view; - ssize_t - y; - MagickBooleanType status; @@ -2481,6 +2478,9 @@ static MagickBooleanType DirectToColormapImage(Image *image, size_t number_colors; + ssize_t + y; + status=MagickTrue; number_colors=(size_t) (image->columns*image->rows); if (AcquireImageColormap(image,number_colors) == MagickFalse) -- 2.40.0