From: dirk Date: Thu, 1 Oct 2015 14:56:10 +0000 (+0200) Subject: Fixed various warnings reported by Visual Studio 2015 X-Git-Tag: 7.0.1-0~586 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c93932ae0fce511e693d0cf9b969af16a3e50175;p=imagemagick Fixed various warnings reported by Visual Studio 2015 --- diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 5cb4d4da5..9cd8d1555 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1088,8 +1088,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, PointInfo extent[4], min, - max, - point; + max; register ssize_t i; @@ -1122,6 +1121,9 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, extent[3].y=(double) source->rows-1.0; for (i=0; i < 4; i++) { + PointInfo + point; + point=extent[i]; extent[i].x=point.x*affine->sx+point.y*affine->ry+affine->tx; extent[i].y=point.x*affine->rx+point.y*affine->sy+affine->ty; @@ -1671,10 +1673,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, current; char - key[2*MagickPathExtent], keyword[MagickPathExtent], geometry[MagickPathExtent], - name[MagickPathExtent], pattern[MagickPathExtent], *primitive, *token; @@ -2366,28 +2366,32 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, } if (LocaleCompare("pattern",token) == 0) { + char + key[2*MagickPathExtent], + name[MagickPathExtent]; + RectangleInfo - bounds; + pattern_bounds; GetMagickToken(q,&q,token); (void) CopyMagickString(name,token,MagickPathExtent); GetMagickToken(q,&q,token); - bounds.x=(ssize_t) ceil(StringToDouble(token,(char **) NULL)- - 0.5); + pattern_bounds.x=(ssize_t) ceil(StringToDouble(token, + (char **) NULL)-0.5); GetMagickToken(q,&q,token); if (*token == ',') GetMagickToken(q,&q,token); - bounds.y=(ssize_t) ceil(StringToDouble(token,(char **) NULL)- - 0.5); + pattern_bounds.y=(ssize_t) ceil(StringToDouble(token, + (char **) NULL)-0.5); GetMagickToken(q,&q,token); if (*token == ',') GetMagickToken(q,&q,token); - bounds.width=(size_t) floor(StringToDouble(token, + pattern_bounds.width=(size_t) floor(StringToDouble(token, (char **) NULL)+0.5); GetMagickToken(q,&q,token); if (*token == ',') GetMagickToken(q,&q,token); - bounds.height=(size_t) floor(StringToDouble(token, + pattern_bounds.height=(size_t) floor(StringToDouble(token, (char **) NULL)+0.5); for (p=q; *q != '\0'; ) { @@ -2402,10 +2406,12 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, (void) CopyMagickString(token,p,(size_t) (q-p-4+1)); (void) FormatLocaleString(key,MagickPathExtent,"%s",name); (void) SetImageArtifact(image,key,token); - (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name); + (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry", + name); (void) FormatLocaleString(geometry,MagickPathExtent, - "%.20gx%.20g%+.20g%+.20g",(double) bounds.width,(double) - bounds.height,(double) bounds.x,(double) bounds.y); + "%.20gx%.20g%+.20g%+.20g",(double)pattern_bounds.width, + (double)pattern_bounds.height,(double)pattern_bounds.x, + (double)pattern_bounds.y); (void) SetImageArtifact(image,key,geometry); GetMagickToken(q,&q,token); break; @@ -2555,17 +2561,17 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (IsPoint(q) != MagickFalse) { const char - *p; + *r; - p=q; - GetMagickToken(p,&p,token); + r=q; + GetMagickToken(r,&r,token); if (*token == ',') - GetMagickToken(p,&p,token); + GetMagickToken(r,&r,token); for (x=0; IsPoint(token) != MagickFalse; x++) { - GetMagickToken(p,&p,token); + GetMagickToken(r,&r,token); if (*token == ',') - GetMagickToken(p,&p,token); + GetMagickToken(r,&r,token); } graphic_context[n]->dash_pattern=(double *) AcquireQuantumMemory((size_t) (2UL*x+1UL), @@ -4271,9 +4277,6 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, register Quantum *restrict q; - register ssize_t - x; - q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, exception); if (q == (Quantum *) NULL) @@ -4333,9 +4336,6 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, register Quantum *restrict q; - register ssize_t - x; - q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, exception); if (q == (Quantum *) NULL) @@ -4448,9 +4448,6 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, register Quantum *restrict q; - register ssize_t - x; - q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, exception); if (q == (Quantum *) NULL) @@ -4513,17 +4510,14 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, if (((x1 != 0L) && (x1 != (ssize_t) composite_image->columns)) || ((y1 != 0L) && (y1 != (ssize_t) composite_image->rows))) { - char - geometry[MagickPathExtent]; - /* Resize image. */ - (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g!", - primitive_info[1].point.x,primitive_info[1].point.y); + (void) FormatLocaleString(composite_geometry,MagickPathExtent, + "%gx%g!",primitive_info[1].point.x,primitive_info[1].point.y); composite_image->filter=image->filter; - (void) TransformImage(&composite_image,(char *) NULL,geometry, - exception); + (void) TransformImage(&composite_image,(char *) NULL, + composite_geometry,exception); } if (composite_image->alpha_trait == UndefinedPixelTrait) (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel, diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 9e765c3ab..95b35b049 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1465,9 +1465,6 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, } case AlphaPixelChannel: { - double - alpha; - if (pixel.alpha_trait == UndefinedPixelTrait) return(1.0); alpha=(double) (QuantumScale*pixel.alpha); @@ -1813,13 +1810,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, case 'z': { if (LocaleCompare(symbol,"z") == 0) - { - double - depth; - - depth=(double) GetImageDepth(image,fx_info->exception); - return(depth); - } + return((double)GetImageDepth(image, fx_info->exception)); break; } default: @@ -2279,9 +2270,6 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } case '?': { - double - gamma; - (void) CopyMagickString(subexpression,++p,MagickPathExtent); q=subexpression; p=StringToken(":",&q); @@ -2780,9 +2768,6 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, { if (LocaleNCompare(expression,"rand",4) == 0) { - double - alpha; - #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FxEvaluateSubexpression) #endif @@ -3461,7 +3446,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, *next; register ssize_t - i; + n; ssize_t y; @@ -3483,7 +3468,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, /* Morph single image. */ - for (i=1; i < (ssize_t) number_frames; i++) + for (n=1; n < (ssize_t) number_frames; n++) { morph_image=CloneImage(image,0,0,MagickTrue,exception); if (morph_image == (Image *) NULL) @@ -3497,7 +3482,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, MagickBooleanType proceed; - proceed=SetImageProgress(image,MorphImageTag,(MagickOffsetType) i, + proceed=SetImageProgress(image,MorphImageTag,(MagickOffsetType) n, number_frames); if (proceed == MagickFalse) status=MagickFalse; @@ -3513,13 +3498,13 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, next=image; for ( ; GetNextImageInList(next) != (Image *) NULL; next=GetNextImageInList(next)) { - for (i=0; i < (ssize_t) number_frames; i++) + for (n=0; n < (ssize_t) number_frames; n++) { CacheView *image_view, *morph_view; - beta=(double) (i+1.0)/(double) (number_frames+1.0); + beta=(double) (n+1.0)/(double) (number_frames+1.0); alpha=1.0-beta; morph_image=ResizeImage(next,(size_t) (alpha*next->columns+beta* GetNextImageInList(next)->columns+0.5),(size_t) (alpha*next->rows+beta* @@ -3608,7 +3593,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, image_view=DestroyCacheView(image_view); morph_image=DestroyImage(morph_image); } - if (i < (ssize_t) number_frames) + if (n < (ssize_t) number_frames) break; /* Clone last frame in sequence. diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 35dc1ad28..865ad21c5 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -858,9 +858,6 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache, mime=GetXMLTreeChild(mime_map,"mime"); while (mime != (XMLTreeInfo *) NULL) { - const char - *attribute; - /* Process mime element. */ diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index fb185b18a..8d4d215c6 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2563,7 +2563,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, offset; register ssize_t - i; + j; ssize_t y; @@ -2629,8 +2629,8 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, sizeof(*changes)); if (changes == (size_t *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); - for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) - changes[i]=0; + for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++) + changes[j]=0; if ((method == ConvolveMorphology) && (kernel->width == 1)) { @@ -2779,8 +2779,8 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, morphology_image->type=image->type; morphology_view=DestroyCacheView(morphology_view); image_view=DestroyCacheView(image_view); - for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) - changed+=changes[i]; + for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++) + changed+=changes[j]; changes=(size_t *) RelinquishMagickMemory(changes); return(status ? (ssize_t) changed : 0); } @@ -3205,8 +3205,8 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, } morphology_view=DestroyCacheView(morphology_view); image_view=DestroyCacheView(image_view); - for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) - changed+=changes[i]; + for (j=0; j < (ssize_t) GetOpenMPMaximumThreads(); j++) + changed+=changes[j]; changes=(size_t *) RelinquishMagickMemory(changes); return(status ? (ssize_t) changed : -1); } @@ -4134,9 +4134,6 @@ MagickExport Image *MorphologyImage(const Image *image, * users can see the results of the 'option:convolve:scale' option. */ if ( method == ConvolveMorphology || method == CorrelateMorphology ) { - const char - *artifact; - /* Get the bias value as it will be needed */ artifact = GetImageArtifact(image,"convolve:bias"); if ( artifact != (const char *) NULL) { diff --git a/coders/jpeg.c b/coders/jpeg.c index 244881e56..47944ae77 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -723,14 +723,14 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info) if (previous_profile != (const StringInfo *) NULL) { size_t - length; + profile_length; - length=GetStringInfoLength(profile); + profile_length=GetStringInfoLength(profile); SetStringInfoLength(profile,GetStringInfoLength(profile)+ GetStringInfoLength(previous_profile)); (void) memmove(GetStringInfoDatum(profile)+ GetStringInfoLength(previous_profile),GetStringInfoDatum(profile), - length); + profile_length); (void) memcpy(GetStringInfoDatum(profile), GetStringInfoDatum(previous_profile), GetStringInfoLength(previous_profile)); @@ -1938,11 +1938,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image) ResetImageProfileIterator(image); for (name=GetNextImageProfile(image); name != (const char *) NULL; ) { - register unsigned char - *p; - profile=GetImageProfile(image,name); - p=GetStringInfoDatum(custom_profile); if (LocaleCompare(name,"EXIF") == 0) for (i=0; i < (ssize_t) GetStringInfoLength(profile); i+=65533L) { @@ -1973,10 +1969,14 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image) if (((LocaleCompare(name,"IPTC") == 0) || (LocaleCompare(name,"8BIM") == 0)) && (iptc == MagickFalse)) { + register unsigned char + *p; + size_t roundup; iptc=MagickTrue; + p=GetStringInfoDatum(custom_profile); for (i=0; i < (ssize_t) GetStringInfoLength(profile); i+=65500L) { length=MagickMin(GetStringInfoLength(profile)-i,65500L); @@ -2366,10 +2366,10 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, *jpeg_image; ImageInfo - *jpeg_info; + *extent_info; - jpeg_info=CloneImageInfo(image_info); - jpeg_info->blob=NULL; + extent_info=CloneImageInfo(image_info); + extent_info->blob=NULL; jpeg_image=CloneImage(image,0,0,MagickTrue,exception); if (jpeg_image != (Image *) NULL) { @@ -2383,9 +2383,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, /* Search for compression quality that does not exceed image extent. */ - jpeg_info->quality=0; + extent_info->quality=0; extent=(MagickSizeType) SiPrefixToDoubleInterval(option,100.0); - (void) DeleteImageOption(jpeg_info,"jpeg:extent"); + (void) DeleteImageOption(extent_info,"jpeg:extent"); (void) DeleteImageArtifact(jpeg_image,"jpeg:extent"); maximum=image->quality; if (maximum < 2) @@ -2394,7 +2394,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, { (void) AcquireUniqueFilename(jpeg_image->filename); jpeg_image->quality=minimum+(maximum-minimum+1)/2; - status=WriteJPEGImage(jpeg_info,jpeg_image,exception); + status=WriteJPEGImage(extent_info,jpeg_image,exception); if (GetBlobSize(jpeg_image) <= extent) minimum=jpeg_image->quality+1; else @@ -2404,7 +2404,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, quality=(int) minimum-1; jpeg_image=DestroyImage(jpeg_image); } - jpeg_info=DestroyImageInfo(jpeg_info); + extent_info=DestroyImageInfo(extent_info); } jpeg_set_quality(&jpeg_info,quality,TRUE); #if (JPEG_LIB_VERSION >= 70) diff --git a/coders/psd.c b/coders/psd.c index 5ff9b42d4..8fcbf739c 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -1896,9 +1896,6 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((has_merged_image == MagickFalse) && (GetImageListLength(image) == 1) && (length != 0)) { - MagickStatusType - status; - SeekBlob(image,offset,SEEK_SET); status=ReadPSDLayers(image,image_info,&psd_info,MagickFalse,exception); if (status != MagickTrue) @@ -2714,10 +2711,10 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image, else { size_t - length; + layer_length; - length=strlen(property); - layer_info_size+=8+length+(4-(length % 4)); + layer_length=strlen(property); + layer_info_size+=8+layer_length+(4-(layer_length % 4)); } layer_count++; next_image=GetNextImageInList(next_image); @@ -2826,11 +2823,11 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image, else { size_t - length; + label_length; - length=strlen(property); - (void) WriteBlobMSBLong(image,(unsigned int) (length+(4- - (length % 4))+8)); + label_length=strlen(property); + (void) WriteBlobMSBLong(image,(unsigned int) (label_length+(4- + (label_length % 4))+8)); (void) WriteBlobMSBLong(image,0); (void) WriteBlobMSBLong(image,0); WritePascalString(image,property,4);