From: cristy Date: Sun, 30 May 2010 14:59:20 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9349 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecd0ab5350482e4a2ea003705e3e0b2120b66384;p=imagemagick --- diff --git a/coders/txt.c b/coders/txt.c index 0b22ae82b..6ec1a6e17 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -396,14 +396,9 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) count; unsigned long - blue, depth, - green, height, - index, max_value, - opacity, - red, width; /* @@ -462,24 +457,20 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image->colorspace == CMYKColorspace) { if (image->matte != MagickFalse) - count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu,%lu", - &x_offset,&y_offset,&red,&green,&blue,&index,&opacity); + count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u,%u",&x_offset, + &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index, + &pixel.opacity); else - count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu", - &x_offset,&y_offset,&red,&green,&blue,&index); + count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset, + &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index); } else if (image->matte != MagickFalse) - count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu,%lu", - &x_offset,&y_offset,&red,&green,&blue,&opacity); + count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset, + &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.opacity); else - count=(ssize_t) sscanf(text,"%ld,%ld: (%lu,%lu,%lu", - &x_offset,&y_offset,&red,&green,&blue); - pixel.red=red; - pixel.green=green; - pixel.blue=blue; - pixel.opacity=opacity; - pixel.index=index; + count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset, + &y_offset,&pixel.red,&pixel.green,&pixel.blue); if (count < 5) continue; q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception); diff --git a/magick/animate.c b/magick/animate.c index a0ff52859..6dd801fa1 100644 --- a/magick/animate.c +++ b/magick/animate.c @@ -947,8 +947,8 @@ MagickExport void XAnimateBackgroundImage(Display *display, window_attributes.width,window_attributes.height); geometry_info.width=window_info.width; geometry_info.height=window_info.height; - geometry_info.x=window_info.x; - geometry_info.y=window_info.y; + geometry_info.x=(ssize_t) window_info.x; + geometry_info.y=(ssize_t) window_info.y; (void) ParseMetaGeometry(geometry,&geometry_info.x,&geometry_info.y, &geometry_info.width,&geometry_info.height); window_info.width=(unsigned int) geometry_info.width; @@ -2252,7 +2252,7 @@ MagickExport Image *XAnimateImages(Display *display, event.xclient.format,(unsigned long) event.xclient.data.l[0]); if (event.xclient.message_type == windows->im_protocols) { - if (*event.xclient.data.l == (ssize_t) windows->im_update_colormap) + if (*event.xclient.data.l == (long) windows->im_update_colormap) { /* Update graphic context and window colormap. @@ -2286,7 +2286,7 @@ MagickExport Image *XAnimateImages(Display *display, (void) XInstallColormap(display,map_info->colormap); break; } - if (*event.xclient.data.l == (ssize_t) windows->im_exit) + if (*event.xclient.data.l == (long) windows->im_exit) { state|=ExitState; break; diff --git a/magick/blob.c b/magick/blob.c index 5c0073b20..8f0224b13 100644 --- a/magick/blob.c +++ b/magick/blob.c @@ -3418,7 +3418,7 @@ MagickExport MagickOffsetType SeekBlob(Image *image, break; case FileStream: { - if (fseek(image->blob->file,offset,whence) < 0) + if (fseek(image->blob->file,(long) offset,whence) < 0) return(-1); image->blob->offset=TellBlob(image); break; diff --git a/magick/cache.c b/magick/cache.c index 9d320d7f2..8c0968927 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -4732,7 +4732,7 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info, break; } if ((cache_info->debug != MagickFalse) && - (QuantumTick(nexus_info->region.y,cache_info->rows) != MagickFalse)) + (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse)) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]", cache_info->filename,(unsigned long) nexus_info->region.width, (unsigned long) nexus_info->region.height,(long) nexus_info->region.x, @@ -4863,7 +4863,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info, break; } if ((cache_info->debug != MagickFalse) && - (QuantumTick(nexus_info->region.y,cache_info->rows) != MagickFalse)) + (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse)) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]", cache_info->filename,(unsigned long) nexus_info->region.width, (unsigned long) nexus_info->region.height,(long) nexus_info->region.x, @@ -5448,7 +5448,7 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info, break; } if ((cache_info->debug != MagickFalse) && - (QuantumTick(nexus_info->region.y,cache_info->rows) != MagickFalse)) + (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse)) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]", cache_info->filename,(unsigned long) nexus_info->region.width, (unsigned long) nexus_info->region.height,(long) nexus_info->region.x, @@ -5579,7 +5579,7 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info, break; } if ((cache_info->debug != MagickFalse) && - (QuantumTick(nexus_info->region.y,cache_info->rows) != MagickFalse)) + (QuantumTick((MagickOffsetType) nexus_info->region.y,cache_info->rows) != MagickFalse)) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]", cache_info->filename,(unsigned long) nexus_info->region.width, (unsigned long) nexus_info->region.height,(long) nexus_info->region.x, diff --git a/magick/deprecate.c b/magick/deprecate.c index 997da68cf..4f744fd82 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -5330,7 +5330,7 @@ MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char order=1; lower_threshold=0; upper_threshold=0; - count=sscanf(thresholds,"%lf[/x%%]%lf",&lower_threshold, + count=(ssize_t) sscanf(thresholds,"%lf[/x%%]%lf",&lower_threshold, &upper_threshold); if (strchr(thresholds,'%') != (char *) NULL) { diff --git a/magick/display.c b/magick/display.c index 94b49f79d..96d2faeb3 100644 --- a/magick/display.c +++ b/magick/display.c @@ -2572,7 +2572,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, if (event.xselection.property == (Atom) None) break; status=XGetWindowProperty(display,event.xselection.requestor, - event.xselection.property,0L,(ssize_t) MaxTextExtent,True,XA_STRING, + event.xselection.property,0L,(long) MaxTextExtent,True,XA_STRING, &type,&format,&length,&after,&data); if ((status != Success) || (type != XA_STRING) || (format == 32) || (length == 0)) @@ -12578,7 +12578,7 @@ static void XScreenEvent(Display *display,XWindows *windows,XEvent *event) */ if (event->xclient.message_type != windows->wm_protocols) break; - if (*event->xclient.data.l != (ssize_t) windows->wm_delete_window) + if (*event->xclient.data.l != (long) windows->wm_delete_window) break; if (event->xclient.window == windows->magnify.id) { @@ -13717,8 +13717,8 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, window_attributes.width,window_attributes.height); geometry_info.width=window_info.width; geometry_info.height=window_info.height; - geometry_info.x=window_info.x; - geometry_info.y=window_info.y; + geometry_info.x=(ssize_t) window_info.x; + geometry_info.y=(ssize_t) window_info.y; (void) ParseMetaGeometry(geometry,&geometry_info.x,&geometry_info.y, &geometry_info.width,&geometry_info.height); window_info.width=(unsigned int) geometry_info.width; @@ -15164,7 +15164,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, event.xclient.data.l[0]); if (event.xclient.message_type == windows->im_protocols) { - if (*event.xclient.data.l == (ssize_t) windows->im_update_widget) + if (*event.xclient.data.l == (long) windows->im_update_widget) { (void) CloneString(&windows->command.name,MagickTitle); windows->command.data=MagickMenus; @@ -15172,7 +15172,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, (XEvent *) NULL); break; } - if (*event.xclient.data.l == (ssize_t) windows->im_update_colormap) + if (*event.xclient.data.l == (long) windows->im_update_colormap) { /* Update graphic context and window colormap. @@ -15213,22 +15213,22 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, (void) XInstallColormap(display,map_info->colormap); break; } - if (*event.xclient.data.l == (ssize_t) windows->im_former_image) + if (*event.xclient.data.l == (long) windows->im_former_image) { *state|=FormerImageState | ExitState; break; } - if (*event.xclient.data.l == (ssize_t) windows->im_next_image) + if (*event.xclient.data.l == (long) windows->im_next_image) { *state|=NextImageState | ExitState; break; } - if (*event.xclient.data.l == (ssize_t) windows->im_retain_colors) + if (*event.xclient.data.l == (long) windows->im_retain_colors) { *state|=RetainColorsState; break; } - if (*event.xclient.data.l == (ssize_t) windows->im_exit) + if (*event.xclient.data.l == (long) windows->im_exit) { *state|=ExitState; break; @@ -15258,7 +15258,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, if ((*event.xclient.data.l != 2) && (*event.xclient.data.l != 128)) break; selection=XInternAtom(display,"DndSelection",MagickFalse); - status=XGetWindowProperty(display,root_window,selection,0L,(ssize_t) + status=XGetWindowProperty(display,root_window,selection,0L,(long) MaxTextExtent,MagickFalse,(Atom) AnyPropertyType,&type,&format, &length,&after,&data); if ((status != Success) || (length == 0)) @@ -15297,7 +15297,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, */ if (event.xclient.message_type != windows->wm_protocols) break; - if (*event.xclient.data.l != (ssize_t) windows->wm_delete_window) + if (*event.xclient.data.l != (long) windows->wm_delete_window) break; (void) XWithdrawWindow(display,event.xclient.window, visual_info->screen); @@ -15393,8 +15393,8 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, &window_changes); } } - if ((event.xconfigure.width == (ssize_t) windows->image.width) && - (event.xconfigure.height == (ssize_t) windows->image.height)) + if ((event.xconfigure.width == (int) windows->image.width) && + (event.xconfigure.height == (int) windows->image.height)) break; windows->image.width=(unsigned int) event.xconfigure.width; windows->image.height=(unsigned int) event.xconfigure.height; @@ -15738,7 +15738,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Display image named by the remote command protocol. */ status=XGetWindowProperty(display,event.xproperty.window, - event.xproperty.atom,0L,(ssize_t) MaxTextExtent,MagickFalse,(Atom) + event.xproperty.atom,0L,(long) MaxTextExtent,MagickFalse,(Atom) AnyPropertyType,&type,&format,&length,&after,&data); if ((status != Success) || (length == 0)) break; diff --git a/magick/feature.c b/magick/feature.c index b756f0b6c..faea16d21 100644 --- a/magick/feature.c +++ b/magick/feature.c @@ -184,7 +184,7 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, size_t length; - size_t + unsigned int number_grays; assert(image != (Image *) NULL); @@ -214,11 +214,11 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, } for (i=0; i <= (ssize_t) MaxMap; i++) { - grays[i].red=(~0UL); - grays[i].green=(~0UL); - grays[i].blue=(~0UL); - grays[i].opacity=(~0UL); - grays[i].index=(~0UL); + grays[i].red=(~0U); + grays[i].green=(~0U); + grays[i].blue=(~0U); + grays[i].opacity=(~0U); + grays[i].index=(~0U); } status=MagickTrue; image_view=AcquireCacheView(image); @@ -247,17 +247,17 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, indexes=GetCacheViewVirtualIndexQueue(image_view); for (x=0; x < (ssize_t) image->columns; x++) { - grays[ScaleQuantumToMap(p->red)].red=(unsigned long) + grays[ScaleQuantumToMap(p->red)].red= ScaleQuantumToMap(p->red); - grays[ScaleQuantumToMap(p->green)].green=(unsigned long) + grays[ScaleQuantumToMap(p->green)].green= ScaleQuantumToMap(p->green); - grays[ScaleQuantumToMap(p->blue)].blue=(unsigned long) + grays[ScaleQuantumToMap(p->blue)].blue= ScaleQuantumToMap(p->blue); if (image->matte != MagickFalse) - grays[ScaleQuantumToMap(p->opacity)].opacity=(unsigned long) + grays[ScaleQuantumToMap(p->opacity)].opacity= ScaleQuantumToMap(p->opacity); if (image->colorspace == CMYKColorspace) - grays[ScaleQuantumToMap(indexes[x])].index=(unsigned long) + grays[ScaleQuantumToMap(indexes[x])].index= ScaleQuantumToMap(indexes[x]); p++; } @@ -273,17 +273,17 @@ MagickExport ChannelFeatures *GetImageChannelFeatures(const Image *image, (void) ResetMagickMemory(&gray,0,sizeof(gray)); for (i=0; i <= (ssize_t) MaxMap; i++) { - if (grays[i].red != ~0UL) + if (grays[i].red != ~0U) grays[gray.red++].red=grays[i].red; - if (grays[i].green != ~0UL) + if (grays[i].green != ~0U) grays[gray.green++].green=grays[i].green; - if (grays[i].blue != ~0UL) + if (grays[i].blue != ~0U) grays[gray.blue++].blue=grays[i].blue; if (image->matte != MagickFalse) - if (grays[i].opacity != ~0UL) + if (grays[i].opacity != ~0U) grays[gray.opacity++].opacity=grays[i].opacity; if (image->colorspace == CMYKColorspace) - if (grays[i].index != ~0UL) + if (grays[i].index != ~0U) grays[gray.index++].index=grays[i].index; } /* diff --git a/magick/mime.c b/magick/mime.c index 763869844..88980c51f 100644 --- a/magick/mime.c +++ b/magick/mime.c @@ -82,7 +82,7 @@ struct _MimeInfo DataType data_type; - ssize_t + size_t mask, value; @@ -168,9 +168,6 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename, EndianType endian; - long - value; - register const MimeInfo *p; @@ -183,6 +180,9 @@ MagickExport const MimeInfo *GetMimeInfo(const char *filename, size_t lsb_first; + size_t + value; + assert(exception != (ExceptionInfo *) NULL); if ((mime_list == (LinkedListInfo *) NULL) || (instantiate_mime == MagickFalse)) @@ -886,11 +886,12 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename, } token=DestroyString(token); if (mime_info->data_type != StringData) - mime_info->value=strtol((char *) mime_info->magic,(char **) NULL,0); + mime_info->value=(size_t) strtoul((char *) mime_info->magic, + (char **) NULL,0); } attribute=GetXMLTreeAttribute(mime,"mask"); if (attribute != (const char *) NULL) - mime_info->mask=strtol(attribute,(char **) NULL,0); + mime_info->mask=(size_t) strtoul(attribute,(char **) NULL,0); attribute=GetXMLTreeAttribute(mime,"offset"); if (attribute != (const char *) NULL) { @@ -906,7 +907,7 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename, mime_info->pattern=ConstantString(attribute); attribute=GetXMLTreeAttribute(mime,"priority"); if (attribute != (const char *) NULL) - mime_info->priority=strtol(attribute,(char **) NULL,0); + mime_info->priority=(ssize_t) strtol(attribute,(char **) NULL,0); attribute=GetXMLTreeAttribute(mime,"stealth"); if (attribute != (const char *) NULL) mime_info->stealth=IsMagickTrue(attribute); diff --git a/magick/morphology.c b/magick/morphology.c index 52edcb0de..bce939dd6 100644 --- a/magick/morphology.c +++ b/magick/morphology.c @@ -1435,7 +1435,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, /* set all kernel values within diamond area to scale given */ for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++) for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++) - if ((labs(u)+labs(v)) <= (ssize_t)kernel->x) + if ((ssize_t) (labs((long) u)+labs((long) v)) <= kernel->x) kernel->positive_range += kernel->values[i] = args->sigma; else kernel->values[i] = nan; @@ -1813,7 +1813,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++) for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++) kernel->positive_range += ( kernel->values[i] = - args->sigma*((labs(u)>labs(v)) ? labs(u) : labs(v)) ); + args->sigma*((labs((long) u)>labs((long) v)) ? labs((long) u) : labs((long) v)) ); kernel->maximum = kernel->values[0]; break; } @@ -1833,7 +1833,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, for ( i=0, v=-kernel->y; v <= (ssize_t)kernel->y; v++) for ( u=-kernel->x; u <= (ssize_t)kernel->x; u++, i++) kernel->positive_range += ( kernel->values[i] = - args->sigma*(labs(u)+labs(v)) ); + args->sigma*(labs((long) u)+labs((long) v)) ); kernel->maximum = kernel->values[0]; break; } @@ -3347,8 +3347,8 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) else if ( x == 0 ) x = -y; else if ( x == -y ) y = 0; else if ( y == 0 ) y = x; - kernel->x = (size_t) x+1; - kernel->y = (size_t) y+1; + kernel->x = (ssize_t) x+1; + kernel->y = (ssize_t) y+1; } angle = fmod(angle+315.0, 360.0); /* angle reduced 45 degrees */ kernel->angle = fmod(kernel->angle+45.0, 360.0); @@ -3398,8 +3398,8 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) { register ssize_t x,y; x = (ssize_t) (kernel->x*2-kernel->width+1); y = (ssize_t) (kernel->y*2-kernel->height+1); - kernel->x = (size_t) ( -y +(ssize_t) kernel->width-1)/2; - kernel->y = (size_t) ( +x +(ssize_t) kernel->height-1)/2; + kernel->x = (ssize_t) ( -y +(ssize_t) kernel->width-1)/2; + kernel->y = (ssize_t) ( +x +(ssize_t) kernel->height-1)/2; } angle = fmod(angle+270.0, 360.0); /* angle reduced 90 degrees */ kernel->angle = fmod(kernel->angle+90.0, 360.0); diff --git a/magick/pixel.c b/magick/pixel.c index 909229cd8..133ceeda1 100644 --- a/magick/pixel.c +++ b/magick/pixel.c @@ -2742,10 +2742,10 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case LongPixel: { - register const size_t + register const unsigned int *p; - p=(const size_t *) pixels; + p=(const unsigned int *) pixels; if (LocaleCompare(map,"BGR") == 0) { for (y=0; y < (ssize_t) rows; y++) diff --git a/magick/quantize.c b/magick/quantize.c index cbdeb923c..b23377c23 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -786,7 +786,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, /* Start at the root and descend the color cube tree. */ - for (count=1; (x+count) < image->columns; count++) + for (count=1; (x+count) < (ssize_t) image->columns; count++) if (IsSameColor(image,p,p+count) == MagickFalse) break; AssociateAlphaPixel(cube_info,p,&pixel); @@ -875,7 +875,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, /* Start at the root and descend the color cube tree. */ - for (count=1; (x+count) < image->columns; count++) + for (count=1; (x+count) < (ssize_t) image->columns; count++) if (IsSameColor(image,p,p+count) == MagickFalse) break; AssociateAlphaPixel(cube_info,p,&pixel); diff --git a/magick/threshold.c b/magick/threshold.c index ab8d62227..d392ab474 100644 --- a/magick/threshold.c +++ b/magick/threshold.c @@ -1420,7 +1420,7 @@ MagickExport MagickBooleanType OrderedPosterizeImageChannel(Image *image, p = strchr((char *) threshold_map,','); if ( p != (char *)NULL && isdigit((int) ((unsigned char) *(++p))) ) - levels.index = (size_t) strtol(p, &p, 10); + levels.index = (unsigned int) strtoul(p, &p, 10); else levels.index = 2; @@ -1436,15 +1436,15 @@ MagickExport MagickBooleanType OrderedPosterizeImageChannel(Image *image, p=strchr((char *) threshold_map,','); p++; if ((channel & RedChannel) != 0) - levels.red = (size_t) strtol(p, &p, 10), (void)(*p == ',' && p++); + levels.red = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++); if ((channel & GreenChannel) != 0) - levels.green = (size_t) strtol(p, &p, 10), (void)(*p == ',' && p++); + levels.green = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++); if ((channel & BlueChannel) != 0) - levels.blue = (size_t) strtol(p, &p, 10), (void)(*p == ',' && p++); + levels.blue = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++); if ((channel & IndexChannel) != 0 && image->colorspace == CMYKColorspace) - levels.index=(size_t) strtol(p, &p, 10), (void)(*p == ',' && p++); + levels.index=(unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++); if ((channel & OpacityChannel) != 0) - levels.opacity = (size_t) strtol(p, &p, 10), (void)(*p == ',' && p++); + levels.opacity = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++); } } #else diff --git a/magick/utility.c b/magick/utility.c index b83d45d7a..dacabc359 100644 --- a/magick/utility.c +++ b/magick/utility.c @@ -1053,10 +1053,10 @@ MagickExport ssize_t GetMagickPageSize(void) if (page_size > 0) return(page_size); #if defined(MAGICKCORE_HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) - page_size=sysconf(_SC_PAGE_SIZE); + page_size=(ssize_t) sysconf(_SC_PAGE_SIZE); #else #if defined(MAGICKCORE_HAVE_GETPAGESIZE) - page_size=getpagesize(); + page_size=(ssize_t) getpagesize(); #endif #endif if (page_size <= 0) diff --git a/magick/widget.c b/magick/widget.c index 2d7efaec3..9036461a0 100644 --- a/magick/widget.c +++ b/magick/widget.c @@ -4237,7 +4237,7 @@ MagickExport void XFileBrowserWidget(Display *display,XWindows *windows, x, y; - register int + register ssize_t i; static char diff --git a/magick/xml-tree.c b/magick/xml-tree.c index 1eca76906..ccc34fa61 100644 --- a/magick/xml-tree.c +++ b/magick/xml-tree.c @@ -1966,7 +1966,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception) for (l=0; (*p != '\0') && (((l == 0) && (*p != '>')) || ((l != 0) && ((*p != ']') || (*(p+strspn(p+1,XMLWhitespace)+1) != '>')))); - l=(ssize_t) (*p == '[') ? 1 : l) + l=(ssize_t) ((*p == '[') ? 1 : l)) p+=strcspn(p+1,"[]>")+1; if ((*p == '\0') && (terminal != '>')) { diff --git a/magick/xwindow.c b/magick/xwindow.c index 73d1bf865..5554c7462 100644 --- a/magick/xwindow.c +++ b/magick/xwindow.c @@ -9044,8 +9044,8 @@ static Window XSelectWindow(Display *display,RectangleInfo *crop_info) target_window=root_window; x_offset=event.xbutton.x_root; y_offset=event.xbutton.y_root; - crop_info->x=x_offset; - crop_info->y=y_offset; + crop_info->x=(ssize_t) x_offset; + crop_info->y=(ssize_t) y_offset; crop_info->width=0; crop_info->height=0; presses++; @@ -9062,24 +9062,24 @@ static Window XSelectWindow(Display *display,RectangleInfo *crop_info) Discard pending button motion events. */ while (XCheckMaskEvent(display,ButtonMotionMask,&event)) ; - crop_info->x=event.xmotion.x; - crop_info->y=event.xmotion.y; + crop_info->x=(ssize_t) event.xmotion.x; + crop_info->y=(ssize_t) event.xmotion.y; /* Check boundary conditions. */ if ((int) crop_info->x < x_offset) - crop_info->width=(unsigned int) (x_offset-crop_info->x); + crop_info->width=(size_t) (x_offset-crop_info->x); else { - crop_info->width=(unsigned int) (crop_info->x-x_offset); - crop_info->x=x_offset; + crop_info->width=(size_t) (crop_info->x-x_offset); + crop_info->x=(ssize_t) x_offset; } if ((int) crop_info->y < y_offset) - crop_info->height=(unsigned int) (y_offset-crop_info->y); + crop_info->height=(size_t) (y_offset-crop_info->y); else { - crop_info->height=(unsigned int) (crop_info->y-y_offset); - crop_info->y=y_offset; + crop_info->height=(size_t) (crop_info->y-y_offset); + crop_info->y=(ssize_t) y_offset; } } default: