diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index e750762bed..b16f34f357 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -438,7 +438,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info, range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - for (x=0; x < (ssize_t) (3*number_pixels-1); x+=2) + for (x=0; x < (3*(ssize_t) number_pixels-1); x+=2) { switch (x % 3) { @@ -1839,7 +1839,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, unsigned char pixel; - for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2) + for (x=0; x < ((ssize_t) number_pixels-1) ; x+=2) { pixel=ScaleQuantumToChar(ClampToQuantum(GetPixelLuma(image,p))); *q=(((pixel >> 4) & 0xf) << 4); @@ -1880,7 +1880,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, unsigned int pixel; - for (x=0; x < (ssize_t) (number_pixels-2); x+=3) + for (x=0; x < ((ssize_t) number_pixels-2); x+=3) { pixel=(unsigned int) (ScaleQuantumToAny(ClampToQuantum( GetPixelLuma(image,p+2*GetPixelChannels(image))),range) << 22 | @@ -1894,7 +1894,7 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, if (x < (ssize_t) number_pixels) { pixel=0U; - if (x++ < (ssize_t) (number_pixels-1)) + if (x++ < ((ssize_t) number_pixels-1)) pixel|=ScaleQuantumToAny(ClampToQuantum(GetPixelLuma(image,p+ GetPixelChannels(image))),range) << 12; if (x++ < (ssize_t) number_pixels) @@ -2304,7 +2304,7 @@ static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info, unsigned char pixel; - for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2) + for (x=0; x < ((ssize_t) number_pixels-1) ; x+=2) { pixel=(unsigned char) ((ssize_t) GetPixelIndex(image,p)); *q=((pixel & 0xf) << 4); @@ -2929,7 +2929,7 @@ static void ExportRGBQuantum(const Image *image,QuantumInfo *quantum_info, range=GetQuantumRange(quantum_info->depth); if (quantum_info->pack == MagickFalse) { - for (x=0; x < (ssize_t) (3*number_pixels-1); x+=2) + for (x=0; x < (3*(ssize_t) number_pixels-1); x+=2) { switch (x % 3) { diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index 21b9de1aed..18b32ef486 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -1164,8 +1164,8 @@ static void ImportBGROQuantum(const Image *image,QuantumInfo *quantum_info, SetPixelBlue(image,ScaleShortToQuantum((unsigned short) (pixel << 6)), q); p=PushQuantumPixel(quantum_info,p,&pixel); - SetPixelOpacity(image,ScaleShortToQuantum((unsigned short) (pixel << 6)), - q); + SetPixelOpacity(image,ScaleShortToQuantum((unsigned short) + (pixel << 6)),q); q+=(ptrdiff_t) GetPixelChannels(image); } break; @@ -1374,7 +1374,7 @@ static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info, n=0; quantum=0; - for (x=0; x < (ssize_t) (number_pixels-3); x+=4) + for (x=0; x < ((ssize_t) number_pixels-3); x+=4) { for (i=0; i < 4; i++) { @@ -2156,7 +2156,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, { if (image->endian == LSBEndian) { - for (x=0; x < (ssize_t) (number_pixels-2); x+=3) + for (x=0; x < ((ssize_t) number_pixels-2); x+=3) { p=PushLongPixel(quantum_info->endian,p,&pixel); SetPixelGray(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff, @@ -2170,7 +2170,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, p+=(ptrdiff_t) quantum_info->pad; q+=(ptrdiff_t) GetPixelChannels(image); } - if (x++ < (ssize_t) (number_pixels-1)) + if (x++ < ((ssize_t) number_pixels-1)) { p=PushLongPixel(quantum_info->endian,p,&pixel); SetPixelGray(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff, @@ -2185,7 +2185,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, } break; } - for (x=0; x < (ssize_t) (number_pixels-2); x+=3) + for (x=0; x < ((ssize_t) number_pixels-2); x+=3) { p=PushLongPixel(quantum_info->endian,p,&pixel); SetPixelGray(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,range), @@ -2199,7 +2199,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, p+=(ptrdiff_t) quantum_info->pad; q+=(ptrdiff_t) GetPixelChannels(image); } - if (x++ < (ssize_t) (number_pixels-1)) + if (x++ < ((ssize_t) number_pixels-1)) { p=PushLongPixel(quantum_info->endian,p,&pixel); SetPixelGray(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff, @@ -2231,7 +2231,7 @@ static void ImportGrayQuantum(const Image *image,QuantumInfo *quantum_info, unsigned short pixel; - for (x=0; x < (ssize_t) (number_pixels-1); x+=2) + for (x=0; x < ((ssize_t) number_pixels-1); x+=2) { p=PushShortPixel(quantum_info->endian,p,&pixel); SetPixelGray(image,ScaleAnyToQuantum((QuantumAny) (pixel >> 4), diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 6d0b2b986b..8ed392e129 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -766,7 +766,7 @@ MagickExport Image *EvaluateImages(const Image *images, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - for (j=0; j < (ssize_t) (number_images-1); j++) + for (j=0; j < ((ssize_t) number_images-1); j++) evaluate_pixel[x].channel[i]*=QuantumScale; } break; diff --git a/MagickWand/animate.c b/MagickWand/animate.c index f463a58fd6..c3bbadca48 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -414,7 +414,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=option; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) { option=argv[++i]; filename=option; diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 489a4added..7fc191e975 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -326,7 +326,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, if (status == MagickFalse) ThrowCompareException(ResourceLimitError,"MemoryAllocationFailed", GetExceptionMessage(errno)); - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if (LocaleCompare(option,"(") == 0) @@ -356,7 +356,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; images=ReadImages(image_info,filename,exception); status&=(MagickStatusType) ((images != (Image *) NULL) && @@ -1161,7 +1161,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, } if (k != 0) ThrowCompareException(OptionError,"UnbalancedParenthesis",argv[i]); - if (i-- != (ssize_t) (argc-1)) + if (i-- != ((ssize_t) argc-1)) ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]); if ((image == (Image *) NULL) || (GetImageListLength(image) < 2)) ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]); diff --git a/MagickWand/composite.c b/MagickWand/composite.c index 05a592f280..4968001939 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -515,7 +515,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, if (status == MagickFalse) ThrowCompositeException(ResourceLimitError,"MemoryAllocationFailed", GetExceptionMessage(errno)); - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if (LocaleCompare(option,"(") == 0) @@ -542,7 +542,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; images=ReadImages(image_info,filename,exception); status&=(MagickStatusType) (images != (Image *) NULL) && @@ -1637,7 +1637,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, } if (k != 0) ThrowCompositeException(OptionError,"UnbalancedParenthesis",argv[i]); - if (i-- != (ssize_t) (argc-1)) + if (i-- != ((ssize_t) argc-1)) ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[i]); if ((image == (Image *) NULL) || (GetImageListLength(image) < 2)) ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]); diff --git a/MagickWand/deprecate.c b/MagickWand/deprecate.c index 5ee13cff04..af6966da2e 100644 --- a/MagickWand/deprecate.c +++ b/MagickWand/deprecate.c @@ -114,7 +114,7 @@ static MagickBooleanType ConcatenateImages(int argc,char **argv, return(MagickFalse); } status=MagickTrue; - for (i=2; i < (ssize_t) (argc-1); i++) + for (i=2; i < ((ssize_t) argc-1); i++) { input=fopen_utf8(argv[i],"rb"); if (input == (FILE *) NULL) @@ -592,7 +592,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, GetExceptionMessage(errno)); if ((argc > 2) && (LocaleCompare("-concatenate",argv[1]) == 0)) return(ConcatenateImages(argc,argv,exception)); - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if (LocaleCompare(option,"(") == 0) @@ -622,7 +622,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, */ FireImageStack(MagickTrue,MagickTrue,pend); filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; if (image_info->ping != MagickFalse) images=PingImages(image_info,filename,exception); @@ -3361,7 +3361,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, } if (k != 0) ThrowConvertException(OptionError,"UnbalancedParenthesis",argv[i]); - if (i-- != (ssize_t) (argc-1)) + if (i-- != ((ssize_t) argc-1)) ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); FinalizeImageSettings(image_info,image,MagickTrue); if (image == (Image *) NULL) diff --git a/MagickWand/display.c b/MagickWand/display.c index afd6a27281..7ff85677cc 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -485,7 +485,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=option; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) { option=argv[++i]; filename=option; @@ -632,7 +632,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, if ((state & FormerImageState) != 0) { - for (i=1; i < (ssize_t) (argc-2); i++) + for (i=1; i < ((ssize_t) argc-2); i++) if (last_image == image_marker[i]) break; image_number=(ssize_t) image_marker[i]+1; diff --git a/MagickWand/identify.c b/MagickWand/identify.c index a2619014f8..f63f67a758 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -303,7 +303,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, identify_info=CloneImageInfo(image_info); identify_info->verbose=MagickFalse; filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; if (identify_info->ping != MagickFalse) images=PingImages(identify_info,filename,exception); diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 7290387ff2..bcd2720dd3 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -147,7 +147,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, iterations=1; status=MagickTrue; regard_warnings=MagickFalse; - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if ((strlen(option) == 1) || ((*option != '-') && (*option != '+'))) @@ -1263,7 +1263,7 @@ static MagickBooleanType ConcatenateImages(int argc,char **argv, return(MagickFalse); } status=MagickTrue; - for (i=2; i < (ssize_t) (argc-1); i++) + for (i=2; i < ((ssize_t) argc-1); i++) { input=fopen_utf8(argv[i],"rb"); if (input == (FILE *) NULL) diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c index cf93667590..30a40ed9d4 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -2871,7 +2871,7 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand, RelinquishMagickMemory(wand->image_info->sampling_factor); if (number_factors == 0) return(MagickTrue); - for (i=0; i < (ssize_t) (number_factors-1); i++) + for (i=0; i < ((ssize_t) number_factors-1); i++) { (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%g:", sampling_factors[i]); diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 9f31d934d1..42580a3c51 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -3853,7 +3853,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; images=ReadImages(image_info,filename,exception); status&=(MagickStatusType) (images != (Image *) NULL) && diff --git a/MagickWand/montage.c b/MagickWand/montage.c index 6c144d0065..00fa8846df 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -358,7 +358,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, if (status == MagickFalse) ThrowMontageException(ResourceLimitError,"MemoryAllocationFailed", GetExceptionMessage(errno)); - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if (LocaleCompare(option,"(") == 0) @@ -393,7 +393,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, Option is a file name: begin by reading image from specified file. */ filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; (void) CloneString(&image_info->font,montage_info->font); if (first_scene == last_scene) @@ -1818,7 +1818,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, } if (k != 0) ThrowMontageException(OptionError,"UnbalancedParenthesis",argv[i]); - if (i-- != (ssize_t) (argc-1)) + if (i-- != ((ssize_t) argc-1)) ThrowMontageException(OptionError,"MissingAnImageFilename",argv[i]); if (image == (Image *) NULL) ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]); diff --git a/MagickWand/stream.c b/MagickWand/stream.c index 7c232d8b15..8baa05deec 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -257,7 +257,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, DestroyStream(); return(MagickFalse); } - for (i=1; i < (ssize_t) (argc-1); i++) + for (i=1; i < ((ssize_t) argc-1); i++) { option=argv[i]; if (LocaleCompare(option,"(") == 0) @@ -286,7 +286,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, */ FireImageStack(MagickFalse,MagickFalse,pend); filename=argv[i]; - if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) + if ((LocaleCompare(filename,"--") == 0) && (i < ((ssize_t) argc-1))) filename=argv[++i]; (void) CopyMagickString(image_info->filename,filename,MagickPathExtent); images=StreamImage(image_info,stream_info,exception); @@ -749,7 +749,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, } if (k != 0) ThrowStreamException(OptionError,"UnbalancedParenthesis",argv[i]); - if (i-- != (ssize_t) (argc-1)) + if (i-- != ((ssize_t) argc-1)) ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]); if (image == (Image *) NULL) ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]); diff --git a/coders/dcm.c b/coders/dcm.c index 4c17d6aaf1..f9090667d7 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -4302,7 +4302,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image_info->number_scenes != 0) if (image->scene >= (image_info->scene+image_info->number_scenes-1)) break; - if (scene < (ssize_t) (number_scenes-1)) + if (scene < ((ssize_t) number_scenes-1)) { /* Allocate next image structure. diff --git a/coders/rle.c b/coders/rle.c index b4224459fe..f748a448ed 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -367,7 +367,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) *p++=background_color[j]; else { - for (j=0; j < (ssize_t) (number_planes-1); j++) + for (j=0; j < ((ssize_t) number_planes-1); j++) *p++=background_color[j]; *p++=0; /* initialize matte channel */ } diff --git a/coders/svg.c b/coders/svg.c index 76404a0be7..5f18bf3e92 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -894,7 +894,7 @@ static void SVGProcessStyleElement(SVGInfo *svg_info,const xmlChar *name, tokens=SVGKeyValuePairs(svg_info,':',';',style,&number_tokens); if (tokens == (char **) NULL) return; - for (i=0; i < (ssize_t) (number_tokens-1); i+=2) + for (i=0; i < ((ssize_t) number_tokens-1); i+=2) { keyword=(char *) tokens[i]; value=(char *) tokens[i+1]; @@ -906,7 +906,7 @@ static void SVGProcessStyleElement(SVGInfo *svg_info,const xmlChar *name, } color=AcquireString("none"); units=AcquireString("userSpaceOnUse"); - for (i=0; i < (ssize_t) (number_tokens-1); i+=2) + for (i=0; i < ((ssize_t) number_tokens-1); i+=2) { keyword=(char *) tokens[i]; value=(char *) tokens[i+1]; @@ -1835,7 +1835,7 @@ static void SVGStartElement(void *context,const xmlChar *name, tokens=SVGKeyValuePairs(svg_info,'(',')',value,&number_tokens); if (tokens == (char **) NULL) break; - for (j=0; j < (ssize_t) (number_tokens-1); j+=2) + for (j=0; j < ((ssize_t) number_tokens-1); j+=2) { keyword=(char *) tokens[j]; if (keyword == (char *) NULL) @@ -2235,7 +2235,7 @@ static void SVGStartElement(void *context,const xmlChar *name, tokens=SVGKeyValuePairs(svg_info,'(',')',value,&number_tokens); if (tokens == (char **) NULL) break; - for (j=0; j < (ssize_t) (number_tokens-1); j+=2) + for (j=0; j < ((ssize_t) number_tokens-1); j+=2) { keyword=(char *) tokens[j]; value=(char *) tokens[j+1]; @@ -2791,7 +2791,7 @@ static void SVGEndElement(void *context,const xmlChar *name) &number_tokens); if (tokens == (char **) NULL) break; - for (j=0; j < (ssize_t) (number_tokens-1); j+=2) + for (j=0; j < ((ssize_t) number_tokens-1); j+=2) { keyword=(char *) tokens[j]; value=(char *) tokens[j+1]; @@ -4530,7 +4530,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, primitive_info[i].coordinates=0; primitive_info[i].method=FloodfillMethod; i++; - if (i < (ssize_t) (number_points-6*BezierQuantum-360)) + if (i < ((ssize_t) number_points-6*BezierQuantum-360)) continue; number_points+=6*BezierQuantum+360; primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info, @@ -4744,7 +4744,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, image->filename); break; } - if (i > (ssize_t) (number_points-quantum-1)) + if (i > ((ssize_t) number_points-quantum-1)) { number_points+=(size_t) quantum; primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info,