From: Cristy Date: Sat, 24 Feb 2018 17:45:52 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-24~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d293d27b7df79ecf3302cfa894ae3997d720d98;p=imagemagick ... --- diff --git a/MagickCore/display.c b/MagickCore/display.c index bca794191..c52935495 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -13149,7 +13149,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, p=image->directory; for (i=tile; (i != 0) && (*p != '\0'); ) { - if (*p == '\377') + if (*p == '\xff') i--; p++; } @@ -13259,7 +13259,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, *image_view; q=p; - while ((*q != '\377') && (*q != '\0')) + while ((*q != '\xff') && (*q != '\0')) q++; (void) CopyMagickString(filename,p,(size_t) (q-p+1)); p=q; diff --git a/MagickCore/identify.c b/MagickCore/identify.c index 45179dc77..118d197fa 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -1233,7 +1233,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, for (d=image->directory; *d != '\0'; d++) { q=d; - while ((*q != '\377') && (*q != '\0') && + while ((*q != '\xff') && (*q != '\0') && ((size_t) (q-d) < sizeof(image_info->filename))) q++; (void) CopyMagickString(image_info->filename,d,(size_t) (q-d+1)); diff --git a/MagickCore/montage.c b/MagickCore/montage.c index 7c750a3c8..2e0b92e9b 100644 --- a/MagickCore/montage.c +++ b/MagickCore/montage.c @@ -663,7 +663,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, { (void) ConcatenateMagickString(montage->directory, image_list[tile]->filename,extent); - (void) ConcatenateMagickString(montage->directory,"\377",extent); + (void) ConcatenateMagickString(montage->directory,"\xff",extent); tile++; } progress_monitor=SetImageProgressMonitor(montage,(MagickProgressMonitor) diff --git a/coders/html.c b/coders/html.c index 2ed89f909..511ba15d9 100644 --- a/coders/html.c +++ b/coders/html.c @@ -347,7 +347,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, } else for (p=image->directory; *p != '\0'; p++) - if (*p != '\377') + if (*p != '\xff') (void) WriteBlobByte(image,(unsigned char) *p); else { @@ -422,7 +422,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, } else for (p=image->directory; *p != '\0'; p++) - if (*p != '\377') + if (*p != '\xff') (void) WriteBlobByte(image,(unsigned char) *p); else { diff --git a/coders/json.c b/coders/json.c index 6ee4b29cc..d68ec22d3 100644 --- a/coders/json.c +++ b/coders/json.c @@ -1502,7 +1502,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, while (*p != '\0') { q=p; - while ((*q != '\377') && (*q != '\0')) + while ((*q != '\xff') && (*q != '\0')) q++; (void) CopyMagickString(image_info->filename,p,(size_t) (q-p+1)); p=q+1;