diff --git a/coders/bgr.c b/coders/bgr.c
index 7ed112b..1c7a140 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1329,7 +1329,7 @@
}
if (image_info->interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
@@ -1452,7 +1452,7 @@
}
(void) CloseBlob(image);
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
diff --git a/coders/bmp.c b/coders/bmp.c
index f555c14..2569e09 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -601,7 +601,7 @@
/*
OS/2 BMP image file.
*/
- (void) CopyMagickString(image->magick,"BMP2",MaxTextExtent);
+ (void) CopyMagickString(image->magick,"BMP2",MagickPathExtent);
bmp_info.width=(ssize_t) ((short) ReadBlobLSBShort(image));
bmp_info.height=(ssize_t) ((short) ReadBlobLSBShort(image));
bmp_info.planes=ReadBlobLSBShort(image);
@@ -758,7 +758,7 @@
bmp_info.gamma_scale.z)/3.0;
}
else
- (void) CopyMagickString(image->magick,"BMP3",MaxTextExtent);
+ (void) CopyMagickString(image->magick,"BMP3",MagickPathExtent);
if (bmp_info.size > 108)
{
diff --git a/coders/braille.c b/coders/braille.c
index 2ceabe1..7212811 100644
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -168,7 +168,7 @@
Image *image,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
const char
*value;
@@ -221,25 +221,25 @@
value=GetImageProperty(image,"label",exception);
if (value != (const char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"Title: %s\n", value);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"Title: %s\n", value);
(void) WriteBlobString(image,buffer);
}
if (image->page.x != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"X: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"X: %.20g\n",(double)
image->page.x);
(void) WriteBlobString(image,buffer);
}
if (image->page.y != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"Y: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"Y: %.20g\n",(double)
image->page.y);
(void) WriteBlobString(image,buffer);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"Width: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"Width: %.20g\n",(double)
(image->columns+(image->columns % 2)));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"Height: %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"Height: %.20g\n",(double)
image->rows);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"\n");
diff --git a/coders/cals.c b/coders/cals.c
index 550c960..f5392ad 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -144,9 +144,9 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- header[MaxTextExtent],
- message[MaxTextExtent];
+ filename[MagickPathExtent],
+ header[MagickPathExtent],
+ message[MagickPathExtent];
FILE
*file;
@@ -263,21 +263,21 @@
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"group4:%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"group4:%s",
filename);
- (void) FormatLocaleString(message,MaxTextExtent,"%lux%lu",width,height);
+ (void) FormatLocaleString(message,MagickPathExtent,"%lux%lu",width,height);
(void) CloneString(&read_info->size,message);
- (void) FormatLocaleString(message,MaxTextExtent,"%lu",density);
+ (void) FormatLocaleString(message,MagickPathExtent,"%lu",density);
(void) CloneString(&read_info->density,message);
read_info->orientation=(OrientationType) orientation;
image=ReadImage(read_info,exception);
if (image != (Image *) NULL)
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(image->magick_filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,"CALS",MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,"CALS",MagickPathExtent);
}
read_info=DestroyImageInfo(read_info);
(void) RelinquishUniqueFileResource(filename);
@@ -552,8 +552,8 @@
Write CALS pixels.
*/
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
- (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent);
+ (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent);
group4_image=CloneImage(image,0,0,MagickTrue,exception);
if (group4_image == (Image *) NULL)
{
diff --git a/coders/caption.c b/coders/caption.c
index 4be097d..9abb492 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -95,7 +95,7 @@
{
char
*caption,
- geometry[MaxTextExtent],
+ geometry[MagickPathExtent],
*property,
*text;
@@ -166,7 +166,7 @@
exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -182,7 +182,7 @@
exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -218,7 +218,7 @@
exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -244,7 +244,7 @@
exception);
(void) CloneString(&draw_info->text,text);
text=DestroyString(text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -272,7 +272,7 @@
*/
i=FormatMagickCaption(image,draw_info,split,&metrics,&caption,exception);
(void) CloneString(&draw_info->text,caption);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
draw_info->direction == RightToLeftDirection ? image->columns-
metrics.bounds.x2 : -metrics.bounds.x1,draw_info->gravity ==
UndefinedGravity ? metrics.ascent : 0.0);
@@ -281,9 +281,9 @@
if (image_info->pointsize == 0.0)
{
char
- pointsize[MaxTextExtent];
+ pointsize[MagickPathExtent];
- (void) FormatLocaleString(pointsize,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(pointsize,MagickPathExtent,"%.20g",
draw_info->pointsize);
(void) SetImageProperty(image,"caption:pointsize",pointsize,exception);
}
diff --git a/coders/cin.c b/coders/cin.c
index b2e094d..3e2edbb 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -382,7 +382,7 @@
#define RGBColorType 3
char
- property[MaxTextExtent];
+ property[MagickPathExtent];
CINInfo
cin;
@@ -887,7 +887,7 @@
ExceptionInfo *exception)
{
char
- timestamp[MaxTextExtent];
+ timestamp[MagickPathExtent];
const char
*value;
@@ -989,7 +989,7 @@
(void) memcpy(&local_time,localtime(&seconds),sizeof(local_time));
#endif
(void) memset(timestamp,0,sizeof(timestamp));
- (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time);
+ (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time);
(void) memset(cin.file.create_date,0,sizeof(cin.file.create_date));
(void) CopyMagickString(cin.file.create_date,timestamp,11);
offset+=WriteBlob(image,sizeof(cin.file.create_date),(unsigned char *)
@@ -1087,7 +1087,7 @@
cin.origination.filename);
seconds=time((time_t *) NULL);
(void) memset(timestamp,0,sizeof(timestamp));
- (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time);
+ (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time);
(void) memset(cin.origination.create_date,0,
sizeof(cin.origination.create_date));
(void) CopyMagickString(cin.origination.create_date,timestamp,11);
diff --git a/coders/cip.c b/coders/cip.c
index 0badf22..c4fdd67 100644
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -161,7 +161,7 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
const char
*value;
@@ -199,30 +199,30 @@
(void) WriteBlobString(image,"<CiscoIPPhoneImage>\n");
value=GetImageProperty(image,"label",exception);
if (value != (const char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"<Title>%s</Title>\n",value);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<Title>%s</Title>\n",value);
else
{
char
- basename[MaxTextExtent];
+ basename[MagickPathExtent];
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,"<Title>%s</Title>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<Title>%s</Title>\n",
basename);
}
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"<LocationX>%.20g</LocationX>\n",(double) image->page.x);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"<LocationY>%.20g</LocationY>\n",(double) image->page.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"<Width>%.20g</Width>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<Width>%.20g</Width>\n",
(double) (image->columns+(image->columns % 2)));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"<Height>%.20g</Height>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<Height>%.20g</Height>\n",
(double) image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"<Depth>2</Depth>\n");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<Depth>2</Depth>\n");
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<Data>");
(void) TransformImageColorspace(image,sRGBColorspace,exception);
@@ -238,7 +238,7 @@
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+2))/QuantumRange) & 0x03) << 4) |
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+1))/QuantumRange) & 0x03) << 2) |
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+0))/QuantumRange) & 0x03) << 0));
- (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",byte);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%02x",byte);
(void) WriteBlobString(image,buffer);
p+=4;
}
@@ -250,7 +250,7 @@
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,2)))/QuantumRange) & 0x03) << 4) |
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,1)))/QuantumRange) & 0x03) << 2) |
(((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,0)))/QuantumRange) & 0x03) << 0));
- (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",~byte);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%02x",~byte);
(void) WriteBlobString(image,buffer);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/clip.c b/coders/clip.c
index 59a3705..3931bcb 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -108,7 +108,7 @@
assert(exception->signature == MagickSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
@@ -232,11 +232,11 @@
clip_image=GetImageMask(image,exception);
if (clip_image == (Image *) NULL)
return(MagickFalse);
- (void) CopyMagickString(clip_image->filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(clip_image->filename,image->filename,MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"CLIP") == 0)
- (void) FormatLocaleString(clip_image->filename,MaxTextExtent,"miff:%s",
+ (void) FormatLocaleString(clip_image->filename,MagickPathExtent,"miff:%s",
write_info->filename);
status=WriteImage(write_info,clip_image,exception);
clip_image=DestroyImage(clip_image);
diff --git a/coders/cmyk.c b/coders/cmyk.c
index ee4f063..8246009 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -1463,7 +1463,7 @@
}
if (image_info->interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
@@ -1611,7 +1611,7 @@
}
(void) CloseBlob(image);
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
diff --git a/coders/cut.c b/coders/cut.c
index e7be764..af39e75 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -399,11 +399,11 @@
}
(void) CopyMagickString(clone_info->filename+i,".PAL",(size_t)
- (MaxTextExtent-i));
+ (MagickPathExtent-i));
if((clone_info->file=fopen_utf8(clone_info->filename,"rb"))==NULL)
{
(void) CopyMagickString(clone_info->filename+i,".pal",(size_t)
- (MaxTextExtent-i));
+ (MagickPathExtent-i));
if((clone_info->file=fopen_utf8(clone_info->filename,"rb"))==NULL)
{
clone_info->filename[i]='\0';
diff --git a/coders/dcm.c b/coders/dcm.c
index fe65a80..f1b3932 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -2764,10 +2764,10 @@
static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- explicit_vr[MaxTextExtent],
- implicit_vr[MaxTextExtent],
- magick[MaxTextExtent],
- photometric[MaxTextExtent];
+ explicit_vr[MagickPathExtent],
+ implicit_vr[MagickPathExtent],
+ magick[MagickPathExtent],
+ photometric[MagickPathExtent];
DCMStreamInfo
*stream_info;
@@ -2876,7 +2876,7 @@
/*
Read DCM Medical image.
*/
- (void) CopyMagickString(photometric,"MONOCHROME1 ",MaxTextExtent);
+ (void) CopyMagickString(photometric,"MONOCHROME1 ",MagickPathExtent);
bits_allocated=8;
bytes_per_pixel=1;
polarity=MagickFalse;
@@ -2925,7 +2925,7 @@
for (i=0; dicom_info[i].group < 0xffff; i++)
if ((group == dicom_info[i].group) && (element == dicom_info[i].element))
break;
- (void) CopyMagickString(implicit_vr,dicom_info[i].vr,MaxTextExtent);
+ (void) CopyMagickString(implicit_vr,dicom_info[i].vr,MagickPathExtent);
count=ReadBlob(image,2,(unsigned char *) explicit_vr);
if (count != 2)
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
@@ -2939,7 +2939,7 @@
use_explicit=((group == 0x0002) && (explicit_retry == MagickFalse)) ||
(explicit_file != MagickFalse) ? MagickTrue : MagickFalse;
if ((use_explicit != MagickFalse) && (strncmp(implicit_vr,"xs",2) == 0))
- (void) CopyMagickString(implicit_vr,explicit_vr,MaxTextExtent);
+ (void) CopyMagickString(implicit_vr,explicit_vr,MagickPathExtent);
if ((use_explicit == MagickFalse) || (strncmp(implicit_vr,"!!",2) == 0))
{
offset=SeekBlob(image,(MagickOffsetType) -2,SEEK_CUR);
@@ -3104,7 +3104,7 @@
case 0x0010:
{
char
- transfer_syntax[MaxTextExtent];
+ transfer_syntax[MagickPathExtent];
/*
Transfer Syntax.
@@ -3123,7 +3123,7 @@
*transfer_syntax='\0';
if (data != (unsigned char *) NULL)
(void) CopyMagickString(transfer_syntax,(char *) data,
- MaxTextExtent);
+ MagickPathExtent);
if (image_info->verbose != MagickFalse)
(void) FormatLocaleFile(stdout,"transfer_syntax=%s\n",
(const char *) transfer_syntax);
@@ -3193,7 +3193,7 @@
/*
Photometric interpretation.
*/
- for (i=0; i < (ssize_t) MagickMin(length,MaxTextExtent-1); i++)
+ for (i=0; i < (ssize_t) MagickMin(length,MagickPathExtent-1); i++)
photometric[i]=(char) data[i];
photometric[i]='\0';
polarity=LocaleCompare(photometric,"MONOCHROME1 ") == 0 ?
@@ -3547,7 +3547,7 @@
for (scene=0; scene < (ssize_t) number_scenes; scene++)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
const char
*property;
@@ -3593,10 +3593,10 @@
(void) fputc(c,file);
}
(void) fclose(file);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,
"jpeg:%s",filename);
if (image->compression == JPEG2000Compression)
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,
"j2k:%s",filename);
jpeg_image=ReadImage(read_info,exception);
if (jpeg_image != (Image *) NULL)
diff --git a/coders/dds.c b/coders/dds.c
index 83e562e..663f528 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2683,7 +2683,7 @@
const size_t compression, const size_t mipmaps)
{
char
- software[MaxTextExtent];
+ software[MagickPathExtent];
register ssize_t
i;
@@ -2723,7 +2723,7 @@
(void) WriteBlobLSBLong(image,0x00);
(void) WriteBlobLSBLong(image,(unsigned int) mipmaps+1);
(void) ResetMagickMemory(software,0,sizeof(software));
- (void) CopyMagickString(software,"IMAGEMAGICK",MaxTextExtent);
+ (void) CopyMagickString(software,"IMAGEMAGICK",MagickPathExtent);
(void) WriteBlob(image,44,(unsigned char *) software);
(void) WriteBlobLSBLong(image,32);
diff --git a/coders/debug.c b/coders/debug.c
index 3c3bdb9..48b12c6 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -165,9 +165,9 @@
Image *image,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
- colorspace[MaxTextExtent],
- tuple[MaxTextExtent];
+ buffer[MagickPathExtent],
+ colorspace[MagickPathExtent],
+ tuple[MagickPathExtent];
ssize_t
y;
@@ -203,12 +203,12 @@
do
{
(void) CopyMagickString(colorspace,CommandOptionToMnemonic(
- MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent);
+ MagickColorspaceOptions,(ssize_t) image->colorspace),MagickPathExtent);
LocaleLower(colorspace);
image->depth=GetImageQuantumDepth(image,MagickTrue);
if (image->alpha_trait != UndefinedPixelTrait)
- (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) ConcatenateMagickString(colorspace,"a",MagickPathExtent);
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"# ImageMagick pixel debugging: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double) ((MagickOffsetType)
GetQuantumRange(image->depth)),colorspace);
@@ -221,29 +221,29 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
GetPixelInfoPixel(image,p,&pixel);
- (void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
+ (void) FormatLocaleString(tuple,MagickPathExtent,"%.20g,%.20g,%.20g ",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
if (pixel.colorspace == CMYKColorspace)
{
char
- black[MaxTextExtent];
+ black[MagickPathExtent];
- (void) FormatLocaleString(black,MaxTextExtent,",%.20g ",
+ (void) FormatLocaleString(black,MagickPathExtent,",%.20g ",
(double) pixel.black);
- (void) ConcatenateMagickString(tuple,black,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,black,MagickPathExtent);
}
if (pixel.alpha_trait != UndefinedPixelTrait)
{
char
- alpha[MaxTextExtent];
+ alpha[MagickPathExtent];
- (void) FormatLocaleString(alpha,MaxTextExtent,",%.20g ",
+ (void) FormatLocaleString(alpha,MagickPathExtent,",%.20g ",
(double) pixel.alpha);
- (void) ConcatenateMagickString(tuple,alpha,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,alpha,MagickPathExtent);
}
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
diff --git a/coders/djvu.c b/coders/djvu.c
index e359ab3..7720792 100644
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -928,7 +928,7 @@
ModuleExport size_t RegisterDJVUImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
@@ -943,8 +943,8 @@
*version='\0';
#if defined(DJVU_LIBDJVU_VER_STRING)
- (void) ConcatenateMagickString(version,"libdjvu ",MaxTextExtent);
- (void) ConcatenateMagickString(version,DJVU_LIBDJVU_VER_STRING,MaxTextExtent);
+ (void) ConcatenateMagickString(version,"libdjvu ",MagickPathExtent);
+ (void) ConcatenateMagickString(version,DJVU_LIBDJVU_VER_STRING,MagickPathExtent);
#endif
entry=AcquireMagickInfo("DJVU","DJVU","Déjà vu");
#if defined(MAGICKCORE_DJVU_DELEGATE)
diff --git a/coders/dng.c b/coders/dng.c
index 8e8c41c..746806f 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -131,14 +131,14 @@
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception);
image=DestroyImage(image);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.png",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.png",
read_info->unique);
sans_exception=AcquireExceptionInfo();
image=ReadImage(read_info,sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
if (image == (Image *) NULL)
{
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.ppm",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.ppm",
read_info->unique);
image=ReadImage(read_info,exception);
}
@@ -146,17 +146,17 @@
if (image != (Image *) NULL)
{
char
- filename[MaxTextExtent],
+ filename[MagickPathExtent],
*xml;
ExceptionInfo
*sans;
- (void) CopyMagickString(image->magick,read_info->magick,MaxTextExtent);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s.ufraw",
+ (void) CopyMagickString(image->magick,read_info->magick,MagickPathExtent);
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s.ufraw",
read_info->unique);
sans=AcquireExceptionInfo();
- xml=FileToString(filename,MaxTextExtent,sans);
+ xml=FileToString(filename,MagickPathExtent,sans);
(void) RelinquishUniqueFileResource(filename);
if (xml != (char *) NULL)
{
@@ -171,7 +171,7 @@
{
char
*content,
- property[MaxTextExtent];
+ property[MagickPathExtent];
const char
*tag;
@@ -189,7 +189,7 @@
tag=GetXMLTreeTag(next);
if (tag == (char *) NULL)
tag="unknown";
- (void) FormatLocaleString(property,MaxTextExtent,"dng:%s",tag);
+ (void) FormatLocaleString(property,MagickPathExtent,"dng:%s",tag);
content=ConstantString(GetXMLTreeContent(next));
StripString(content);
if ((LocaleCompare(tag,"log") != 0) &&
diff --git a/coders/dot.c b/coders/dot.c
index 30be265..d3aa8ea 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -98,7 +98,7 @@
static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
const char
*option;
@@ -131,9 +131,9 @@
return((Image *) NULL);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) CopyMagickString(read_info->magick,"SVG",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"SVG",MagickPathExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatLocaleString(command,MaxTextExtent,"-Tsvg -o%s %s",
+ (void) FormatLocaleString(command,MagickPathExtent,"-Tsvg -o%s %s",
read_info->filename,image_info->filename);
#if !defined(WITH_CGRAPH)
graph=agread(GetBlobFileHandle(image));
diff --git a/coders/dpx.c b/coders/dpx.c
index 218bfd9..64c26b2 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -640,7 +640,7 @@
shift=4*TimeFields;
for (i=0; i <= TimeFields; i++)
{
- (void) FormatLocaleString(code,MaxTextExtent-strlen(code),"%x",
+ (void) FormatLocaleString(code,MagickPathExtent-strlen(code),"%x",
(unsigned int) ((timestamp >> shift) & 0x0fU));
code++;
if (((i % 2) != 0) && (i < TimeFields))
@@ -654,7 +654,7 @@
{
char
magick[4],
- value[MaxTextExtent];
+ value[MagickPathExtent];
DPXInfo
dpx;
@@ -815,7 +815,7 @@
for (i=0; i < 8; i++)
{
char
- property[MaxTextExtent];
+ property[MagickPathExtent];
dpx.image.image_element[i].data_sign=ReadBlobLong(image);
offset+=4;
@@ -831,7 +831,7 @@
offset++;
dpx.image.image_element[i].transfer_characteristic=(unsigned char)
ReadBlobByte(image);
- (void) FormatLocaleString(property,MaxTextExtent,
+ (void) FormatLocaleString(property,MagickPathExtent,
"dpx:image.element[%lu].transfer-characteristic",(long) i);
(void) FormatImageProperty(image,property,"%s",
GetImageTransferCharacteristic((DPXTransferCharacteristic)
diff --git a/coders/emf.c b/coders/emf.c
index a5044a3..183bbce 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -685,7 +685,7 @@
*p;
wchar_t
- fileName[MaxTextExtent];
+ fileName[MagickPathExtent];
assert(image_info != (const ImageInfo *) NULL);
assert(image_info->signature == MagickSignature);
@@ -698,7 +698,7 @@
if (Gdiplus::GdiplusStartup(&token,&startup_input,NULL) !=
Gdiplus::Status::Ok)
ThrowReaderException(CoderError, "GdiplusStartupFailed");
- MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,MaxTextExtent);
+ MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,MagickPathExtent);
source=Gdiplus::Image::FromFile(fileName);
if (source == (Gdiplus::Image *) NULL)
{
diff --git a/coders/ept.c b/coders/ept.c
index 9bf8c44..46e6aba 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -230,20 +230,20 @@
(void) CloseBlob(image);
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(read_info->magick,"EPS",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"EPS",MagickPathExtent);
image=BlobToImage(read_info,ept_info.postscript,ept_info.postscript_length,
exception);
if (image == (Image *) NULL)
{
- (void) CopyMagickString(read_info->magick,"TIFF",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent);
image=BlobToImage(read_info,ept_info.tiff,ept_info.tiff_length,exception);
}
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,"EPT",MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,"EPT",MagickPathExtent);
}
ept_info.tiff=(unsigned char *) RelinquishMagickMemory(ept_info.tiff);
ept_info.postscript=(unsigned char *) RelinquishMagickMemory(
@@ -364,7 +364,7 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
EPTInfo
ept_info;
@@ -396,11 +396,11 @@
if (write_image == (Image *) NULL)
return(MagickFalse);
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->magick,"EPS",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"EPS",MagickPathExtent);
if (LocaleCompare(image_info->magick,"EPT2") == 0)
- (void) CopyMagickString(write_info->magick,"EPS2",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"EPS2",MagickPathExtent);
if (LocaleCompare(image_info->magick,"EPT3") == 0)
- (void) CopyMagickString(write_info->magick,"EPS3",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"EPS3",MagickPathExtent);
(void) ResetMagickMemory(&ept_info,0,sizeof(ept_info));
ept_info.magick=0xc6d3d0c5ul;
ept_info.postscript=(unsigned char *) ImageToBlob(write_info,write_image,
@@ -414,10 +414,10 @@
return(MagickFalse);
write_info=CloneImageInfo(image_info);
*write_info->magick='\0';
- (void) CopyMagickString(write_info->magick,"TIFF",MaxTextExtent);
- (void) FormatLocaleString(filename,MaxTextExtent,"tiff:%s",
+ (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent);
+ (void) FormatLocaleString(filename,MagickPathExtent,"tiff:%s",
write_info->filename);
- (void) CopyMagickString(write_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,filename,MagickPathExtent);
(void) TransformImage(&write_image,(char *) NULL,"512x512>",exception);
if ((write_image->storage_class == DirectClass) ||
(write_image->colors > 256))
diff --git a/coders/fax.c b/coders/fax.c
index 9700cfe..9edd24b 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -323,7 +323,7 @@
if (status == MagickFalse)
return(status);
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->magick,"FAX",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"FAX",MagickPathExtent);
scene=0;
do
{
diff --git a/coders/fits.c b/coders/fits.c
index 2e70332..8caf858 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -248,7 +248,7 @@
char
*comment,
keyword[9],
- property[MaxTextExtent],
+ property[MagickPathExtent],
value[73];
double
@@ -384,7 +384,7 @@
else
fits_info.endian=LSBEndian;
}
- (void) FormatLocaleString(property,MaxTextExtent,"fits:%s",keyword);
+ (void) FormatLocaleString(property,MagickPathExtent,"fits:%s",keyword);
(void) SetImageProperty(image,property,p,exception);
}
c=0;
diff --git a/coders/fpx.c b/coders/fpx.c
index 0526b9c..40a4061 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -270,9 +270,9 @@
Note image label.
*/
label=(char *) NULL;
- if (~summary_info.title.length >= (MaxTextExtent-1))
+ if (~summary_info.title.length >= (MagickPathExtent-1))
label=(char *) AcquireQuantumMemory(summary_info.title.length+
- MaxTextExtent,sizeof(*label));
+ MagickPathExtent,sizeof(*label));
if (label == (char *) NULL)
{
FPX_ClearSystem();
@@ -294,9 +294,9 @@
Note image comment.
*/
comments=(char *) NULL;
- if (~summary_info.comments.length >= (MaxTextExtent-1))
+ if (~summary_info.comments.length >= (MagickPathExtent-1))
comments=(char *) AcquireQuantumMemory(summary_info.comments.length+
- MaxTextExtent,sizeof(*comments));
+ MagickPathExtent,sizeof(*comments));
if (comments == (char *) NULL)
{
FPX_ClearSystem();
@@ -905,13 +905,13 @@
summary_info.title_valid=MagickTrue;
length=strlen(label);
summary_info.title.length=length;
- if (~length >= (MaxTextExtent-1))
+ if (~length >= (MagickPathExtent-1))
summary_info.title.ptr=(unsigned char *) AcquireQuantumMemory(
- length+MaxTextExtent,sizeof(*summary_info.title.ptr));
+ length+MagickPathExtent,sizeof(*summary_info.title.ptr));
if (summary_info.title.ptr == (unsigned char *) NULL)
ThrowWriterException(DelegateError,"UnableToSetImageTitle");
(void) CopyMagickString((char *) summary_info.title.ptr,label,
- MaxTextExtent);
+ MagickPathExtent);
}
comment=GetImageProperty(image,"comment",exception);
if (comment != (const char *) NULL)
diff --git a/coders/gif.c b/coders/gif.c
index 9af80a7..d0cab31 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -981,7 +981,7 @@
c,
flag,
*global_colormap,
- header[MaxTextExtent],
+ header[MagickPathExtent],
magick[12];
/*
@@ -1115,7 +1115,7 @@
else
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
int
block_length,
@@ -1732,7 +1732,7 @@
if ((image->gamma != 1.0f/2.2f))
{
char
- attributes[MaxTextExtent];
+ attributes[MagickPathExtent];
ssize_t
count;
@@ -1746,7 +1746,7 @@
(void) WriteBlobByte(image,(unsigned char) 0xff);
(void) WriteBlobByte(image,(unsigned char) 0x0b);
(void) WriteBlob(image,11,(unsigned char *) "ImageMagick");
- count=FormatLocaleString(attributes,MaxTextExtent,"gamma=%g",
+ count=FormatLocaleString(attributes,MagickPathExtent,"gamma=%g",
image->gamma);
(void) WriteBlobByte(image,(unsigned char) count);
(void) WriteBlob(image,(size_t) count,(unsigned char *) attributes);
@@ -1821,7 +1821,7 @@
else
{
char
- extension[MaxTextExtent];
+ extension[MagickPathExtent];
/*
Write generic extension.
diff --git a/coders/gradient.c b/coders/gradient.c
index 3ea5bd1..59d455f 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -96,7 +96,7 @@
ExceptionInfo *exception)
{
char
- colorname[MaxTextExtent];
+ colorname[MagickPathExtent];
Image
*image;
@@ -124,20 +124,20 @@
assert(exception->signature == MagickSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) CopyMagickString(colorname,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(colorname,image_info->filename,MagickPathExtent);
(void) sscanf(image_info->filename,"%[^-]",colorname);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"xc:%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"xc:%s",
colorname);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image == (Image *) NULL)
return((Image *) NULL);
(void) SetImageAlpha(image,(Quantum) TransparentAlpha,exception);
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
icc_color=MagickFalse;
if (LocaleCompare(colorname,"icc") == 0)
{
- (void) ConcatenateMagickString(colorname,"-",MaxTextExtent);
+ (void) ConcatenateMagickString(colorname,"-",MagickPathExtent);
(void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname+4);
icc_color=MagickTrue;
}
@@ -148,9 +148,9 @@
return((Image *) NULL);
}
(void) SetImageColorspace(image,start_color.colorspace,exception);
- (void) CopyMagickString(colorname,"white",MaxTextExtent);
+ (void) CopyMagickString(colorname,"white",MagickPathExtent);
if (GetPixelInfoIntensity(image,&start_color) > (QuantumRange/2.0))
- (void) CopyMagickString(colorname,"black",MaxTextExtent);
+ (void) CopyMagickString(colorname,"black",MagickPathExtent);
if (icc_color == MagickFalse)
(void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname);
else
diff --git a/coders/hdr.c b/coders/hdr.c
index 4cc2f1c..23a2af8 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -135,10 +135,10 @@
static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- format[MaxTextExtent],
- keyword[MaxTextExtent],
- tag[MaxTextExtent],
- value[MaxTextExtent];
+ format[MagickPathExtent],
+ keyword[MagickPathExtent],
+ tag[MagickPathExtent],
+ value[MagickPathExtent];
double
gamma;
@@ -217,7 +217,7 @@
/*
Read comment-- any text between # and end-of-line.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
comment=AcquireString((char *) NULL);
for (p=comment; comment != (char *) NULL; p++)
{
@@ -229,7 +229,7 @@
*p='\0';
length<<=1;
comment=(char *) ResizeQuantumMemory(comment,length+
- MaxTextExtent,sizeof(*comment));
+ MagickPathExtent,sizeof(*comment));
if (comment == (char *) NULL)
break;
p=comment+strlen(comment);
@@ -257,7 +257,7 @@
p=keyword;
do
{
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
} while (isalnum(c) || (c == '_'));
@@ -276,7 +276,7 @@
p=value;
while ((c != '\n') && (c != '\0') && (c != EOF))
{
- if ((size_t) (p-value) < (MaxTextExtent-1))
+ if ((size_t) (p-value) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
}
@@ -291,10 +291,10 @@
{
if (LocaleCompare(keyword,"format") == 0)
{
- (void) CopyMagickString(format,value,MaxTextExtent);
+ (void) CopyMagickString(format,value,MagickPathExtent);
break;
}
- (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value,exception);
break;
}
@@ -306,7 +306,7 @@
image->gamma=StringToDouble(value,(char **) NULL);
break;
}
- (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value,exception);
break;
}
@@ -339,7 +339,7 @@
}
break;
}
- (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value,exception);
break;
}
@@ -362,13 +362,13 @@
}
break;
}
- (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value,exception);
break;
}
default:
{
- (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword);
+ (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword);
(void) SetImageProperty(image,tag,value,exception);
break;
}
@@ -659,7 +659,7 @@
ExceptionInfo *exception)
{
char
- header[MaxTextExtent];
+ header[MagickPathExtent];
const char
*property;
@@ -704,38 +704,38 @@
/*
Write header.
*/
- (void) ResetMagickMemory(header,' ',MaxTextExtent);
- length=CopyMagickString(header,"#?RGBE\n",MaxTextExtent);
+ (void) ResetMagickMemory(header,' ',MagickPathExtent);
+ length=CopyMagickString(header,"#?RGBE\n",MagickPathExtent);
(void) WriteBlob(image,length,(unsigned char *) header);
property=GetImageProperty(image,"comment",exception);
if ((property != (const char *) NULL) &&
(strchr(property,'\n') == (char *) NULL))
{
- count=FormatLocaleString(header,MaxTextExtent,"#%s\n",property);
+ count=FormatLocaleString(header,MagickPathExtent,"#%s\n",property);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
property=GetImageProperty(image,"hdr:exposure",exception);
if (property != (const char *) NULL)
{
- count=FormatLocaleString(header,MaxTextExtent,"EXPOSURE=%g\n",
+ count=FormatLocaleString(header,MagickPathExtent,"EXPOSURE=%g\n",
strtod(property,(char **) NULL));
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
if (image->gamma != 0.0)
{
- count=FormatLocaleString(header,MaxTextExtent,"GAMMA=%g\n",image->gamma);
+ count=FormatLocaleString(header,MagickPathExtent,"GAMMA=%g\n",image->gamma);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
}
- count=FormatLocaleString(header,MaxTextExtent,
+ count=FormatLocaleString(header,MagickPathExtent,
"PRIMARIES=%g %g %g %g %g %g %g %g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,image->chromaticity.green_primary.y,
image->chromaticity.blue_primary.x,image->chromaticity.blue_primary.y,
image->chromaticity.white_point.x,image->chromaticity.white_point.y);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
- length=CopyMagickString(header,"FORMAT=32-bit_rle_rgbe\n\n",MaxTextExtent);
+ length=CopyMagickString(header,"FORMAT=32-bit_rle_rgbe\n\n",MagickPathExtent);
(void) WriteBlob(image,length,(unsigned char *) header);
- count=FormatLocaleString(header,MaxTextExtent,"-Y %.20g +X %.20g\n",
+ count=FormatLocaleString(header,MagickPathExtent,"-Y %.20g +X %.20g\n",
(double) image->rows,(double) image->columns);
(void) WriteBlob(image,(size_t) count,(unsigned char *) header);
/*
diff --git a/coders/histogram.c b/coders/histogram.c
index b693787..cb7ad5c 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -175,7 +175,7 @@
#define HistogramDensity "256x200"
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
const char
*option;
@@ -367,11 +367,11 @@
Write Histogram image.
*/
(void) CopyMagickString(histogram_image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"HISTOGRAM") == 0)
- (void) FormatLocaleString(histogram_image->filename,MaxTextExtent,"miff:%s",
+ (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,"miff:%s",
write_info->filename);
status=WriteImage(write_info,histogram_image,exception);
histogram_image=DestroyImage(histogram_image);
diff --git a/coders/html.c b/coders/html.c
index ea71c44..69e1000 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -207,11 +207,11 @@
Image *image,ExceptionInfo *exception)
{
char
- basename[MaxTextExtent],
- buffer[MaxTextExtent],
- filename[MaxTextExtent],
- mapname[MaxTextExtent],
- url[MaxTextExtent];
+ basename[MagickPathExtent],
+ buffer[MagickPathExtent],
+ filename[MagickPathExtent],
+ mapname[MagickPathExtent],
+ url[MagickPathExtent];
Image
*next;
@@ -256,23 +256,23 @@
if (p != (char *) NULL)
{
p++;
- (void) CopyMagickString(url,image_info->magick,MaxTextExtent);
- (void) ConcatenateMagickString(url,":",MaxTextExtent);
+ (void) CopyMagickString(url,image_info->magick,MagickPathExtent);
+ (void) ConcatenateMagickString(url,":",MagickPathExtent);
url[strlen(url)+p-image->filename]='\0';
(void) ConcatenateMagickString(url,image->filename,
p-image->filename+2);
- (void) CopyMagickString(image->filename,p,MaxTextExtent);
+ (void) CopyMagickString(image->filename,p,MagickPathExtent);
}
}
/*
Refer to image map file.
*/
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
AppendImageFormat("map",filename);
GetPathComponent(filename,BasePath,basename);
- (void) CopyMagickString(mapname,basename,MaxTextExtent);
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(mapname,basename,MagickPathExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
write_info=CloneImageInfo(image_info);
*write_info->magick='\0';
write_info->adjoin=MagickTrue;
@@ -301,24 +301,24 @@
(void) WriteBlobString(image,"<head>\n");
value=GetImageProperty(image,"label",exception);
if (value != (const char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"<title>%s</title>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<title>%s</title>\n",
value);
else
{
GetPathComponent(filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"<title>%s</title>\n",basename);
}
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"</head>\n");
(void) WriteBlobString(image,"<body style=\"text-align: center;\">\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"<h1>%s</h1>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<h1>%s</h1>\n",
image->filename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<div>\n");
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
AppendImageFormat("png",filename);
- (void) FormatLocaleString(buffer,MaxTextExtent,"<img usemap=\"#%s\" "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"<img usemap=\"#%s\" "
"src=\"%s\" style=\"border: 0;\" alt=\"Image map\" />\n",mapname,
filename);
(void) WriteBlobString(image,buffer);
@@ -331,14 +331,14 @@
/*
Write an image map.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent," <area href=\"%s",url);
+ (void) FormatLocaleString(buffer,MagickPathExtent," <area href=\"%s",url);
(void) WriteBlobString(image,buffer);
if (image->directory == (char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n",
image->filename,(double) geometry.width-1,(double) geometry.height-
1);
@@ -350,14 +350,14 @@
(void) WriteBlobByte(image,(unsigned char) *p);
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape="
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\" shape="
"\"rect\" coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n",
(double) geometry.x,(double) geometry.y,(double) (geometry.x+
geometry.width-1),(double) (geometry.y+geometry.height-1));
(void) WriteBlobString(image,buffer);
if (*(p+1) != '\0')
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" <area href=%s\"",url);
(void) WriteBlobString(image,buffer);
}
@@ -369,7 +369,7 @@
}
}
(void) WriteBlobString(image,"</map>\n");
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
(void) WriteBlobString(image,"</div>\n");
(void) WriteBlobString(image,"</body>\n");
(void) WriteBlobString(image,"</html>\n");
@@ -377,19 +377,19 @@
/*
Write the image as PNG.
*/
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
AppendImageFormat("png",image->filename);
next=GetNextImageInList(image);
image->next=NewImageList();
- (void) CopyMagickString(image->magick,"PNG",MaxTextExtent);
+ (void) CopyMagickString(image->magick,"PNG",MagickPathExtent);
(void) WriteImage(write_info,image,exception);
image->next=next;
/*
Determine image map filename.
*/
GetPathComponent(image->filename,BasePath,filename);
- (void) ConcatenateMagickString(filename,"_map.shtml",MaxTextExtent);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) ConcatenateMagickString(filename,"_map.shtml",MagickPathExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
/*
Open image map.
@@ -407,14 +407,14 @@
/*
Write an image map.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent," <area href=\"%s",url);
+ (void) FormatLocaleString(buffer,MagickPathExtent," <area href=\"%s",url);
(void) WriteBlobString(image,buffer);
if (image->directory == (char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n",
image->filename,(double) geometry.width-1,(double) geometry.height-1);
(void) WriteBlobString(image,buffer);
@@ -425,14 +425,14 @@
(void) WriteBlobByte(image,(unsigned char) *p);
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape=\"rect\""
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\" shape=\"rect\""
" coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n",
(double) geometry.x,(double) geometry.y,geometry.x+(double)
geometry.width-1,geometry.y+(double) geometry.height-1);
(void) WriteBlobString(image,buffer);
if (*(p+1) != '\0')
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" <area href=%s\"",url);
(void) WriteBlobString(image,buffer);
}
@@ -445,6 +445,6 @@
}
(void) WriteBlobString(image,"</map>\n");
(void) CloseBlob(image);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
return(status);
}
diff --git a/coders/icon.c b/coders/icon.c
index 0f3d00d..94c31e6 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -367,7 +367,7 @@
if (count > 0)
{
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(read_info->magick,"PNG",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"PNG",MagickPathExtent);
icon_image=BlobToImage(read_info,png,length+16,exception);
read_info=DestroyImageInfo(read_info);
}
@@ -976,7 +976,7 @@
return(MagickFalse);
}
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,"PNG:",MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,"PNG:",MagickPathExtent);
/* Don't write any ancillary chunks except for gAMA */
(void) SetImageArtifact(write_image,"png:include-chunk","none,gama");
diff --git a/coders/info.c b/coders/info.c
index bb3b3f2..2ff094d 100644
--- a/coders/info.c
+++ b/coders/info.c
@@ -186,7 +186,7 @@
if (format == (char *) NULL)
{
(void) CopyMagickString(image->filename,image->magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
image->magick_columns=image->columns;
image->magick_rows=image->rows;
(void) IdentifyImage(image,GetBlobFileHandle(image),
diff --git a/coders/inline.c b/coders/inline.c
index 7df6801..c915686 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -260,7 +260,7 @@
{
char
*base64,
- message[MaxTextExtent];
+ message[MagickPathExtent];
const MagickInfo
*magick_info;
@@ -293,12 +293,12 @@
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"INLINE") == 0)
- (void) CopyMagickString(write_info->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,image->magick,MagickPathExtent);
magick_info=GetMagickInfo(write_info->magick,exception);
if ((magick_info == (const MagickInfo *) NULL) ||
(GetMagickMimeType(magick_info) == (const char *) NULL))
ThrowWriterException(CorruptImageError,"ImageTypeNotSupported");
- (void) CopyMagickString(image->filename,write_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,write_info->filename,MagickPathExtent);
blob_length=2048;
write_image=CloneImage(image,0,0,MagickTrue,exception);
if (write_image == (Image *) NULL)
@@ -326,7 +326,7 @@
base64=DestroyString(base64);
return(status);
}
- (void) FormatLocaleString(message,MaxTextExtent,"data:%s;base64,",
+ (void) FormatLocaleString(message,MagickPathExtent,"data:%s;base64,",
GetMagickMimeType(magick_info));
(void) WriteBlobString(image,message);
(void) WriteBlobString(image,base64);
diff --git a/coders/jbig.c b/coders/jbig.c
index e44ae5e..015751a 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -297,14 +297,14 @@
#define JBIGDescription "Joint Bi-level Image experts Group interchange format"
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(JBG_VERSION)
- (void) CopyMagickString(version,JBG_VERSION,MaxTextExtent);
+ (void) CopyMagickString(version,JBG_VERSION,MagickPathExtent);
#endif
entry=AcquireMagickInfo("JBIG","BIE",JBIGDescription);
#if defined(MAGICKCORE_JBIG_DELEGATE)
diff --git a/coders/jnx.c b/coders/jnx.c
index a64bc13..0ca1d18 100644
--- a/coders/jnx.c
+++ b/coders/jnx.c
@@ -99,7 +99,7 @@
scale;
unsigned short
- copyright[MaxTextExtent];
+ copyright[MagickPathExtent];
} JNXLevelInfo;
/*
@@ -212,7 +212,7 @@
(void) ReadBlobLSBLong(image);
j=0;
while ((c=ReadBlobLSBShort(image)) != 0)
- if (j < (MaxTextExtent-1))
+ if (j < (MagickPathExtent-1))
jnx_level_info[i].copyright[j++]=c;
jnx_level_info[i].copyright[j]=0;
}
@@ -297,14 +297,14 @@
ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
}
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(read_info->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"JPEG",MagickPathExtent);
tile_image=BlobToImage(read_info,blob,tile_length+2,exception);
read_info=DestroyImageInfo(read_info);
blob=(unsigned char *) RelinquishMagickMemory(blob);
offset=SeekBlob(image,restore_offset,SEEK_SET);
if (tile_image == (Image *) NULL)
continue;
- (void) CopyMagickString(tile_image->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(tile_image->magick,image->magick,MagickPathExtent);
(void) FormatImageProperty(tile_image,"jnx:northeast","%.20g,%.20g",
northeast.x,northeast.y);
(void) FormatImageProperty(tile_image,"jnx:southwest","%.20g,%.20g",
diff --git a/coders/jp2.c b/coders/jp2.c
index ae64da8..ba7d5a8 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -533,14 +533,14 @@
ModuleExport size_t RegisterJP2Image(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
- (void) FormatLocaleString(version,MaxTextExtent,"%s",opj_version());
+ (void) FormatLocaleString(version,MagickPathExtent,"%s",opj_version());
#endif
entry=AcquireMagickInfo("JP2","JP2","JPEG-2000 File Format Syntax");
if (*version != '\0')
diff --git a/coders/jpeg.c b/coders/jpeg.c
index cab17ad..12ed4ca 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -536,7 +536,7 @@
static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info)
{
char
- magick[MaxTextExtent];
+ magick[MagickPathExtent];
ErrorManager
*error_manager;
@@ -642,7 +642,7 @@
static boolean ReadProfile(j_decompress_ptr jpeg_info)
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
const StringInfo
*previous_profile;
@@ -683,7 +683,7 @@
return(TRUE);
length-=2;
marker=jpeg_info->unread_marker-JPEG_APP0;
- (void) FormatLocaleString(name,MaxTextExtent,"APP%d",marker);
+ (void) FormatLocaleString(name,MagickPathExtent,"APP%d",marker);
error_manager=(ErrorManager *) jpeg_info->client_data;
exception=error_manager->exception;
image=error_manager->image;
@@ -703,7 +703,7 @@
{
p=GetStringInfoDatum(profile);
if ((length > 4) && (LocaleNCompare((char *) p,"exif",4) == 0))
- (void) CopyMagickString(name,"exif",MaxTextExtent);
+ (void) CopyMagickString(name,"exif",MagickPathExtent);
if ((length > 5) && (LocaleNCompare((char *) p,"http:",5) == 0))
{
ssize_t
@@ -721,7 +721,7 @@
}
if (j < (ssize_t) GetStringInfoLength(profile))
(void) DestroyStringInfo(SplitStringInfo(profile,(size_t) (j+1)));
- (void) CopyMagickString(name,"xmp",MaxTextExtent);
+ (void) CopyMagickString(name,"xmp",MagickPathExtent);
}
}
previous_profile=GetImageProfile(image,name);
@@ -935,14 +935,14 @@
static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, Image *image,ExceptionInfo *exception)
{
char
- sampling_factor[MaxTextExtent];
+ sampling_factor[MagickPathExtent];
switch (jpeg_info->out_color_space)
{
case JCS_CMYK:
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: CMYK");
- (void) FormatLocaleString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MagickPathExtent,
"%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -957,7 +957,7 @@
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
"Colorspace: GRAYSCALE");
- (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%dx%d",
jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor);
break;
@@ -965,7 +965,7 @@
case JCS_RGB:
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: RGB");
- (void) FormatLocaleString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MagickPathExtent,
"%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -978,7 +978,7 @@
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: %d",
jpeg_info->out_color_space);
- (void) FormatLocaleString(sampling_factor,MaxTextExtent,
+ (void) FormatLocaleString(sampling_factor,MagickPathExtent,
"%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor,
jpeg_info->comp_info[0].v_samp_factor,
jpeg_info->comp_info[1].h_samp_factor,
@@ -1000,7 +1000,7 @@
ExceptionInfo *exception)
{
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
const char
*option;
@@ -1291,7 +1291,7 @@
}
JPEGSetImageQuality(&jpeg_info,image,exception);
JPEGSetImageSamplingFactor(&jpeg_info,image,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
jpeg_info.out_color_space);
(void) SetImageProperty(image,"jpeg:colorspace",value,exception);
if (image_info->ping != MagickFalse)
@@ -1516,14 +1516,14 @@
#define JPEGDescription "Joint Photographic Experts Group JFIF format"
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(JPEG_LIB_VERSION)
- (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
+ (void) FormatLocaleString(version,MagickPathExtent,"%d",JPEG_LIB_VERSION);
#endif
entry=AcquireMagickInfo("JPEG","JPE",JPEGDescription);
#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
@@ -2077,7 +2077,7 @@
for (p=text; *p != '\0'; p++)
if (*p == ',')
lines++;
- textlist=(char **) AcquireQuantumMemory((size_t) lines+MaxTextExtent,
+ textlist=(char **) AcquireQuantumMemory((size_t) lines+MagickPathExtent,
sizeof(*textlist));
if (textlist == (char **) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText");
@@ -2087,7 +2087,7 @@
for (q=(char *) p; *q != '\0'; q++)
if (*q == ',')
break;
- textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MaxTextExtent,
+ textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MagickPathExtent,
sizeof(*textlist[i]));
if (textlist[i] == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText");
diff --git a/coders/json.c b/coders/json.c
index ce1bb5e..6091dd1 100644
--- a/coders/json.c
+++ b/coders/json.c
@@ -472,9 +472,9 @@
ExceptionInfo *exception)
{
char
- color[MaxTextExtent],
- format[MaxTextExtent],
- key[MaxTextExtent];
+ color[MagickPathExtent],
+ format[MagickPathExtent],
+ key[MagickPathExtent];
ChannelFeatures
*channel_features;
@@ -545,7 +545,7 @@
if (LocaleCompare(image->magick_filename,image->filename) != 0)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
GetPathComponent(image->magick_filename,TailPath,filename);
(void) FormatLocaleFile(file," Base filename: %s\n",filename);
@@ -920,7 +920,7 @@
if ((x < (ssize_t) image->columns) || (y < (ssize_t) image->rows))
{
char
- tuple[MaxTextExtent];
+ tuple[MagickPathExtent];
PixelInfo
pixel;
@@ -943,9 +943,9 @@
if (image->colors <= 1024)
{
char
- color[MaxTextExtent],
- hex[MaxTextExtent],
- tuple[MaxTextExtent];
+ color[MagickPathExtent],
+ hex[MagickPathExtent],
+ tuple[MagickPathExtent];
PixelInfo
pixel;
@@ -958,28 +958,28 @@
for (i=0; i < (ssize_t) image->colors; i++)
{
pixel=(*p);
- (void) CopyMagickString(tuple,"(",MaxTextExtent);
+ (void) CopyMagickString(tuple,"(",MagickPathExtent);
ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
tuple);
if (pixel.colorspace == CMYKColorspace)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,BlackPixelChannel,
X11Compliance,tuple);
}
if (pixel.alpha_trait != UndefinedPixelTrait)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,AlphaPixelChannel,
X11Compliance,tuple);
}
- (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,")",MagickPathExtent);
(void) QueryColorname(image,&pixel,SVGCompliance,color,
exception);
GetColorTuple(&pixel,MagickTrue,hex);
@@ -1149,7 +1149,7 @@
property=GetNextImageProperty(image);
}
}
- (void) FormatLocaleString(key,MaxTextExtent,"8BIM:1999,2998:#1");
+ (void) FormatLocaleString(key,MagickPathExtent,"8BIM:1999,2998:#1");
value=GetImageProperty(image,key,exception);
if (value != (const char *) NULL)
{
@@ -1270,8 +1270,8 @@
length=(size_t) (GetStringInfoDatum(profile)[i++] << 8);
length|=GetStringInfoDatum(profile)[i++];
attribute=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- attribute=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ if (~length >= (MagickPathExtent-1))
+ attribute=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*attribute));
if (attribute != (char *) NULL)
{
@@ -1336,16 +1336,16 @@
}
(void) FormatLocaleFile(file," Tainted: %s\n",CommandOptionToMnemonic(
MagickBooleanOptions,(ssize_t) image->taint));
- (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MaxTextExtent,
+ (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MagickPathExtent,
format);
(void) FormatLocaleFile(file," Filesize: %s\n",format);
(void) FormatMagickSize((MagickSizeType) image->columns*image->rows,
- MagickFalse,"B",MaxTextExtent,format);
+ MagickFalse,"B",MagickPathExtent,format);
if (strlen(format) > 1)
format[strlen(format)-1]='\0';
(void) FormatLocaleFile(file," Number pixels: %s\n",format);
(void) FormatMagickSize((MagickSizeType) ((double) image->columns*image->rows/
- elapsed_time+0.5),MagickFalse,"B",MaxTextExtent,format);
+ elapsed_time+0.5),MagickFalse,"B",MagickPathExtent,format);
(void) FormatLocaleFile(file," Pixels per second: %s\n",format);
(void) FormatLocaleFile(file," User time: %0.3fu\n",user_time);
(void) FormatLocaleFile(file," Elapsed time: %lu:%02lu.%03lu\n",
@@ -1382,7 +1382,7 @@
do
{
(void) CopyMagickString(image->filename,image->magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
image->magick_columns=image->columns;
image->magick_rows=image->rows;
(void) EncodeImageAttributes(image,GetBlobFileHandle(image),exception);
diff --git a/coders/label.c b/coders/label.c
index 78f4fe8..8000529 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -90,7 +90,7 @@
ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent],
+ geometry[MagickPathExtent],
*property;
const char
@@ -152,7 +152,7 @@
*/
for ( ; ; draw_info->pointsize*=2.0)
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -173,7 +173,7 @@
for (low=1.0; (high-low) > 0.5; )
{
draw_info->pointsize=(low+high)/2.0;
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
-metrics.bounds.x1,metrics.ascent);
if (draw_info->gravity == UndefinedGravity)
(void) CloneString(&draw_info->geometry,geometry);
@@ -227,7 +227,7 @@
/*
Draw label.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
draw_info->direction == RightToLeftDirection ? image->columns-
metrics.bounds.x2 : 0.0,draw_info->gravity == UndefinedGravity ?
metrics.ascent : 0.0);
@@ -236,9 +236,9 @@
if (image_info->pointsize == 0.0)
{
char
- pointsize[MaxTextExtent];
+ pointsize[MagickPathExtent];
- (void) FormatLocaleString(pointsize,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(pointsize,MagickPathExtent,"%.20g",
draw_info->pointsize);
(void) SetImageProperty(image,"label:pointsize",pointsize,exception);
}
diff --git a/coders/magick.c b/coders/magick.c
index b7b6b64..a046e24 100644
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -12977,8 +12977,8 @@
typedef struct _MagickImageInfo
{
char
- name[MaxTextExtent],
- magick[MaxTextExtent];
+ name[MagickPathExtent],
+ magick[MagickPathExtent];
const void
*blob;
@@ -13052,7 +13052,7 @@
blob_info=CloneImageInfo(image_info);
if (LocaleCompare(image_info->magick,"MAGICK") != 0)
(void) CopyMagickString(blob_info->filename,image_info->magick,
- MaxTextExtent);
+ MagickPathExtent);
image=(Image *) NULL;
blob=(const void *) NULL;
extent=0;
@@ -13060,7 +13060,7 @@
if (LocaleCompare(blob_info->filename,MagickImageList[i].name) == 0)
{
(void) CopyMagickString(blob_info->magick,MagickImageList[i].magick,
- MaxTextExtent);
+ MagickPathExtent);
blob=MagickImageList[i].blob;
extent=MagickImageList[i].extent;
break;
@@ -13207,7 +13207,7 @@
Image *image,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
Image
*magick_image;
@@ -13245,11 +13245,11 @@
ThrowWriterException(ResourceLimitError,exception->reason);
write_info=CloneImageInfo(image_info);
*write_info->filename='\0';
- (void) CopyMagickString(write_info->magick,"GIF",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"GIF",MagickPathExtent);
length=(size_t) magick_image->columns*magick_image->rows;
if (magick_image->storage_class == DirectClass)
{
- (void) CopyMagickString(write_info->magick,"PNM",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"PNM",MagickPathExtent);
length*=3;
}
blob=ImageToBlob(write_info,magick_image,&length,exception);
@@ -13261,7 +13261,7 @@
if (status == MagickFalse)
return(status);
(void) WriteBlobString(image,"/*\n");
- (void) FormatLocaleString(buffer,MaxTextExtent," %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent," %s (%s).\n",
image->filename,image->storage_class == DirectClass ? "PNM" : "GIF");
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"*/\n");
@@ -13272,11 +13272,11 @@
p=(char *) blob;
for (i=0; i < (ssize_t) length ; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",*p & 0xff);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",*p & 0xff);
(void) WriteBlobString(image,buffer);
if (((i+1) % 12) == 0)
{
- (void) CopyMagickString(buffer,"\n ",MaxTextExtent);
+ (void) CopyMagickString(buffer,"\n ",MagickPathExtent);
(void) WriteBlobString(image,buffer);
}
p++;
diff --git a/coders/mask.c b/coders/mask.c
index 0363007..41cd0dd 100644
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -110,7 +110,7 @@
assert(exception->signature == MagickSignature);
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
@@ -297,11 +297,11 @@
mask_image=MaskImage(image,exception);
if (mask_image == (Image *) NULL)
return(MagickFalse);
- (void) CopyMagickString(mask_image->filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(mask_image->filename,image->filename,MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"MASK") == 0)
- (void) FormatLocaleString(mask_image->filename,MaxTextExtent,"miff:%s",
+ (void) FormatLocaleString(mask_image->filename,MagickPathExtent,"miff:%s",
write_info->filename);
status=WriteImage(write_info,mask_image,exception);
mask_image=DestroyImage(mask_image);
diff --git a/coders/matte.c b/coders/matte.c
index 1894dcf..8654080 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -210,7 +210,7 @@
}
write_info=CloneImageInfo(image_info);
if (LocaleCompare(write_info->magick,"MATTE") == 0)
- (void) FormatLocaleString(matte_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(matte_image->filename,MagickPathExtent,
"MIFF:%s",image->filename);
status=WriteImage(write_info,matte_image,exception);
write_info=DestroyImageInfo(write_info);
diff --git a/coders/meta.c b/coders/meta.c
index b60564d..7b3e936 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -309,7 +309,7 @@
recnum;
int
- inputlen = MaxTextExtent;
+ inputlen = MagickPathExtent;
MagickOffsetType
savedpos,
@@ -371,7 +371,7 @@
recnum = (unsigned int) StringToUnsignedLong(newstr);
break;
case 2:
- name=(char *) AcquireQuantumMemory(strlen(newstr)+MaxTextExtent,
+ name=(char *) AcquireQuantumMemory(strlen(newstr)+MagickPathExtent,
sizeof(*name));
if (name)
(void) strcpy(name,newstr);
@@ -605,7 +605,7 @@
recnum;
int
- inputlen = MaxTextExtent;
+ inputlen = MagickPathExtent;
ssize_t
savedolen = 0L,
@@ -667,10 +667,10 @@
recnum=(unsigned int) StringToUnsignedLong(newstr);
break;
case 2:
- name=(char *) AcquireQuantumMemory(strlen(newstr)+MaxTextExtent,
+ name=(char *) AcquireQuantumMemory(strlen(newstr)+MagickPathExtent,
sizeof(*name));
if (name)
- (void) CopyMagickString(name,newstr,strlen(newstr)+MaxTextExtent);
+ (void) CopyMagickString(name,newstr,strlen(newstr)+MagickPathExtent);
break;
}
state++;
@@ -1224,9 +1224,9 @@
if (LocaleNCompare(image_info->magick,"APP1",4) == 0)
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
- (void) FormatLocaleString(name,MaxTextExtent,"APP%d",1);
+ (void) FormatLocaleString(name,MagickPathExtent,"APP%d",1);
buff=AcquireImage((ImageInfo *) NULL,exception);
if (buff == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1713,7 +1713,7 @@
static void formatString(Image *ofile, const char *s, int len)
{
char
- temp[MaxTextExtent];
+ temp[MagickPathExtent];
(void) WriteBlobByte(ofile,'"');
for (; len > 0; len--, s++) {
@@ -1738,7 +1738,7 @@
(void) WriteBlobByte(ofile,(unsigned char) *s);
else
{
- (void) FormatLocaleString(temp,MaxTextExtent,"&#%d;", c & 255);
+ (void) FormatLocaleString(temp,MagickPathExtent,"&#%d;", c & 255);
(void) WriteBlobString(ofile,temp);
}
break;
@@ -1823,7 +1823,7 @@
static int formatIPTC(Image *ifile, Image *ofile)
{
char
- temp[MaxTextExtent];
+ temp[MagickPathExtent];
unsigned int
foundiptc,
@@ -1902,7 +1902,7 @@
}
if (taglen < 0) return -1;
/* make a buffer to hold the tag datand snag it from the input stream */
- str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MaxTextExtent),
+ str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MagickPathExtent),
sizeof(*str));
if (str == (unsigned char *) NULL)
{
@@ -1919,10 +1919,10 @@
/* now finish up by formatting this binary data into ASCII equivalent */
if (strlen((char *)readable) > 0)
- (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=",
+ (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d#%s=",
(unsigned int) dataset, (unsigned int) recnum, readable);
else
- (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=",
+ (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d=",
(unsigned int) dataset,(unsigned int) recnum);
(void) WriteBlobString(ofile,temp);
formatString( ofile, (char *)str, taglen );
@@ -1957,7 +1957,7 @@
static int formatIPTCfromBuffer(Image *ofile, char *s, ssize_t len)
{
char
- temp[MaxTextExtent];
+ temp[MagickPathExtent];
unsigned int
foundiptc,
@@ -2034,7 +2034,7 @@
if (taglen > 65535)
return(-1);
/* make a buffer to hold the tag datand snag it from the input stream */
- str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MaxTextExtent),
+ str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MagickPathExtent),
sizeof(*str));
if (str == (unsigned char *) NULL)
{
@@ -2052,10 +2052,10 @@
/* now finish up by formatting this binary data into ASCII equivalent */
if (strlen((char *)readable) > 0)
- (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=",
+ (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d#%s=",
(unsigned int) dataset,(unsigned int) recnum, readable);
else
- (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=",
+ (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d=",
(unsigned int) dataset,(unsigned int) recnum);
(void) WriteBlobString(ofile,temp);
formatString( ofile, (char *)str, taglen );
@@ -2069,7 +2069,7 @@
static int format8BIM(Image *ifile, Image *ofile)
{
char
- temp[MaxTextExtent];
+ temp[MagickPathExtent];
unsigned int
foundOSType;
@@ -2132,7 +2132,7 @@
return(-1);
plen = (unsigned char) c;
PString=(unsigned char *) AcquireQuantumMemory((size_t) (plen+
- MaxTextExtent),sizeof(*PString));
+ MagickPathExtent),sizeof(*PString));
if (PString == (unsigned char *) NULL)
{
printf("MemoryAllocationFailed");
@@ -2178,10 +2178,10 @@
* ASCII equivalent
*/
if (strlen((const char *)PString) > 0)
- (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d#%s=",ID,
+ (void) FormatLocaleString(temp,MagickPathExtent,"8BIM#%d#%s=",ID,
PString);
else
- (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d=",ID);
+ (void) FormatLocaleString(temp,MagickPathExtent,"8BIM#%d=",ID);
(void) WriteBlobString(ofile,temp);
if (ID == IPTC_ID)
{
diff --git a/coders/miff.c b/coders/miff.c
index 2840f11..87749e2 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -399,8 +399,8 @@
#endif
char
- id[MaxTextExtent],
- keyword[MaxTextExtent],
+ id[MagickPathExtent],
+ keyword[MagickPathExtent],
*options;
const unsigned char
@@ -506,7 +506,7 @@
/*
Decode image header; header terminates one character beyond a ':'.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
options=AcquireString((char *) NULL);
quantum_format=UndefinedQuantumFormat;
profiles=(LinkedListInfo *) NULL;
@@ -526,7 +526,7 @@
/*
Read comment-- any text between { }.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
comment=AcquireString((char *) NULL);
for (p=comment; comment != (char *) NULL; p++)
{
@@ -541,7 +541,7 @@
*p='\0';
length<<=1;
comment=(char *) ResizeQuantumMemory(comment,length+
- MaxTextExtent,sizeof(*comment));
+ MagickPathExtent,sizeof(*comment));
if (comment == (char *) NULL)
break;
p=comment+strlen(comment);
@@ -561,13 +561,13 @@
/*
Get the keyword.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
p=keyword;
do
{
if (c == (int) '=')
break;
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=(char) c;
c=ReadBlobByte(image);
} while (c != EOF);
@@ -588,7 +588,7 @@
*p='\0';
length<<=1;
options=(char *) ResizeQuantumMemory(options,length+
- MaxTextExtent,sizeof(*options));
+ MagickPathExtent,sizeof(*options));
if (options == (char *) NULL)
break;
p=options+strlen(options);
@@ -802,7 +802,7 @@
{
if (LocaleCompare(keyword,"id") == 0)
{
- (void) CopyMagickString(id,options,MaxTextExtent);
+ (void) CopyMagickString(id,options,MagickPathExtent);
break;
}
if (LocaleCompare(keyword,"iterations") == 0)
@@ -1092,20 +1092,20 @@
/*
Image directory.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
image->directory=AcquireString((char *) NULL);
p=image->directory;
do
{
*p='\0';
- if ((strlen(image->directory)+MaxTextExtent) >= length)
+ if ((strlen(image->directory)+MagickPathExtent) >= length)
{
/*
Allocate more memory for the image directory.
*/
length<<=1;
image->directory=(char *) ResizeQuantumMemory(image->directory,
- length+MaxTextExtent,sizeof(*image->directory));
+ length+MagickPathExtent,sizeof(*image->directory));
if (image->directory == (char *) NULL)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=image->directory+strlen(image->directory);
@@ -1648,20 +1648,20 @@
ModuleExport size_t RegisterMIFFImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(MagickImageCoderSignatureText)
- (void) CopyMagickString(version,MagickLibVersionText,MaxTextExtent);
+ (void) CopyMagickString(version,MagickLibVersionText,MagickPathExtent);
#if defined(ZLIB_VERSION)
- (void) ConcatenateMagickString(version," with Zlib ",MaxTextExtent);
- (void) ConcatenateMagickString(version,ZLIB_VERSION,MaxTextExtent);
+ (void) ConcatenateMagickString(version," with Zlib ",MagickPathExtent);
+ (void) ConcatenateMagickString(version,ZLIB_VERSION,MagickPathExtent);
#endif
#if defined(MAGICKCORE_BZLIB_DELEGATE)
- (void) ConcatenateMagickString(version," and BZlib",MaxTextExtent);
+ (void) ConcatenateMagickString(version," and BZlib",MagickPathExtent);
#endif
#endif
entry=AcquireMagickInfo("MIFF","MIFF","Magick Image File Format");
@@ -1902,7 +1902,7 @@
#endif
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
CompressionType
compression;
@@ -2041,63 +2041,63 @@
Write MIFF header.
*/
(void) WriteBlobString(image,"id=ImageMagick version=1.0\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"class=%s colors=%.20g alpha-trait=%s\n",CommandOptionToMnemonic(
MagickClassOptions,image->storage_class),(double) image->colors,
CommandOptionToMnemonic(MagickPixelTraitOptions,(ssize_t)
image->alpha_trait));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"columns=%.20g rows=%.20g "
"depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
image->depth);
(void) WriteBlobString(image,buffer);
if (image->type != UndefinedType)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"type=%s\n",
CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"colorspace=%s\n",
CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (image->intensity != UndefinedPixelIntensityMethod)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"pixel-intensity=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"pixel-intensity=%s\n",
CommandOptionToMnemonic(MagickPixelIntensityOptions,
image->intensity));
(void) WriteBlobString(image,buffer);
}
if (image->endian != UndefinedEndian)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"endian=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"endian=%s\n",
CommandOptionToMnemonic(MagickEndianOptions,image->endian));
(void) WriteBlobString(image,buffer);
}
if (compression != UndefinedCompression)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"compression=%s "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"compression=%s "
"quality=%.20g\n",CommandOptionToMnemonic(MagickCompressOptions,
compression),(double) image->quality);
(void) WriteBlobString(image,buffer);
}
if (image->units != UndefinedResolution)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"units=%s\n",
CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->resolution.x != 0) || (image->resolution.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"resolution=%gx%g\n",image->resolution.x,image->resolution.y);
(void) WriteBlobString(image,buffer);
}
if ((image->page.width != 0) || (image->page.height != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
(void) WriteBlobString(image,buffer);
@@ -2105,13 +2105,13 @@
else
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"page=%+ld%+ld\n",
(long) image->page.x,(long) image->page.y);
(void) WriteBlobString(image,buffer);
}
if ((image->tile_offset.x != 0) || (image->tile_offset.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"tile-offset=%+ld%+ld\n",
(long) image->tile_offset.x,(long) image->tile_offset.y);
(void) WriteBlobString(image,buffer);
}
@@ -2119,11 +2119,11 @@
(GetPreviousImageInList(image) != (Image *) NULL))
{
if (image->scene == 0)
- (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g "
"delay=%.20g ticks-per-second=%.20g\n",(double) image->iterations,
(double) image->delay,(double) image->ticks_per_second);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g "
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double)
image->scene,(double) image->iterations,(double) image->delay,
(double) image->ticks_per_second);
@@ -2133,50 +2133,50 @@
{
if (image->scene != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
}
if (image->iterations != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g\n",
(double) image->iterations);
(void) WriteBlobString(image,buffer);
}
if (image->delay != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"delay=%.20g\n",
(double) image->delay);
(void) WriteBlobString(image,buffer);
}
if (image->ticks_per_second != UndefinedTicksPerSecond)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"ticks-per-second=%.20g\n",(double) image->ticks_per_second);
(void) WriteBlobString(image,buffer);
}
}
if (image->gravity != UndefinedGravity)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"gravity=%s\n",
CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"dispose=%s\n",
CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"rendering-intent=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"rendering-intent=%s\n",
CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
(void) WriteBlobString(image,buffer);
}
if (image->gamma != 0.0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"gamma=%g\n",
image->gamma);
(void) WriteBlobString(image,buffer);
}
@@ -2185,7 +2185,7 @@
/*
Note chomaticity points.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary=%g,"
+ (void) FormatLocaleString(buffer,MagickPathExtent,"red-primary=%g,"
"%g green-primary=%g,%g blue-primary=%g,%g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,
@@ -2193,14 +2193,14 @@
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"white-point=%g,%g\n",image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
(void) WriteBlobString(image,buffer);
}
if (image->orientation != UndefinedOrientation)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"orientation=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"orientation=%s\n",
CommandOptionToMnemonic(MagickOrientationOptions,image->orientation));
(void) WriteBlobString(image,buffer);
}
@@ -2222,7 +2222,7 @@
profile=GetImageProfile(image,name);
if (profile != (StringInfo *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"profile:%s=%.20g\n",name,(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -2232,7 +2232,7 @@
}
if (image->montage != (char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"montage=%s\n",
image->montage);
(void) WriteBlobString(image,buffer);
}
@@ -2243,7 +2243,7 @@
property=GetNextImageProperty(image);
while (property != (const char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s=",property);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,property,exception);
if (value != (const char *) NULL)
diff --git a/coders/mpc.c b/coders/mpc.c
index f555c6a..8acd781 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -144,9 +144,9 @@
static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- cache_filename[MaxTextExtent],
- id[MaxTextExtent],
- keyword[MaxTextExtent],
+ cache_filename[MagickPathExtent],
+ id[MagickPathExtent],
+ keyword[MagickPathExtent],
*options;
const unsigned char
@@ -206,7 +206,7 @@
image=DestroyImageList(image);
return((Image *) NULL);
}
- (void) CopyMagickString(cache_filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(cache_filename,image->filename,MagickPathExtent);
AppendImageFormat("cache",cache_filename);
c=ReadBlobByte(image);
if (c == EOF)
@@ -223,7 +223,7 @@
Decode image header; header terminates one character beyond a ':'.
*/
profiles=(LinkedListInfo *) NULL;
- length=MaxTextExtent;
+ length=MagickPathExtent;
options=AcquireString((char *) NULL);
signature=GetMagickSignature((const StringInfo *) NULL);
image->depth=8;
@@ -241,7 +241,7 @@
/*
Read comment-- any text between { }.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
comment=AcquireString((char *) NULL);
for (p=comment; comment != (char *) NULL; p++)
{
@@ -256,7 +256,7 @@
*p='\0';
length<<=1;
comment=(char *) ResizeQuantumMemory(comment,length+
- MaxTextExtent,sizeof(*comment));
+ MagickPathExtent,sizeof(*comment));
if (comment == (char *) NULL)
break;
p=comment+strlen(comment);
@@ -276,13 +276,13 @@
/*
Get the keyword.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
p=keyword;
do
{
if (c == (int) '=')
break;
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=(char) c;
c=ReadBlobByte(image);
} while (c != EOF);
@@ -303,7 +303,7 @@
*p='\0';
length<<=1;
options=(char *) ResizeQuantumMemory(options,length+
- MaxTextExtent,sizeof(*options));
+ MagickPathExtent,sizeof(*options));
if (options == (char *) NULL)
break;
p=options+strlen(options);
@@ -511,7 +511,7 @@
{
if (LocaleCompare(keyword,"id") == 0)
{
- (void) CopyMagickString(id,options,MaxTextExtent);
+ (void) CopyMagickString(id,options,MagickPathExtent);
break;
}
if (LocaleCompare(keyword,"iterations") == 0)
@@ -778,20 +778,20 @@
/*
Image directory.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
image->directory=AcquireString((char *) NULL);
p=image->directory;
do
{
*p='\0';
- if ((strlen(image->directory)+MaxTextExtent) >= length)
+ if ((strlen(image->directory)+MagickPathExtent) >= length)
{
/*
Allocate more memory for the image directory.
*/
length<<=1;
image->directory=(char *) ResizeQuantumMemory(image->directory,
- length+MaxTextExtent,sizeof(*image->directory));
+ length+MagickPathExtent,sizeof(*image->directory));
if (image->directory == (char *) NULL)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=image->directory+strlen(image->directory);
@@ -1058,8 +1058,8 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
- cache_filename[MaxTextExtent];
+ buffer[MagickPathExtent],
+ cache_filename[MagickPathExtent];
const char
*property,
@@ -1092,7 +1092,7 @@
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
- (void) CopyMagickString(cache_filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(cache_filename,image->filename,MagickPathExtent);
AppendImageFormat("cache",cache_filename);
scene=0;
offset=0;
@@ -1106,66 +1106,66 @@
(image->colors > (size_t) (GetQuantumRange(image->depth)+1)))
(void) SetImageStorageClass(image,DirectClass,exception);
(void) WriteBlobString(image,"id=MagickCache\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"magick-signature=%u\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"magick-signature=%u\n",
GetMagickSignature((const StringInfo *) NULL));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"class=%s colors=%.20g alpha-trait=%s\n",CommandOptionToMnemonic(
MagickClassOptions,image->storage_class),(double) image->colors,
CommandOptionToMnemonic(MagickPixelTraitOptions,(ssize_t)
image->alpha_trait));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"columns=%.20g rows=%.20g depth=%.20g\n",(double) image->columns,
(double) image->rows,(double) image->depth);
(void) WriteBlobString(image,buffer);
if (image->type != UndefinedType)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"type=%s\n",
CommandOptionToMnemonic(MagickTypeOptions,image->type));
(void) WriteBlobString(image,buffer);
}
if (image->colorspace != UndefinedColorspace)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"colorspace=%s\n",
CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
(void) WriteBlobString(image,buffer);
}
if (image->intensity != UndefinedPixelIntensityMethod)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"pixel-intensity=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"pixel-intensity=%s\n",
CommandOptionToMnemonic(MagickPixelIntensityOptions,
image->intensity));
(void) WriteBlobString(image,buffer);
}
if (image->endian != UndefinedEndian)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"endian=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"endian=%s\n",
CommandOptionToMnemonic(MagickEndianOptions,image->endian));
(void) WriteBlobString(image,buffer);
}
if (image->compression != UndefinedCompression)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"compression=%s quality=%.20g\n",CommandOptionToMnemonic(
MagickCompressOptions,image->compression),(double) image->quality);
(void) WriteBlobString(image,buffer);
}
if (image->units != UndefinedResolution)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"units=%s\n",
CommandOptionToMnemonic(MagickResolutionOptions,image->units));
(void) WriteBlobString(image,buffer);
}
if ((image->resolution.x != 0) || (image->resolution.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"resolution=%gx%g\n",image->resolution.x,image->resolution.y);
(void) WriteBlobString(image,buffer);
}
if ((image->page.width != 0) || (image->page.height != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
(void) WriteBlobString(image,buffer);
@@ -1173,13 +1173,13 @@
else
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"page=%+ld%+ld\n",
(long) image->page.x,(long) image->page.y);
(void) WriteBlobString(image,buffer);
}
if ((image->page.x != 0) || (image->page.y != 0))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"tile-offset=%+ld%+ld\n",
(long) image->tile_offset.x,(long) image->tile_offset.y);
(void) WriteBlobString(image,buffer);
}
@@ -1187,12 +1187,12 @@
(GetPreviousImageInList(image) != (Image *) NULL))
{
if (image->scene == 0)
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double)
image->iterations,(double) image->delay,(double)
image->ticks_per_second);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g "
"iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",
(double) image->scene,(double) image->iterations,(double)
image->delay,(double) image->ticks_per_second);
@@ -1202,51 +1202,51 @@
{
if (image->scene != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
}
if (image->iterations != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g\n",
(double) image->iterations);
(void) WriteBlobString(image,buffer);
}
if (image->delay != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"delay=%.20g\n",
(double) image->delay);
(void) WriteBlobString(image,buffer);
}
if (image->ticks_per_second != UndefinedTicksPerSecond)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"ticks-per-second=%.20g\n",(double) image->ticks_per_second);
(void) WriteBlobString(image,buffer);
}
}
if (image->gravity != UndefinedGravity)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"gravity=%s\n",
CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
(void) WriteBlobString(image,buffer);
}
if (image->dispose != UndefinedDispose)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"dispose=%s\n",
CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
(void) WriteBlobString(image,buffer);
}
if (image->rendering_intent != UndefinedIntent)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"rendering-intent=%s\n",CommandOptionToMnemonic(MagickIntentOptions,
image->rendering_intent));
(void) WriteBlobString(image,buffer);
}
if (image->gamma != 0.0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"gamma=%g\n",
image->gamma);
(void) WriteBlobString(image,buffer);
}
@@ -1255,7 +1255,7 @@
/*
Note chomaticity points.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary="
+ (void) FormatLocaleString(buffer,MagickPathExtent,"red-primary="
"%g,%g green-primary=%g,%g blue-primary=%g,%g\n",
image->chromaticity.red_primary.x,image->chromaticity.red_primary.y,
image->chromaticity.green_primary.x,
@@ -1263,14 +1263,14 @@
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"white-point=%g,%g\n",image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
(void) WriteBlobString(image,buffer);
}
if (image->orientation != UndefinedOrientation)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"orientation=%s\n",CommandOptionToMnemonic(MagickOrientationOptions,
image->orientation));
(void) WriteBlobString(image,buffer);
@@ -1292,7 +1292,7 @@
profile=GetImageProfile(image,name);
if (profile != (StringInfo *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"profile:%s=%.20g\n",name,(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -1302,7 +1302,7 @@
}
if (image->montage != (char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"montage=%s\n",
image->montage);
(void) WriteBlobString(image,buffer);
}
@@ -1310,7 +1310,7 @@
property=GetNextImageProperty(image);
while (property != (const char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s=",property);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,property,exception);
if (value != (const char *) NULL)
diff --git a/coders/mpeg.c b/coders/mpeg.c
index 0b73601..12bc8df 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -204,7 +204,7 @@
image=AcquireImage(image_info,exception);
(void) InvokeDelegate(read_info,image,"mpeg:decode",(char *) NULL,exception);
image=DestroyImage(image);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.%s",
read_info->unique,ReadMPEGIntermediateFormat);
images=ReadImage(read_info,exception);
(void) RelinquishUniqueFileResource(read_info->filename);
@@ -437,8 +437,8 @@
#define WriteMPEGIntermediateFormat "jpg"
char
- basename[MaxTextExtent],
- filename[MaxTextExtent];
+ basename[MagickPathExtent],
+ filename[MagickPathExtent];
double
delay;
@@ -493,7 +493,7 @@
file=AcquireUniqueFileResource(basename);
if (file != -1)
file=close(file)-1;
- (void) FormatLocaleString(coalesce_image->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(coalesce_image->filename,MagickPathExtent,"%s",
basename);
count=0;
write_info=CloneImageInfo(image_info);
@@ -501,7 +501,7 @@
for (p=coalesce_image; p != (Image *) NULL; p=GetNextImageInList(p))
{
char
- previous_image[MaxTextExtent];
+ previous_image[MagickPathExtent];
blob=(unsigned char *) NULL;
length=0;
@@ -519,11 +519,11 @@
Image
*frame;
- (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(p->filename,MagickPathExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
- (void) FormatLocaleString(previous_image,MaxTextExtent,
+ (void) FormatLocaleString(previous_image,MagickPathExtent,
"%s%.20g.%s",basename,(double) p->scene,
WriteMPEGIntermediateFormat);
frame=CloneImage(p,0,0,MagickTrue,exception);
@@ -540,7 +540,7 @@
}
default:
{
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%.20g.%s",
basename,(double) p->scene,WriteMPEGIntermediateFormat);
if (length > 0)
status=BlobToFile(filename,blob,length,exception);
@@ -570,14 +570,14 @@
Convert JPEG to MPEG.
*/
(void) CopyMagickString(coalesce_image->magick_filename,basename,
- MaxTextExtent);
- (void) CopyMagickString(coalesce_image->filename,basename,MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(coalesce_image->filename,basename,MagickPathExtent);
GetPathComponent(image_info->filename,ExtensionPath,coalesce_image->magick);
if (*coalesce_image->magick == '\0')
- (void) CopyMagickString(coalesce_image->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(coalesce_image->magick,image->magick,MagickPathExtent);
status=InvokeDelegate(write_info,coalesce_image,(char *) NULL,"mpeg:encode",
exception);
- (void) FormatLocaleString(write_info->filename,MaxTextExtent,"%s.%s",
+ (void) FormatLocaleString(write_info->filename,MagickPathExtent,"%s.%s",
write_info->unique,coalesce_image->magick);
status=CopyDelegateFile(write_info->filename,image->filename);
(void) RelinquishUniqueFileResource(write_info->filename);
@@ -591,11 +591,11 @@
delay=100.0*p->delay/MagickMax(1.0*p->ticks_per_second,1.0);
for (i=0; i < (ssize_t) MagickMax((1.0*delay+1.0)/3.0,1.0); i++)
{
- (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s",
+ (void) FormatLocaleString(p->filename,MagickPathExtent,"%s%.20g.%s",
basename,(double) count++,WriteMPEGIntermediateFormat);
(void) RelinquishUniqueFileResource(p->filename);
}
- (void) CopyMagickString(p->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(p->filename,image_info->filename,MagickPathExtent);
}
(void) RelinquishUniqueFileResource(basename);
coalesce_image=DestroyImageList(coalesce_image);
diff --git a/coders/msl.c b/coders/msl.c
index 871c77f..94bfa2b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -202,7 +202,7 @@
ExceptionInfo *exception)
{
char
- key[MaxTextExtent];
+ key[MagickPathExtent];
ExceptionInfo
*sans_exception;
@@ -213,14 +213,14 @@
ImageInfo
*read_info;
- (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path);
+ (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",path);
sans_exception=AcquireExceptionInfo();
image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
if (image != (Image *) NULL)
return(image);
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(read_info->filename,path,MaxTextExtent);
+ (void) CopyMagickString(read_info->filename,path,MagickPathExtent);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
@@ -613,7 +613,7 @@
channel_mask;
char
- key[MaxTextExtent],
+ key[MagickPathExtent],
*value;
const char
@@ -758,7 +758,7 @@
if (LocaleCompare((const char *) tag,"annotate") == 0)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
/*
Annotate image.
@@ -1073,7 +1073,7 @@
}
}
}
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -1368,7 +1368,7 @@
if (LocaleCompare((const char *) tag,"colorize") == 0)
{
char
- blend[MaxTextExtent];
+ blend[MagickPathExtent];
Image
*colorize_image;
@@ -1386,7 +1386,7 @@
break;
}
GetPixelInfo(msl_info->image[n],&target);
- (void) CopyMagickString(blend,"100",MaxTextExtent);
+ (void) CopyMagickString(blend,"100",MagickPathExtent);
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
@@ -1402,7 +1402,7 @@
{
if (LocaleCompare(keyword,"blend") == 0)
{
- (void) CopyMagickString(blend,value,MaxTextExtent);
+ (void) CopyMagickString(blend,value,MagickPathExtent);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -1744,7 +1744,7 @@
if (LocaleCompare((const char *) tag,"composite") == 0)
{
char
- composite_geometry[MaxTextExtent];
+ composite_geometry[MagickPathExtent];
CompositeOperator
compose;
@@ -2065,7 +2065,7 @@
}
}
image=msl_info->image[n];
- (void) FormatLocaleString(composite_geometry,MaxTextExtent,
+ (void) FormatLocaleString(composite_geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns,
(double) composite_image->rows,(double) geometry.x,(double)
geometry.y);
@@ -2366,7 +2366,7 @@
if (LocaleCompare((const char *) tag,"draw") == 0)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
/*
Annotate image.
@@ -2702,7 +2702,7 @@
}
}
}
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -3181,7 +3181,7 @@
if (LocaleCompare((const char *) tag,"gamma") == 0)
{
char
- gamma[MaxTextExtent];
+ gamma[MagickPathExtent];
PixelInfo
pixel;
@@ -3243,7 +3243,7 @@
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- (void) CopyMagickString(gamma,value,MaxTextExtent);
+ (void) CopyMagickString(gamma,value,MagickPathExtent);
break;
}
if (LocaleCompare(keyword,"green") == 0)
@@ -3276,7 +3276,7 @@
}
}
if (*gamma == '\0')
- (void) FormatLocaleString(gamma,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(gamma,MagickPathExtent,"%g,%g,%g",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
(void) GammaImage(msl_info->image[n],strtod(gamma,(char **) NULL),
msl_info->exception);
@@ -3296,7 +3296,7 @@
{
keyword=(const char *) attributes[i++];
CloneString(&value,(const char *) attributes[i]);
- (void) CopyMagickString(key,value,MaxTextExtent);
+ (void) CopyMagickString(key,value,MagickPathExtent);
switch (*keyword)
{
case 'H':
@@ -3304,7 +3304,7 @@
{
if (LocaleCompare(keyword,"height") == 0)
{
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
(double) msl_info->image[n]->rows);
(void) SetImageProperty(msl_info->attributes[n],key,value,
exception);
@@ -3317,7 +3317,7 @@
{
if (LocaleCompare(keyword,"width") == 0)
{
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
(double) msl_info->image[n]->columns);
(void) SetImageProperty(msl_info->attributes[n],key,value,
exception);
@@ -3368,9 +3368,9 @@
*next_image;
(void) CopyMagickString(msl_info->image_info[n]->filename,
- "xc:",MaxTextExtent);
+ "xc:",MagickPathExtent);
(void) ConcatenateMagickString(msl_info->image_info[n]->
- filename,value,MaxTextExtent);
+ filename,value,MagickPathExtent);
next_image=ReadImage(msl_info->image_info[n],exception);
CatchException(exception);
if (next_image == (Image *) NULL)
@@ -3496,7 +3496,7 @@
{
keyword=(const char *) attributes[i++];
CloneString(&value,(const char *) attributes[i]);
- (void) CopyMagickString(key,value,MaxTextExtent);
+ (void) CopyMagickString(key,value,MagickPathExtent);
switch (*keyword)
{
case 'B':
@@ -3912,7 +3912,7 @@
if (LocaleCompare((const char *) tag,"modulate") == 0)
{
char
- modulate[MaxTextExtent];
+ modulate[MagickPathExtent];
/*
Modulate image.
@@ -4027,7 +4027,7 @@
}
}
}
- (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(modulate,MagickPathExtent,"%g,%g,%g",
geometry_info.rho,geometry_info.sigma,geometry_info.xi);
(void) ModulateImage(msl_info->image[n],modulate,
msl_info->exception);
@@ -4397,8 +4397,8 @@
if (profile_image == (Image *) NULL)
{
char
- name[MaxTextExtent],
- filename[MaxTextExtent];
+ name[MagickPathExtent],
+ filename[MagickPathExtent];
register char
*p;
@@ -4406,8 +4406,8 @@
StringInfo
*profile;
- (void) CopyMagickString(filename,keyword,MaxTextExtent);
- (void) CopyMagickString(name,keyword,MaxTextExtent);
+ (void) CopyMagickString(filename,keyword,MagickPathExtent);
+ (void) CopyMagickString(name,keyword,MagickPathExtent);
for (p=filename; *p != '\0'; p++)
if ((*p == ':') && (IsPathDirectory(keyword) < 0) &&
(IsPathAccessible(keyword) == MagickFalse))
@@ -4561,7 +4561,7 @@
if (LocaleCompare((const char *) tag,"query-font-metrics") == 0)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
MagickBooleanType
status;
@@ -4877,7 +4877,7 @@
}
}
}
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
@@ -5046,7 +5046,7 @@
*image;
(void) CopyMagickString(msl_info->image_info[n]->filename,
- value,MaxTextExtent);
+ value,MagickPathExtent);
image=ReadImage(msl_info->image_info[n],exception);
CatchException(exception);
if (image == (Image *) NULL)
@@ -6113,7 +6113,7 @@
if (LocaleCompare(keyword, "page") == 0)
{
char
- page[MaxTextExtent];
+ page[MagickPathExtent];
const char
*image_option;
@@ -6129,10 +6129,10 @@
if (image_option != (const char *) NULL)
flags=ParseAbsoluteGeometry(image_option,&geometry);
flags=ParseAbsoluteGeometry(value,&geometry);
- (void) FormatLocaleString(page,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(page,MagickPathExtent,"%.20gx%.20g",
(double) geometry.width,(double) geometry.height);
if (((flags & XValue) != 0) || ((flags & YValue) != 0))
- (void) FormatLocaleString(page,MaxTextExtent,
+ (void) FormatLocaleString(page,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) geometry.width,
(double) geometry.height,(double) geometry.x,(double)
geometry.y);
@@ -7291,7 +7291,7 @@
if (LocaleCompare(keyword,"filename") == 0)
{
(void) CopyMagickString(msl_info->image[n]->filename,value,
- MaxTextExtent);
+ MagickPathExtent);
break;
}
(void) SetMSLAttributes(msl_info,keyword,value);
@@ -7444,13 +7444,13 @@
msl_info=(MSLInfo *) context;
if (msl_info->content != (char *) NULL)
msl_info->content=(char *) ResizeQuantumMemory(msl_info->content,
- strlen(msl_info->content)+length+MaxTextExtent,
+ strlen(msl_info->content)+length+MagickPathExtent,
sizeof(*msl_info->content));
else
{
msl_info->content=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- msl_info->content=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ if (~length >= (MagickPathExtent-1))
+ msl_info->content=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*msl_info->content));
if (msl_info->content != (char *) NULL)
*msl_info->content='\0';
@@ -7532,7 +7532,7 @@
{
char
*message,
- reason[MaxTextExtent];
+ reason[MagickPathExtent];
MSLInfo
*msl_info;
@@ -7552,7 +7552,7 @@
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
- (void) vsnprintf(reason,MaxTextExtent,format,operands);
+ (void) vsnprintf(reason,MagickPathExtent,format,operands);
#endif
message=GetExceptionMessage(errno);
ThrowMSLException(CoderError,reason,message);
@@ -7563,7 +7563,7 @@
static void MSLError(void *context,const char *format,...)
{
char
- reason[MaxTextExtent];
+ reason[MagickPathExtent];
MSLInfo
*msl_info;
@@ -7583,7 +7583,7 @@
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
- (void) vsnprintf(reason,MaxTextExtent,format,operands);
+ (void) vsnprintf(reason,MagickPathExtent,format,operands);
#endif
ThrowMSLException(DelegateFatalError,reason,"SAX error");
va_end(operands);
@@ -7692,7 +7692,7 @@
Image **image,ExceptionInfo *exception)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
Image
*msl_image;
@@ -8063,7 +8063,7 @@
}
if (LocaleCompare(keyword,"filename") == 0)
{
- (void) CopyMagickString(image_info->filename,value,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,value,MagickPathExtent);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
@@ -8102,7 +8102,7 @@
{
if (LocaleCompare(keyword,"magick") == 0)
{
- (void) CopyMagickString(image_info->magick,value,MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,value,MagickPathExtent);
break;
}
if (LocaleCompare(keyword,"mattecolor") == 0)
diff --git a/coders/mtv.c b/coders/mtv.c
index 0e925b6..335f870 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -95,7 +95,7 @@
static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
Image
*image;
@@ -324,7 +324,7 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
MagickBooleanType
status;
@@ -375,7 +375,7 @@
/*
Initialize raster file header.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n",(double)
image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/coders/mvg.c b/coders/mvg.c
index 3ae33fd..5e90e47 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -157,7 +157,7 @@
if ((image->columns == 0) || (image->rows == 0))
{
char
- primitive[MaxTextExtent];
+ primitive[MagickPathExtent];
register char
*p;
diff --git a/coders/pango.c b/coders/pango.c
index 1ba0e08..c3de449 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -490,14 +490,14 @@
ModuleExport size_t RegisterPANGOImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(PANGO_VERSION_STRING)
- (void) FormatLocaleString(version,MaxTextExtent,"Pangocairo %s",
+ (void) FormatLocaleString(version,MagickPathExtent,"Pangocairo %s",
PANGO_VERSION_STRING);
#endif
entry=AcquireMagickInfo("PANGO","PANGO","Pango Markup Language");
diff --git a/coders/pattern.c b/coders/pattern.c
index cad1be4..b596778 100644
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -844,8 +844,8 @@
typedef struct _PatternInfo
{
char
- name[MaxTextExtent],
- magick[MaxTextExtent];
+ name[MagickPathExtent],
+ magick[MagickPathExtent];
const void
*blob;
@@ -971,7 +971,7 @@
if (LocaleCompare(blob_info->filename,PatternImageList[i].name) == 0)
{
(void) CopyMagickString(blob_info->magick,PatternImageList[i].magick,
- MaxTextExtent);
+ MagickPathExtent);
blob=PatternImageList[i].blob;
extent=PatternImageList[i].extent;
break;
diff --git a/coders/pcd.c b/coders/pcd.c
index 298b426..c603d3c 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -407,7 +407,7 @@
}
montage_info=CloneMontageInfo(image_info,(MontageInfo *) NULL);
(void) CopyMagickString(montage_info->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
montage_image=MontageImageList(image_info,montage_info,image,exception);
montage_info=DestroyMontageInfo(montage_info);
if (montage_image == (Image *) NULL)
@@ -636,9 +636,9 @@
{
progress_monitor=SetImageProgressMonitor(image,
(MagickProgressMonitor) NULL,image->client_data);
- (void) FormatLocaleString(image->filename,MaxTextExtent,
+ (void) FormatLocaleString(image->filename,MagickPathExtent,
"images/img%04ld.pcd",(long) j);
- (void) FormatLocaleString(image->magick_filename,MaxTextExtent,
+ (void) FormatLocaleString(image->magick_filename,MagickPathExtent,
"images/img%04ld.pcd",(long) j);
image->scene=(size_t) j;
image->columns=width;
diff --git a/coders/pcl.c b/coders/pcl.c
index 81163c1..ef757f3 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -151,12 +151,12 @@
#define RenderPCLText " Rendering PCL... "
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*density,
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
*options,
- input_filename[MaxTextExtent];
+ input_filename[MagickPathExtent];
const char
*option;
@@ -261,7 +261,7 @@
*/
*p++=(char) c;
if ((c != (int) '/') && (c != '\n') &&
- ((size_t) (p-command) < (MaxTextExtent-1)))
+ ((size_t) (p-command) < (MagickPathExtent-1)))
continue;
*p='\0';
p=command;
@@ -312,7 +312,7 @@
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",(double)
page.width,(double) page.height);
if (image_info->monochrome != MagickFalse)
delegate_info=GetDelegateInfo("pcl:mono",(char *) NULL,exception);
@@ -329,11 +329,11 @@
(void) ParseAbsoluteGeometry(image_info->page,&page);
density=AcquireString("");
options=AcquireString("");
- (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x,
+ (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",image->resolution.x,
image->resolution.y);
page.width=(size_t) floor(page.width*image->resolution.x/delta.x+0.5);
page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5);
- (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
@@ -341,10 +341,10 @@
if (read_info->number_scenes != 0)
{
if (read_info->number_scenes != 1)
- (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g",
+ (void) FormatLocaleString(options,MagickPathExtent,"-dLastPage=%.20g",
(double) (read_info->scene+read_info->number_scenes));
else
- (void) FormatLocaleString(options,MaxTextExtent,
+ (void) FormatLocaleString(options,MagickPathExtent,
"-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1,
(double) (read_info->scene+read_info->number_scenes));
read_info->number_scenes=0;
@@ -353,11 +353,11 @@
}
option=GetImageOption(image_info,"authenticate");
if (option != (const char *) NULL)
- (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MagickPathExtent,
" -sPCLPassword=%s",option);
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MagickPathExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,
@@ -386,7 +386,7 @@
}
do
{
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
image->page=page;
next_image=SyncNextImageInList(image);
if (next_image != (Image *) NULL)
@@ -663,7 +663,7 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
CompressionType
compression;
@@ -731,10 +731,10 @@
(void) TransformImageColorspace(image,sRGBColorspace,exception);
(void) WriteBlobString(image,"\033E"); /* printer reset */
(void) WriteBlobString(image,"\033*r3F"); /* set presentation mode */
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*r%.20gs%.20gT",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*r%.20gs%.20gT",
(double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*t%.20gR",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*t%.20gR",(double)
density);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"\033&l0E"); /* top margin 0 */
@@ -775,7 +775,7 @@
(void) WriteBlobByte(image,8); /* bits per blue component */
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"\033*v%da%db%dc%.20gI",
ScaleQuantumToChar(image->colormap[i].red),
ScaleQuantumToChar(image->colormap[i].green),
@@ -784,7 +784,7 @@
}
for (one=1; i < (ssize_t) (one << bits_per_pixel); i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*v%.20gI",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*v%.20gI",
(double) i);
(void) WriteBlobString(image,buffer);
}
@@ -810,7 +810,7 @@
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b0M");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b0M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -825,7 +825,7 @@
}
(void) ResetMagickMemory(compress_pixels,0,(length+256)*
sizeof(*compress_pixels));
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b2M");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b2M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -851,7 +851,7 @@
}
(void) ResetMagickMemory(previous_pixels,0,(length+1)*
sizeof(*previous_pixels));
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b3M");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b3M");
(void) WriteBlobString(image,buffer);
break;
}
@@ -925,7 +925,7 @@
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW",
(double) length);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,length,pixels);
@@ -934,7 +934,7 @@
case RLECompression:
{
packets=PCLPackbitsCompressImage(length,pixels,compress_pixels);
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW",
(double) packets);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,packets,compress_pixels);
@@ -947,7 +947,7 @@
previous_pixels[i]=(~pixels[i]);
packets=PCLDeltaCompressImage(length,previous_pixels,pixels,
compress_pixels);
- (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW",
(double) packets);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,packets,compress_pixels);
diff --git a/coders/pdb.c b/coders/pdb.c
index d1dfaa4..6ab2f97 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -568,16 +568,16 @@
Read comment.
*/
c=ReadBlobByte(image);
- length=MaxTextExtent;
+ length=MagickPathExtent;
comment=AcquireString((char *) NULL);
for (p=comment; c != EOF; p++)
{
- if ((size_t) (p-comment+MaxTextExtent) >= length)
+ if ((size_t) (p-comment+MagickPathExtent) >= length)
{
*p='\0';
length<<=1;
- length+=MaxTextExtent;
- comment=(char *) ResizeQuantumMemory(comment,length+MaxTextExtent,
+ length+=MagickPathExtent;
+ comment=(char *) ResizeQuantumMemory(comment,length+MagickPathExtent,
sizeof(*comment));
if (comment == (char *) NULL)
break;
diff --git a/coders/pdf.c b/coders/pdf.c
index 7376bda..d6b0f0b 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -263,7 +263,7 @@
{
SetArgsStart(command,args_start);
if (status == -101) /* quit */
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"[ghostscript library %.2f]%s: %s",(double)revision.revision / 100,
args_start,errors);
else
@@ -380,14 +380,14 @@
#define PDFVersion "PDF-"
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*density,
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
- input_filename[MaxTextExtent],
- message[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
+ input_filename[MagickPathExtent],
+ message[MagickPathExtent],
*options,
- postscript_filename[MaxTextExtent];
+ postscript_filename[MagickPathExtent];
const char
*option;
@@ -525,7 +525,7 @@
c=' ';
*p++=(char) c;
if ((c != (int) '/') && (c != (int) '%') &&
- ((size_t) (p-command) < (MaxTextExtent-1)))
+ ((size_t) (p-command) < (MagickPathExtent-1)))
continue;
*(--p)='\0';
p=command;
@@ -543,8 +543,8 @@
if (LocaleNCompare(SpotColor,command,strlen(SpotColor)) == 0)
{
char
- name[MaxTextExtent],
- property[MaxTextExtent],
+ name[MagickPathExtent],
+ property[MagickPathExtent],
*value;
register ssize_t
@@ -553,12 +553,12 @@
/*
Note spot names.
*/
- (void) FormatLocaleString(property,MaxTextExtent,"pdf:SpotColor-%.20g",
+ (void) FormatLocaleString(property,MagickPathExtent,"pdf:SpotColor-%.20g",
(double) spotcolor++);
i=0;
for (c=ReadBlobByte(image); c != EOF; c=ReadBlobByte(image))
{
- if ((isspace(c) != 0) || (c == '/') || ((i+1) == MaxTextExtent))
+ if ((isspace(c) != 0) || (c == '/') || ((i+1) == MagickPathExtent))
break;
name[i++]=(char) c;
}
@@ -628,7 +628,7 @@
/*
Set PDF render geometry.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,"%gx%g%+.15g%+.15g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g%+.15g%+.15g",
hires_bounds.x2-bounds.x1,hires_bounds.y2-hires_bounds.y1,
hires_bounds.x1,hires_bounds.y1);
(void) SetImageProperty(image,"pdf:HiResBoundingBox",geometry,exception);
@@ -707,45 +707,45 @@
}
density=AcquireString("");
options=AcquireString("");
- (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x,
+ (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",image->resolution.x,
image->resolution.y);
if ((image_info->page != (char *) NULL) || (fitPage != MagickFalse))
- (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
if (fitPage != MagickFalse)
- (void) ConcatenateMagickString(options,"-dPSFitPage ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dPSFitPage ",MagickPathExtent);
if (cmyk != MagickFalse)
- (void) ConcatenateMagickString(options,"-dUseCIEColor ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dUseCIEColor ",MagickPathExtent);
if (cropbox != MagickFalse)
- (void) ConcatenateMagickString(options,"-dUseCropBox ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dUseCropBox ",MagickPathExtent);
if (stop_on_error != MagickFalse)
- (void) ConcatenateMagickString(options,"-dPDFSTOPONERROR ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dPDFSTOPONERROR ",MagickPathExtent);
if (trimbox != MagickFalse)
- (void) ConcatenateMagickString(options,"-dUseTrimBox ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dUseTrimBox ",MagickPathExtent);
read_info=CloneImageInfo(image_info);
*read_info->magick='\0';
if (read_info->number_scenes != 0)
{
char
- pages[MaxTextExtent];
+ pages[MagickPathExtent];
- (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g "
+ (void) FormatLocaleString(pages,MagickPathExtent,"-dFirstPage=%.20g "
"-dLastPage=%.20g",(double) read_info->scene+1,(double)
(read_info->scene+read_info->number_scenes));
- (void) ConcatenateMagickString(options,pages,MaxTextExtent);
+ (void) ConcatenateMagickString(options,pages,MagickPathExtent);
read_info->number_scenes=0;
if (read_info->scenes != (char *) NULL)
*read_info->scenes='\0';
}
option=GetImageOption(image_info,"authenticate");
if (option != (const char *) NULL)
- (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MagickPathExtent,
" -sPCLPassword=%s",option);
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
(void) AcquireUniqueFilename(filename);
(void) RelinquishUniqueFileResource(filename);
- (void) ConcatenateMagickString(filename,"%d",MaxTextExtent);
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) ConcatenateMagickString(filename,"%d",MagickPathExtent);
+ (void) FormatLocaleString(command,MagickPathExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,filename,
@@ -822,8 +822,8 @@
}
do
{
- (void) CopyMagickString(pdf_image->filename,filename,MaxTextExtent);
- (void) CopyMagickString(pdf_image->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(pdf_image->filename,filename,MagickPathExtent);
+ (void) CopyMagickString(pdf_image->magick,image->magick,MagickPathExtent);
pdf_image->page=page;
(void) CloneImageProfiles(pdf_image,image);
(void) CloneImageProperties(pdf_image,image);
@@ -973,11 +973,11 @@
escapes;
static char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
escapes=0;
p=buffer;
- for (i=0; i < (ssize_t) MagickMin(strlen(text),(MaxTextExtent-escapes-1)); i++)
+ for (i=0; i < (ssize_t) MagickMin(strlen(text),(MagickPathExtent-escapes-1)); i++)
{
if ((text[i] == '(') || (text[i] == ')'))
{
@@ -1010,8 +1010,8 @@
status=MagickTrue;
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
- (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent);
+ (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent);
group4_image=CloneImage(inject_image,0,0,MagickTrue,exception);
if (group4_image == (Image *) NULL)
return(MagickFalse);
@@ -1078,11 +1078,11 @@
RestoreMSCWarning
char
- basename[MaxTextExtent],
- buffer[MaxTextExtent],
- date[MaxTextExtent],
+ basename[MagickPathExtent],
+ buffer[MagickPathExtent],
+ date[MagickPathExtent],
**labels,
- page_geometry[MaxTextExtent];
+ page_geometry[MagickPathExtent];
CompressionType
compression;
@@ -1189,7 +1189,7 @@
version=(size_t) MagickMax(version,4);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
version=(size_t) MagickMax(version,6);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%PDF-1.%.20g \n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%PDF-1.%.20g \n",(double)
version);
(void) WriteBlobString(image,buffer);
if (LocaleCompare(image_info->magick,"PDFA") == 0)
@@ -1206,19 +1206,19 @@
*/
xref[object++]=TellBlob(image);
root_id=object;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
if (LocaleCompare(image_info->magick,"PDFA") != 0)
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Pages %.20g 0 R\n",(double)
object+1);
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Metadata %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Metadata %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Pages %.20g 0 R\n",
(double) object+2);
}
(void) WriteBlobString(image,buffer);
@@ -1229,10 +1229,10 @@
if (LocaleCompare(image_info->magick,"PDFA") == 0)
{
char
- create_date[MaxTextExtent],
- modify_date[MaxTextExtent],
- timestamp[MaxTextExtent],
- xmp_profile[MaxTextExtent];
+ create_date[MagickPathExtent],
+ modify_date[MagickPathExtent],
+ timestamp[MagickPathExtent],
+ xmp_profile[MagickPathExtent];
size_t
version;
@@ -1241,7 +1241,7 @@
Write XMP object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -1249,17 +1249,17 @@
*modify_date='\0';
value=GetImageProperty(image,"date:modify",exception);
if (value != (const char *) NULL)
- (void) CopyMagickString(modify_date,value,MaxTextExtent);
+ (void) CopyMagickString(modify_date,value,MagickPathExtent);
*create_date='\0';
value=GetImageProperty(image,"date:create",exception);
if (value != (const char *) NULL)
- (void) CopyMagickString(create_date,value,MaxTextExtent);
- (void) FormatMagickTime(time((time_t *) NULL),MaxTextExtent,timestamp);
- i=FormatLocaleString(xmp_profile,MaxTextExtent,XMPProfile,
+ (void) CopyMagickString(create_date,value,MagickPathExtent);
+ (void) FormatMagickTime(time((time_t *) NULL),MagickPathExtent,timestamp);
+ i=FormatLocaleString(xmp_profile,MagickPathExtent,XMPProfile,
XMPProfileMagick,modify_date,create_date,timestamp,
GetMagickVersion(&version),EscapeParenthesis(basename),
GetMagickVersion(&version));
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g\n",(double)
i);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Type /Metadata\n");
@@ -1273,12 +1273,12 @@
*/
xref[object++]=TellBlob(image);
pages_id=object;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /Pages\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Kids [ %.20g 0 R ",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Kids [ %.20g 0 R ",(double)
object+1);
(void) WriteBlobString(image,buffer);
count=(ssize_t) (pages_id+ObjectsPerImage+1);
@@ -1293,7 +1293,7 @@
kid_image=image;
for ( ; GetNextImageInList(kid_image) != (Image *) NULL; count+=ObjectsPerImage)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 R ",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 R ",(double)
count);
(void) WriteBlobString(image,buffer);
kid_image=GetNextImageInList(kid_image);
@@ -1304,7 +1304,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
}
(void) WriteBlobString(image,"]\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Count %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Count %.20g\n",(double)
((count-pages_id)/ObjectsPerImage));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1401,20 +1401,20 @@
resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0);
}
SetGeometry(image,&geometry);
- (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g",(double)
image->columns,(double) image->rows);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent);
else
if ((image->page.width != 0) && (image->page.height != 0))
- (void) FormatLocaleString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
if ((image->gravity != UndefinedGravity) &&
(LocaleCompare(image_info->magick,"PDF") == 0))
- (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent);
- (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent);
+ (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent);
+ (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent);
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
@@ -1440,12 +1440,12 @@
Write Page object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /Page\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Parent %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Parent %.20g 0 R\n",
(double) pages_id);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/Resources <<\n");
@@ -1455,30 +1455,30 @@
labels=StringToList(value);
if (labels != (char **) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"/Font << /F%.20g %.20g 0 R >>\n",(double) image->scene,(double)
object+4);
(void) WriteBlobString(image,buffer);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"/XObject << /Im%.20g %.20g 0 R >>\n",(double) image->scene,(double)
object+5);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/ProcSet %.20g 0 R >>\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/ProcSet %.20g 0 R >>\n",
(double) object+3);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"/MediaBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x,
72.0*media_info.height/resolution.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"/CropBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x,
72.0*media_info.height/resolution.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Contents %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Contents %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Thumb %.20g 0 R\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Thumb %.20g 0 R\n",(double)
object+8);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1487,11 +1487,11 @@
Write Contents object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -1502,22 +1502,22 @@
for (i=0; labels[i] != (char *) NULL; i++)
{
(void) WriteBlobString(image,"BT\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/F%.20g %g Tf\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/F%.20g %g Tf\n",
(double) image->scene,pointsize);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g Td\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g Td\n",
(double) geometry.x,(double) (geometry.y+geometry.height+i*pointsize+
12));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"(%s) Tj\n",labels[i]);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"(%s) Tj\n",labels[i]);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"ET\n");
labels[i]=DestroyString(labels[i]);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%g 0 0 %g %.20g %.20g cm\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%g 0 0 %g %.20g %.20g cm\n",
scale.x,scale.y,(double) geometry.x,(double) geometry.y);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Im%.20g Do\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Im%.20g Do\n",(double)
image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"Q\n");
@@ -1528,26 +1528,26 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
Write Procset object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
if ((image->storage_class == DirectClass) || (image->colors > 256))
- (void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MaxTextExtent);
+ (void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MagickPathExtent);
else
if ((compression == FaxCompression) || (compression == Group4Compression))
- (void) CopyMagickString(buffer,"[ /PDF /Text /ImageB",MaxTextExtent);
+ (void) CopyMagickString(buffer,"[ /PDF /Text /ImageB",MagickPathExtent);
else
- (void) CopyMagickString(buffer,"[ /PDF /Text /ImageI",MaxTextExtent);
+ (void) CopyMagickString(buffer,"[ /PDF /Text /ImageI",MagickPathExtent);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image," ]\n");
(void) WriteBlobString(image,"endobj\n");
@@ -1555,7 +1555,7 @@
Write Font object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -1563,7 +1563,7 @@
{
(void) WriteBlobString(image,"/Type /Font\n");
(void) WriteBlobString(image,"/Subtype /Type1\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /F%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /F%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/BaseFont /Helvetica\n");
@@ -1576,91 +1576,91 @@
Write XObject object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
(void) WriteBlobString(image,"/Type /XObject\n");
(void) WriteBlobString(image,"/Subtype /Image\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Im%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /Im%.20g\n",(double)
image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"ASCII85Decode");
break;
}
case JPEGCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"DCTDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
(void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n",
- MaxTextExtent);
+ MagickPathExtent);
break;
}
case JPEG2000Compression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"JPXDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
(void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n",
- MaxTextExtent);
+ MagickPathExtent);
break;
}
case LZWCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"FlateDecode");
break;
}
case FaxCompression:
case Group4Compression:
{
(void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
- MaxTextExtent);
+ MagickPathExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/DecodeParms [ << "
"/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
(double) image->columns,(double) image->rows);
break;
}
default:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double)
image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n",(double)
image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/ColorSpace %.20g 0 R\n",
(double) object+2);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
1 : 8);
(void) WriteBlobString(image,buffer);
if (image->alpha_trait != UndefinedPixelTrait)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"/SMask %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/SMask %.20g 0 R\n",
(double) object+7);
(void) WriteBlobString(image,buffer);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2003,34 +2003,34 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
/*
Write Colorspace object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
if (image->colorspace == CMYKColorspace)
- (void) CopyMagickString(buffer,"/DeviceCMYK\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"/DeviceCMYK\n",MagickPathExtent);
else
if ((compression == FaxCompression) ||
(compression == Group4Compression) ||
((image_info->type != TrueColorType) &&
(SetImageGray(image,exception) != MagickFalse)))
- (void) CopyMagickString(buffer,"/DeviceGray\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"/DeviceGray\n",MagickPathExtent);
else
if ((image->storage_class == DirectClass) || (image->colors > 256) ||
(compression == JPEGCompression) ||
(compression == JPEG2000Compression))
- (void) CopyMagickString(buffer,"/DeviceRGB\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"/DeviceRGB\n",MagickPathExtent);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"[ /Indexed /DeviceRGB %.20g %.20g 0 R ]\n",(double) image->colors-
1,(double) object+3);
(void) WriteBlobString(image,buffer);
@@ -2045,7 +2045,7 @@
if (tile_image == (Image *) NULL)
return(MagickFalse);
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -2053,72 +2053,72 @@
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"ASCII85Decode");
break;
}
case JPEGCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"DCTDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
(void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n",
- MaxTextExtent);
+ MagickPathExtent);
break;
}
case JPEG2000Compression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"JPXDecode");
if (image->colorspace != CMYKColorspace)
break;
(void) WriteBlobString(image,buffer);
(void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n",
- MaxTextExtent);
+ MagickPathExtent);
break;
}
case LZWCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"FlateDecode");
break;
}
case FaxCompression:
case Group4Compression:
{
(void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n",
- MaxTextExtent);
+ MagickPathExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << "
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/DecodeParms [ << "
"/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam,
(double) tile_image->columns,(double) tile_image->rows);
break;
}
default:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double)
tile_image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n",(double)
tile_image->rows);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/ColorSpace %.20g 0 R\n",
(double) object-1);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression) ?
1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2444,14 +2444,14 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -2465,7 +2465,7 @@
*/
if (compression == NoCompression)
(void) WriteBlobString(image,"/Filter [ /ASCII85Decode ]\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2502,10 +2502,10 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
@@ -2513,7 +2513,7 @@
Write softmask object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
@@ -2523,48 +2523,48 @@
{
(void) WriteBlobString(image,"/Type /XObject\n");
(void) WriteBlobString(image,"/Subtype /Image\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Ma%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /Ma%.20g\n",
(double) image->scene);
(void) WriteBlobString(image,buffer);
switch (compression)
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,
"ASCII85Decode");
break;
}
case LZWCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode");
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode");
break;
}
case ZipCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,
"FlateDecode");
break;
}
default:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,
+ (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,
"RunLengthDecode");
break;
}
}
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double)
image->columns);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n",
(double) image->rows);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/ColorSpace /DeviceGray\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n",
(compression == FaxCompression) || (compression == Group4Compression)
? 1 : 8);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n",
(double) object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2652,10 +2652,10 @@
Write Length object.
*/
xref[object++]=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"endobj\n");
if (GetNextImageInList(image) == (Image *) NULL)
@@ -2671,11 +2671,11 @@
*/
xref[object++]=TellBlob(image);
info_id=object;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double)
object);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"<<\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Title (%s)\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Title (%s)\n",
EscapeParenthesis(basename));
(void) WriteBlobString(image,buffer);
seconds=time((time_t *) NULL);
@@ -2684,14 +2684,14 @@
#else
(void) memcpy(&local_time,localtime(&seconds),sizeof(local_time));
#endif
- (void) FormatLocaleString(date,MaxTextExtent,"D:%04d%02d%02d%02d%02d%02d",
+ (void) FormatLocaleString(date,MagickPathExtent,"D:%04d%02d%02d%02d%02d%02d",
local_time.tm_year+1900,local_time.tm_mon+1,local_time.tm_mday,
local_time.tm_hour,local_time.tm_min,local_time.tm_sec);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/CreationDate (%s)\n",date);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/CreationDate (%s)\n",date);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/ModDate (%s)\n",date);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/ModDate (%s)\n",date);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Producer (%s)\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Producer (%s)\n",
EscapeParenthesis(GetMagickVersion((size_t *) NULL)));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
@@ -2702,35 +2702,35 @@
offset=TellBlob(image)-xref[0]+
(LocaleCompare(image_info->magick,"PDFA") == 0 ? 6 : 0)+10;
(void) WriteBlobString(image,"xref\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"0 %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0 %.20g\n",(double)
object+1);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"0000000000 65535 f \n");
for (i=0; i < (ssize_t) object; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%010lu 00000 n \n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%010lu 00000 n \n",
(unsigned long) xref[i]);
(void) WriteBlobString(image,buffer);
}
(void) WriteBlobString(image,"trailer\n");
(void) WriteBlobString(image,"<<\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Size %.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Size %.20g\n",(double)
object+1);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Info %.20g 0 R\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Info %.20g 0 R\n",(double)
info_id);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/Root %.20g 0 R\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/Root %.20g 0 R\n",(double)
root_id);
(void) WriteBlobString(image,buffer);
(void) SignatureImage(image,exception);
- (void) FormatLocaleString(buffer,MaxTextExtent,"/ID [<%s> <%s>]\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"/ID [<%s> <%s>]\n",
GetImageProperty(image,"signature",exception),
GetImageProperty(image,"signature",exception));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,">>\n");
(void) WriteBlobString(image,"startxref\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%EOF\n");
xref=(MagickOffsetType *) RelinquishMagickMemory(xref);
diff --git a/coders/pes.c b/coders/pes.c
index 38cea7c..3c04932 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -421,7 +421,7 @@
static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*file;
@@ -653,16 +653,16 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"svg:%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"svg:%s",
filename);
image=ReadImage(read_info,exception);
if (image != (Image *) NULL)
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(image->magick_filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,"PES",MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,"PES",MagickPathExtent);
}
read_info=DestroyImageInfo(read_info);
(void) RelinquishUniqueFileResource(filename);
diff --git a/coders/pict.c b/coders/pict.c
index bf7f0cd..4f51eb3 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -806,7 +806,7 @@
ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent],
+ geometry[MagickPathExtent],
header_ole[4];
Image
@@ -1413,7 +1413,7 @@
{
(void) RelinquishUniqueFileResource(read_info->filename);
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
ThrowFileException(exception,FileOpenError,
"UnableToCreateTemporaryFile",image->filename);
image=DestroyImageList(image);
@@ -1448,7 +1448,7 @@
read_info=DestroyImageInfo(read_info);
if (tile_image == (Image *) NULL)
continue;
- (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",
(double) MagickMax(image->columns,tile_image->columns),
(double) MagickMax(image->rows,tile_image->rows));
(void) SetImageExtent(image,
@@ -1811,7 +1811,7 @@
return(MagickFalse);
}
jpeg_info=CloneImageInfo(image_info);
- (void) CopyMagickString(jpeg_info->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_info->magick,"JPEG",MagickPathExtent);
length=0;
blob=(unsigned char *) ImageToBlob(jpeg_info,jpeg_image,&length,
exception);
diff --git a/coders/plasma.c b/coders/plasma.c
index 77a8e02..0585442 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -146,7 +146,7 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,
"gradient:%s",image_info->filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
diff --git a/coders/png.c b/coders/png.c
index 3719185..cf8cf8a 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1350,9 +1350,9 @@
if (check != length)
{
char
- msg[MaxTextExtent];
+ msg[MagickPathExtent];
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"Expected %.20g bytes; found %.20g bytes",(double) length,
(double) check);
png_warning(png_ptr,msg);
@@ -2335,12 +2335,12 @@
/* Save bit-depth and color-type in case we later want to write a PNG00 */
{
char
- msg[MaxTextExtent];
+ msg[MagickPathExtent];
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type);
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_color_type);
(void) SetImageProperty(image,"png:IHDR.color-type-orig",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_bit_depth);
(void) SetImageProperty(image,"png:IHDR.bit-depth-orig",msg,exception);
}
@@ -3043,43 +3043,43 @@
/* Set some properties for reporting by "identify" */
{
char
- msg[MaxTextExtent];
+ msg[MagickPathExtent];
/* encode ping_width, ping_height, ping_file_depth, ping_color_type,
ping_interlace_method in value */
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"%d, %d",(int) ping_width, (int) ping_height);
(void) SetImageProperty(image,"png:IHDR.width,height",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_file_depth);
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_file_depth);
(void) SetImageProperty(image,"png:IHDR.bit_depth",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d (%s)",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d (%s)",
(int) ping_color_type,
Magick_ColorType_from_PNG_ColorType((int)ping_color_type));
(void) SetImageProperty(image,"png:IHDR.color_type",msg,exception);
if (ping_interlace_method == 0)
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%d (Not interlaced)",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d (Not interlaced)",
(int) ping_interlace_method);
}
else if (ping_interlace_method == 1)
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%d (Adam7 method)",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d (Adam7 method)",
(int) ping_interlace_method);
}
else
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%d (Unknown method)",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d (Unknown method)",
(int) ping_interlace_method);
}
(void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception);
if (number_colors != 0)
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%d",
(int) number_colors);
(void) SetImageProperty(image,"png:PLTE.number_colors",msg,
exception);
@@ -3636,7 +3636,7 @@
*value;
length=text[i].text_length;
- value=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ value=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*value));
if (value == (char *) NULL)
{
@@ -3789,12 +3789,12 @@
/* Set more properties for identify to retrieve */
{
char
- msg[MaxTextExtent];
+ msg[MagickPathExtent];
if (num_text_total != 0)
{
/* libpng doesn't tell us whether they were tEXt, zTXt, or iTXt */
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"%d tEXt/zTXt/iTXt chunks were found", num_text_total);
(void) SetImageProperty(image,"png:text",msg,
exception);
@@ -3802,7 +3802,7 @@
if (num_raw_profiles != 0)
{
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"%d were found", num_raw_profiles);
(void) SetImageProperty(image,"png:text-encoded profiles",msg,
exception);
@@ -3810,7 +3810,7 @@
if (ping_found_cHRM != MagickFalse)
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%s",
"chunk was found (see Chromaticity, above)");
(void) SetImageProperty(image,"png:cHRM",msg,
exception);
@@ -3818,13 +3818,13 @@
if (png_get_valid(ping,ping_info,PNG_INFO_bKGD))
{
- (void) FormatLocaleString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%s",
"chunk was found (see Background color, above)");
(void) SetImageProperty(image,"png:bKGD",msg,
exception);
}
- (void) FormatLocaleString(msg,MaxTextExtent,"%s",
+ (void) FormatLocaleString(msg,MagickPathExtent,"%s",
"chunk was found");
#if defined(PNG_iCCP_SUPPORTED)
@@ -3840,7 +3840,7 @@
#if defined(PNG_sRGB_SUPPORTED)
if (ping_found_sRGB != MagickFalse)
{
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"intent=%d (%s)",
(int) intent,
Magick_RenderingIntentString_from_PNG_RenderingIntent(intent));
@@ -3851,7 +3851,7 @@
if (ping_found_gAMA != MagickFalse)
{
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"gamma=%.8g (See Gamma, above)",
file_gamma);
(void) SetImageProperty(image,"png:gAMA",msg,
@@ -3861,7 +3861,7 @@
#if defined(PNG_pHYs_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_pHYs))
{
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"x_res=%.10g, y_res=%.10g, units=%d",
(double) x_resolution,(double) y_resolution, unit_type);
(void) SetImageProperty(image,"png:pHYs",msg,
@@ -3872,7 +3872,7 @@
#if defined(PNG_oFFs_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_oFFs))
{
- (void) FormatLocaleString(msg,MaxTextExtent,"x_off=%.20g, y_off=%.20g",
+ (void) FormatLocaleString(msg,MagickPathExtent,"x_off=%.20g, y_off=%.20g",
(double) image->page.x,(double) image->page.y);
(void) SetImageProperty(image,"png:oFFs",msg,
exception);
@@ -3886,7 +3886,7 @@
if ((image->page.width != 0 && image->page.width != image->columns) ||
(image->page.height != 0 && image->page.height != image->rows))
{
- (void) FormatLocaleString(msg,MaxTextExtent,
+ (void) FormatLocaleString(msg,MagickPathExtent,
"width=%.20g, height=%.20g",
(double) image->page.width,(double) image->page.height);
(void) SetImageProperty(image,"png:vpAg",msg,
@@ -3932,7 +3932,7 @@
*mng_info;
char
- magic_number[MaxTextExtent];
+ magic_number[MagickPathExtent];
ssize_t
count;
@@ -4175,7 +4175,7 @@
for (;;)
{
char
- type[MaxTextExtent];
+ type[MagickPathExtent];
unsigned char
*chunk;
@@ -4193,7 +4193,7 @@
break;
type[0]='\0';
- (void) ConcatenateMagickString(type,"errr",MaxTextExtent);
+ (void) ConcatenateMagickString(type,"errr",MagickPathExtent);
length=ReadBlobMSBLong(image);
count=(unsigned int) ReadBlob(image,4,(unsigned char *) type);
@@ -4600,7 +4600,7 @@
" Reading jng_image from color_blob.");
assert(color_image_info != (ImageInfo *) NULL);
- (void) FormatLocaleString(color_image_info->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(color_image_info->filename,MagickPathExtent,"%s",
color_image->filename);
color_image_info->ping=MagickFalse; /* To do: avoid this */
@@ -4663,7 +4663,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Reading alpha from alpha_blob.");
- (void) FormatLocaleString(alpha_image_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(alpha_image_info->filename,MagickPathExtent,
"%s",alpha_image->filename);
jng_image=ReadImage(alpha_image_info,exception);
@@ -4788,7 +4788,7 @@
*mng_info;
char
- magic_number[MaxTextExtent];
+ magic_number[MagickPathExtent];
size_t
count;
@@ -4865,7 +4865,7 @@
static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- page_geometry[MaxTextExtent];
+ page_geometry[MagickPathExtent];
Image
*image;
@@ -4997,7 +4997,7 @@
if (LocaleCompare(image_info->magick,"MNG") == 0)
{
char
- magic_number[MaxTextExtent];
+ magic_number[MagickPathExtent];
/* Verify MNG signature. */
count=(size_t) ReadBlob(image,8,(unsigned char *) magic_number);
@@ -5038,7 +5038,7 @@
do
{
char
- type[MaxTextExtent];
+ type[MagickPathExtent];
if (LocaleCompare(image_info->magick,"MNG") == 0)
{
@@ -5049,7 +5049,7 @@
Read a new chunk.
*/
type[0]='\0';
- (void) ConcatenateMagickString(type,"errr",MaxTextExtent);
+ (void) ConcatenateMagickString(type,"errr",MagickPathExtent);
length=ReadBlobMSBLong(image);
count=(size_t) ReadBlob(image,4,(unsigned char *) type);
@@ -5188,7 +5188,7 @@
(mng_info->mng_height > 65535L))
ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit");
- (void) FormatLocaleString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,
"%.20gx%.20g+0+0",(double) mng_info->mng_width,(double)
mng_info->mng_height);
@@ -7337,7 +7337,7 @@
ModuleExport size_t RegisterPNGImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
@@ -7363,14 +7363,14 @@
*version='\0';
#if defined(PNG_LIBPNG_VER_STRING)
- (void) ConcatenateMagickString(version,"libpng ",MaxTextExtent);
- (void) ConcatenateMagickString(version,PNG_LIBPNG_VER_STRING,MaxTextExtent);
+ (void) ConcatenateMagickString(version,"libpng ",MagickPathExtent);
+ (void) ConcatenateMagickString(version,PNG_LIBPNG_VER_STRING,MagickPathExtent);
if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0)
{
- (void) ConcatenateMagickString(version,",",MaxTextExtent);
+ (void) ConcatenateMagickString(version,",",MagickPathExtent);
(void) ConcatenateMagickString(version,png_get_libpng_ver(NULL),
- MaxTextExtent);
+ MagickPathExtent);
}
#endif
@@ -7426,13 +7426,13 @@
*version='\0';
#if defined(ZLIB_VERSION)
- (void) ConcatenateMagickString(version,"zlib ",MaxTextExtent);
- (void) ConcatenateMagickString(version,ZLIB_VERSION,MaxTextExtent);
+ (void) ConcatenateMagickString(version,"zlib ",MagickPathExtent);
+ (void) ConcatenateMagickString(version,ZLIB_VERSION,MagickPathExtent);
if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0)
{
- (void) ConcatenateMagickString(version,",",MaxTextExtent);
- (void) ConcatenateMagickString(version,zlib_version,MaxTextExtent);
+ (void) ConcatenateMagickString(version,",",MagickPathExtent);
+ (void) ConcatenateMagickString(version,zlib_version,MagickPathExtent);
}
#endif
@@ -7687,7 +7687,7 @@
#endif
text[0].key[0]='\0';
(void) ConcatenateMagickString(text[0].key,
- "Raw profile type ",MaxTextExtent);
+ "Raw profile type ",MagickPathExtent);
(void) ConcatenateMagickString(text[0].key,(const char *) profile_type,62);
sp=profile_data;
dp=text[0].text;
@@ -7974,9 +7974,9 @@
*/
*im_vers='\0';
(void) ConcatenateMagickString(im_vers,
- MagickLibVersionText,MaxTextExtent);
+ MagickLibVersionText,MagickPathExtent);
(void) ConcatenateMagickString(im_vers,
- MagickLibAddendum,MaxTextExtent);
+ MagickLibAddendum,MagickPathExtent);
*libpng_vers='\0';
(void) ConcatenateMagickString(libpng_vers,
@@ -12204,13 +12204,13 @@
jpeg_image=SeparateImage(image,AlphaChannel,exception);
if (jpeg_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
- (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent);
jpeg_image->alpha_trait=UndefinedPixelTrait;
jpeg_image->quality=jng_alpha_quality;
jpeg_image_info->type=GrayscaleType;
(void) SetImageType(jpeg_image,GrayscaleType,exception);
(void) AcquireUniqueFilename(jpeg_image->filename);
- (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(jpeg_image_info->filename,MagickPathExtent,
"%s",jpeg_image->filename);
}
else
@@ -12261,8 +12261,8 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating PNG blob.");
- (void) CopyMagickString(jpeg_image_info->magick,"PNG",MaxTextExtent);
- (void) CopyMagickString(jpeg_image->magick,"PNG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_image_info->magick,"PNG",MagickPathExtent);
+ (void) CopyMagickString(jpeg_image->magick,"PNG",MagickPathExtent);
jpeg_image_info->interlace=NoInterlace;
/* Exclude all ancillary chunks */
@@ -12286,8 +12286,8 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
- (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MaxTextExtent);
- (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MagickPathExtent);
+ (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent);
jpeg_image_info->interlace=NoInterlace;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -12609,10 +12609,10 @@
jpeg_image=CloneImage(image,0,0,MagickTrue,exception);
if (jpeg_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
- (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent);
(void) AcquireUniqueFilename(jpeg_image->filename);
- (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,"%s",
+ (void) FormatLocaleString(jpeg_image_info->filename,MagickPathExtent,"%s",
jpeg_image->filename);
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
@@ -12631,8 +12631,8 @@
jpeg_image_info->quality=jng_quality;
jpeg_image->quality=jng_quality;
- (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MaxTextExtent);
- (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
+ (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MagickPathExtent);
+ (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
diff --git a/coders/pnm.c b/coders/pnm.c
index d31bd47..7793aa5 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -155,13 +155,13 @@
*/
comment=AcquireString(GetImageProperty(image,"comment",exception));
p=comment+strlen(comment);
- extent=strlen(comment)+MaxTextExtent;
+ extent=strlen(comment)+MagickPathExtent;
for (c='#'; (c != EOF) && (c != (int) '\n'); p++)
{
if ((size_t) (p-comment+1) >= extent)
{
extent<<=1;
- comment=(char *) ResizeQuantumMemory(comment,extent+MaxTextExtent,
+ comment=(char *) ResizeQuantumMemory(comment,extent+MagickPathExtent,
sizeof(*comment));
if (comment == (char *) NULL)
break;
@@ -296,7 +296,7 @@
if ((format == 'f') || (format == 'F'))
{
char
- scale[MaxTextExtent];
+ scale[MagickPathExtent];
(void) ReadBlobString(image,scale);
quantum_scale=StringToDouble(scale,(char **) NULL);
@@ -312,8 +312,8 @@
else
{
char
- keyword[MaxTextExtent],
- value[MaxTextExtent];
+ keyword[MagickPathExtent],
+ value[MagickPathExtent];
int
c;
@@ -341,7 +341,7 @@
p=keyword;
do
{
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
} while (isalnum(c));
@@ -353,7 +353,7 @@
p=value;
while (isalnum(c) || (c == '_'))
{
- if ((size_t) (p-value) < (MaxTextExtent-1))
+ if ((size_t) (p-value) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
}
@@ -1503,9 +1503,9 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
format,
- magick[MaxTextExtent];
+ magick[MagickPathExtent];
const char
*value;
@@ -1565,7 +1565,7 @@
*/
packet_size=3;
quantum_type=RGBQuantum;
- (void) CopyMagickString(magick,image_info->magick,MaxTextExtent);
+ (void) CopyMagickString(magick,image_info->magick,MagickPathExtent);
max_value=GetQuantumRange(image->depth);
switch (magick[1])
{
@@ -1625,7 +1625,7 @@
break;
}
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"P%c\n",format);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"P%c\n",format);
(void) WriteBlobString(image,buffer);
value=GetImageProperty(image,"comment",exception);
if (value != (const char *) NULL)
@@ -1647,19 +1647,19 @@
}
if (format != '7')
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n",
(double) image->columns,(double) image->rows);
(void) WriteBlobString(image,buffer);
}
else
{
char
- type[MaxTextExtent];
+ type[MagickPathExtent];
/*
PAM header.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"WIDTH %.20g\nHEIGHT %.20g\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -1670,14 +1670,14 @@
case CMYKAQuantum:
{
packet_size=4;
- (void) CopyMagickString(type,"CMYK",MaxTextExtent);
+ (void) CopyMagickString(type,"CMYK",MagickPathExtent);
break;
}
case GrayQuantum:
case GrayAlphaQuantum:
{
packet_size=1;
- (void) CopyMagickString(type,"GRAYSCALE",MaxTextExtent);
+ (void) CopyMagickString(type,"GRAYSCALE",MagickPathExtent);
break;
}
default:
@@ -1686,22 +1686,22 @@
if (image->alpha_trait != UndefinedPixelTrait)
quantum_type=RGBAQuantum;
packet_size=3;
- (void) CopyMagickString(type,"RGB",MaxTextExtent);
+ (void) CopyMagickString(type,"RGB",MagickPathExtent);
break;
}
}
if (image->alpha_trait != UndefinedPixelTrait)
{
packet_size++;
- (void) ConcatenateMagickString(type,"_ALPHA",MaxTextExtent);
+ (void) ConcatenateMagickString(type,"_ALPHA",MagickPathExtent);
}
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"TUPLTYPE %s\nENDHDR\n",
type);
(void) WriteBlobString(image,buffer);
}
@@ -1790,14 +1790,14 @@
{
index=ClampToQuantum(GetPixelLuma(image,p));
if (image->depth <= 8)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
ScaleQuantumToChar(index));
else
if (image->depth <= 16)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
ScaleQuantumToShort(index));
else
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
ScaleQuantumToLong(index));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
@@ -1856,18 +1856,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->depth <= 8)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToChar(GetPixelRed(image,p)),
ScaleQuantumToChar(GetPixelGreen(image,p)),
ScaleQuantumToChar(GetPixelBlue(image,p)));
else
if (image->depth <= 16)
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToShort(GetPixelRed(image,p)),
ScaleQuantumToShort(GetPixelGreen(image,p)),
ScaleQuantumToShort(GetPixelBlue(image,p)));
else
- count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
+ count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
"%u %u %u ",ScaleQuantumToLong(GetPixelRed(image,p)),
ScaleQuantumToLong(GetPixelGreen(image,p)),
ScaleQuantumToLong(GetPixelBlue(image,p)));
@@ -1941,7 +1941,7 @@
*/
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo(image_info,image);
@@ -2058,7 +2058,7 @@
(void) TransformImageColorspace(image,sRGBColorspace,exception);
if (image->depth > 32)
image->depth=32;
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
((MagickOffsetType) GetQuantumRange(image->depth)));
(void) WriteBlobString(image,buffer);
quantum_info=AcquireQuantumInfo(image_info,image);
diff --git a/coders/preview.c b/coders/preview.c
index c9b6542..df5cb4b 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -185,11 +185,11 @@
if (preview_image == (Image *) NULL)
return(MagickFalse);
(void) CopyMagickString(preview_image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"PREVIEW") == 0)
- (void) FormatLocaleString(preview_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(preview_image->filename,MagickPathExtent,
"miff:%s",image_info->filename);
status=WriteImage(write_info,preview_image,exception);
preview_image=DestroyImage(preview_image);
diff --git a/coders/ps.c b/coders/ps.c
index 7385694..b972aaa 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -253,7 +253,7 @@
{
SetArgsStart(command,args_start);
if (status == -101) /* quit */
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"[ghostscript library %.2f]%s: %s",(double)revision.revision / 100,
args_start,errors);
else
@@ -413,14 +413,14 @@
#define SpotColor "+ "
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*density,
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
- input_filename[MaxTextExtent],
- message[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
+ input_filename[MagickPathExtent],
+ message[MagickPathExtent],
*options,
- postscript_filename[MaxTextExtent];
+ postscript_filename[MagickPathExtent];
const char
*option;
@@ -593,7 +593,7 @@
*/
*p++=(char) c;
if ((strchr("\n\r%",c) == (char *) NULL) &&
- ((size_t) (p-command) < (MaxTextExtent-1)))
+ ((size_t) (p-command) < (MagickPathExtent-1)))
continue;
*p='\0';
p=command;
@@ -677,7 +677,7 @@
GetStringInfoDatum(profile)[i]=(unsigned char) c;
*p++=(char) c;
if ((strchr("\n\r%",c) == (char *) NULL) &&
- ((size_t) (p-command) < (MaxTextExtent-1)))
+ ((size_t) (p-command) < (MagickPathExtent-1)))
continue;
*p='\0';
p=command;
@@ -710,7 +710,7 @@
(LocaleNCompare(SpotColor,command,strlen(SpotColor)) == 0))
{
char
- property[MaxTextExtent],
+ property[MagickPathExtent],
*value;
register char
@@ -719,7 +719,7 @@
/*
Note spot names.
*/
- (void) FormatLocaleString(property,MaxTextExtent,"ps:SpotColor-%.20g",
+ (void) FormatLocaleString(property,MagickPathExtent,"ps:SpotColor-%.20g",
(double) (spotcolor++));
for (p=command; *p != '\0'; p++)
if (isspace((int) (unsigned char) *p) != 0)
@@ -784,7 +784,7 @@
/*
Set Postscript render geometry.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,"%gx%g%+.15g%+.15g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g%+.15g%+.15g",
hires_bounds.x2-hires_bounds.x1,hires_bounds.y2-hires_bounds.y1,
hires_bounds.x1,hires_bounds.y1);
(void) SetImageProperty(image,"ps:HiResBoundingBox",geometry,exception);
@@ -835,14 +835,14 @@
}
(void) CopyMagickString(command,"/setpagedevice {pop} bind 1 index where {"
"dup wcheck {3 1 roll put} {pop def} ifelse} {def} ifelse\n"
- "<</UseCIEColor true>>setpagedevice\n",MaxTextExtent);
+ "<</UseCIEColor true>>setpagedevice\n",MagickPathExtent);
count=write(file,command,(unsigned int) strlen(command));
if (image_info->page == (char *) NULL)
{
char
- translate_geometry[MaxTextExtent];
+ translate_geometry[MagickPathExtent];
- (void) FormatLocaleString(translate_geometry,MaxTextExtent,
+ (void) FormatLocaleString(translate_geometry,MagickPathExtent,
"%g %g translate\n",-bounds.x1,-bounds.y1);
count=write(file,translate_geometry,(unsigned int)
strlen(translate_geometry));
@@ -866,21 +866,21 @@
}
density=AcquireString("");
options=AcquireString("");
- (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",resolution.x,
+ (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",resolution.x,
resolution.y);
- (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
read_info=CloneImageInfo(image_info);
*read_info->magick='\0';
if (read_info->number_scenes != 0)
{
char
- pages[MaxTextExtent];
+ pages[MagickPathExtent];
- (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g "
+ (void) FormatLocaleString(pages,MagickPathExtent,"-dFirstPage=%.20g "
"-dLastPage=%.20g ",(double) read_info->scene+1,(double)
(read_info->scene+read_info->number_scenes));
- (void) ConcatenateMagickString(options,pages,MaxTextExtent);
+ (void) ConcatenateMagickString(options,pages,MagickPathExtent);
read_info->number_scenes=0;
if (read_info->scenes != (char *) NULL)
*read_info->scenes='\0';
@@ -890,15 +890,15 @@
option=GetImageOption(image_info,"eps:use-cropbox");
if ((option == (const char *) NULL) ||
(IsStringTrue(option) != MagickFalse))
- (void) ConcatenateMagickString(options,"-dEPSCrop ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dEPSCrop ",MagickPathExtent);
if (fitPage != MagickFalse)
- (void) ConcatenateMagickString(options,"-dEPSFitPage ",MaxTextExtent);
+ (void) ConcatenateMagickString(options,"-dEPSFitPage ",MagickPathExtent);
}
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
(void) AcquireUniqueFilename(filename);
(void) RelinquishUniqueFileResource(filename);
- (void) ConcatenateMagickString(filename,"%d",MaxTextExtent);
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) ConcatenateMagickString(filename,"%d",MagickPathExtent);
+ (void) FormatLocaleString(command,MagickPathExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,filename,
@@ -912,7 +912,7 @@
if ((status == MagickFalse) ||
(IsPostscriptRendered(read_info->filename) == MagickFalse))
{
- (void) ConcatenateMagickString(command," -c showpage",MaxTextExtent);
+ (void) ConcatenateMagickString(command," -c showpage",MagickPathExtent);
status=InvokePostscriptDelegate(read_info->verbose,command,message,
exception);
}
@@ -985,9 +985,9 @@
}
do
{
- (void) CopyMagickString(postscript_image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(postscript_image->filename,filename,MagickPathExtent);
(void) CopyMagickString(postscript_image->magick,image->magick,
- MaxTextExtent);
+ MagickPathExtent);
if (columns != 0)
postscript_image->magick_columns=columns;
if (rows != 0)
@@ -1462,10 +1462,10 @@
};
char
- buffer[MaxTextExtent],
- date[MaxTextExtent],
+ buffer[MagickPathExtent],
+ date[MagickPathExtent],
**labels,
- page_geometry[MaxTextExtent];
+ page_geometry[MagickPathExtent];
CompressionType
compression;
@@ -1590,20 +1590,20 @@
resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0);
}
SetGeometry(image,&geometry);
- (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g",
(double) image->columns,(double) image->rows);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent);
else
if ((image->page.width != 0) && (image->page.height != 0))
- (void) FormatLocaleString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
if ((image->gravity != UndefinedGravity) &&
(LocaleCompare(image_info->magick,"PS") == 0))
- (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent);
- (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent);
+ (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent);
+ (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent);
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
@@ -1630,18 +1630,18 @@
Output Postscript header.
*/
if (LocaleCompare(image_info->magick,"PS") == 0)
- (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent);
else
(void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n",
- MaxTextExtent);
+ MagickPathExtent);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%Creator: (ImageMagick)\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: (%s)\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
- (void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatMagickTime(timer,MagickPathExtent,date);
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%CreationDate: (%s)\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -1651,14 +1651,14 @@
if ((image_info->adjoin != MagickFalse) &&
(GetNextImageInList(image) != (Image *) NULL))
(void) CopyMagickString(buffer,"%%%%BoundingBox: (atend)\n",
- MaxTextExtent);
+ MagickPathExtent);
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
}
@@ -1669,14 +1669,14 @@
/*
Embed Photoshop profile.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%BeginPhotoshop: %.20g",(double) GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++)
{
if ((i % 32) == 0)
(void) WriteBlobString(image,"\n% ");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%02X",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%02X",
(unsigned int) (GetStringInfoDatum(profile)[i] & 0xff));
(void) WriteBlobString(image,buffer);
}
@@ -1691,7 +1691,7 @@
Embed XML profile.
*/
(void) WriteBlobString(image,"\n%begin_xml_code\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"\n%%begin_xml_packet: %.20g\n",(double)
GetStringInfoLength(profile));
(void) WriteBlobString(image,buffer);
@@ -1714,7 +1714,7 @@
*/
(void) WriteBlobString(image,"%%Orientation: Portrait\n");
(void) WriteBlobString(image,"%%PageOrder: Ascend\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Pages: %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Pages: %.20g\n",
image_info->adjoin != MagickFalse ? (double)
GetImageListLength(image) : 1.0);
(void) WriteBlobString(image,buffer);
@@ -1747,7 +1747,7 @@
/*
Dump image as bitmap.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginPreview: %.20g %.20g %.20g %.20g\n%% ",(double)
preview_image->columns,(double) preview_image->rows,1.0,
(double) ((((preview_image->columns+7) >> 3)*preview_image->rows+
@@ -1809,7 +1809,7 @@
*/
for (s=PostscriptProlog; *s != (char *) NULL; s++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*s);
(void) WriteBlobString(image,buffer);
}
value=GetImageProperty(image,"label",exception);
@@ -1818,13 +1818,13 @@
{
(void) WriteBlobString(image," /label 512 string def\n");
(void) WriteBlobString(image," currentfile label readline pop\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" 0 y %g add moveto label show pop\n",j*pointsize+12);
(void) WriteBlobString(image,buffer);
}
for (s=PostscriptEpilog; *s != (char *) NULL; s++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*s);
(void) WriteBlobString(image,buffer);
}
if (LocaleCompare(image_info->magick,"PS") == 0)
@@ -1832,10 +1832,10 @@
(void) WriteBlobString(image,"} bind def\n");
(void) WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n",
(double) (page++));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double)
(geometry.height+text_size));
@@ -1857,7 +1857,7 @@
/*
Output image data.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n",
(double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize);
(void) WriteBlobString(image,buffer);
labels=(char **) NULL;
@@ -1868,7 +1868,7 @@
{
for (i=0; labels[i] != (char *) NULL; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s \n",
labels[i]);
(void) WriteBlobString(image,buffer);
labels[i]=DestroyString(labels[i]);
@@ -1890,7 +1890,7 @@
/*
Dump image as grayscale.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%.20g %.20g\n1\n1\n1\n8\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -1938,7 +1938,7 @@
/*
Dump image as bitmap.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%.20g %.20g\n1\n1\n1\n1\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,buffer);
@@ -2004,7 +2004,7 @@
/*
Dump DirectClass image.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n0\n%d\n",
(double) image->columns,(double) image->rows,
compression == RLECompression ? 1 : 0);
(void) WriteBlobString(image,buffer);
@@ -2131,7 +2131,7 @@
/*
Dump PseudoClass image.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%.20g %.20g\n%d\n%d\n0\n",(double) image->columns,(double)
image->rows,image->storage_class == PseudoClass ? 1 : 0,
compression == RLECompression ? 1 : 0);
@@ -2139,12 +2139,12 @@
/*
Dump number of colors and colormap.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
image->colors);
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%02X%02X%02X\n",
ScaleQuantumToChar(ClampToQuantum(image->colormap[i].red)),
ScaleQuantumToChar(ClampToQuantum(image->colormap[i].green)),
ScaleQuantumToChar(ClampToQuantum(image->colormap[i].blue)));
@@ -2267,11 +2267,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 2)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2-0.5),floor(bounds.y2-0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,bounds.x2,
bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/ps2.c b/coders/ps2.c
index cbbde50..e4ae547 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -203,8 +203,8 @@
status=MagickTrue;
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
- (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent);
+ (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent);
group4_image=CloneImage(inject_image,0,0,MagickTrue,exception);
if (group4_image == (Image *) NULL)
return(MagickFalse);
@@ -378,9 +378,9 @@
};
char
- buffer[MaxTextExtent],
- date[MaxTextExtent],
- page_geometry[MaxTextExtent],
+ buffer[MagickPathExtent],
+ date[MagickPathExtent],
+ page_geometry[MagickPathExtent],
**labels;
CompressionType
@@ -517,20 +517,20 @@
resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0;
}
SetGeometry(image,&geometry);
- (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g",
(double) image->columns,(double) image->rows);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent);
else
if ((image->page.width != 0) && (image->page.height != 0))
- (void) FormatLocaleString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
if ((image->gravity != UndefinedGravity) &&
(LocaleCompare(image_info->magick,"PS") == 0))
- (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent);
- (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent);
+ (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent);
+ (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent);
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
@@ -557,18 +557,18 @@
Output Postscript header.
*/
if (LocaleCompare(image_info->magick,"PS2") == 0)
- (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent);
else
(void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n",
- MaxTextExtent);
+ MagickPathExtent);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"%%Creator: (ImageMagick)\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: (%s)\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
- (void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatMagickTime(timer,MagickPathExtent,date);
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%CreationDate: (%s)\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -578,14 +578,14 @@
if ((image_info->adjoin != MagickFalse) &&
(GetNextImageInList(image) != (Image *) NULL))
(void) CopyMagickString(buffer,"%%BoundingBox: (atend)\n",
- MaxTextExtent);
+ MagickPathExtent);
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
}
@@ -602,9 +602,9 @@
(void) WriteBlobString(image,"%%Orientation: Portrait\n");
(void) WriteBlobString(image,"%%PageOrder: Ascend\n");
if (image_info->adjoin == MagickFalse)
- (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"%%Pages: 1\n",MagickPathExtent);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%Pages: %.20g\n",(double) GetImageListLength(image));
(void) WriteBlobString(image,buffer);
}
@@ -623,31 +623,31 @@
{
case NoCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MagickPathExtent,*q,
"/ASCII85Decode filter");
break;
}
case JPEGCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MagickPathExtent,*q,
"/DCTDecode filter");
break;
}
case LZWCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MagickPathExtent,*q,
"/LZWDecode filter");
break;
}
case FaxCompression:
case Group4Compression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,*q," ");
+ (void) FormatLocaleString(buffer,MagickPathExtent,*q," ");
break;
}
default:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,*q,
+ (void) FormatLocaleString(buffer,MagickPathExtent,*q,
"/RunLengthDecode filter");
break;
}
@@ -661,13 +661,13 @@
{
(void) WriteBlobString(image," /label 512 string def\n");
(void) WriteBlobString(image," currentfile label readline pop\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" 0 y %g add moveto label show pop\n",j*pointsize+12);
(void) WriteBlobString(image,buffer);
}
for (q=PostscriptEpilog; *q; q++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*q);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*q);
(void) WriteBlobString(image,buffer);
}
if (LocaleCompare(image_info->magick,"PS2") == 0)
@@ -675,10 +675,10 @@
(void) WriteBlobString(image,"} bind def\n");
(void) WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n",
(double) page++);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double)
(geometry.height+text_size));
@@ -697,7 +697,7 @@
if (LocaleCompare(image_info->magick,"PS2") != 0)
(void) WriteBlobString(image,"userdict begin\n");
start=TellBlob(image);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,
compression == NoCompression ? "ASCII" : "Binary");
(void) WriteBlobString(image,buffer);
@@ -706,7 +706,7 @@
/*
Output image data.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n",
(double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize);
(void) WriteBlobString(image,buffer);
labels=(char **) NULL;
@@ -717,7 +717,7 @@
{
for (i=0; labels[i] != (char *) NULL; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s \n",
labels[i]);
(void) WriteBlobString(image,buffer);
labels[i]=DestroyString(labels[i]);
@@ -731,16 +731,16 @@
((image_info->type != TrueColorType) &&
(SetImageGray(image,exception) != MagickFalse)))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n1\n%d\n",
(double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n",
(int) ((compression != FaxCompression) &&
(compression != Group4Compression)));
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"0\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n",
(compression == FaxCompression) ||
(compression == Group4Compression) ? 1 : 8);
(void) WriteBlobString(image,buffer);
@@ -847,11 +847,11 @@
if ((image->storage_class == DirectClass) || (image->colors > 256) ||
(compression == JPEGCompression) || (image->alpha_trait != UndefinedPixelTrait))
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n0\n%d\n",
(double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n",
(int) (compression == NoCompression));
(void) WriteBlobString(image,buffer);
switch (compression)
@@ -997,19 +997,19 @@
/*
Dump number of colors and colormap.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n1\n%d\n",
(double) image->columns,(double) image->rows,(int)
(image->colorspace == CMYKColorspace));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n",
(int) (compression == NoCompression));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double)
image->colors);
(void) WriteBlobString(image,buffer);
for (i=0; i < (ssize_t) image->colors; i++)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%02X%02X%02X\n",
ScaleQuantumToChar(image->colormap[i].red),
ScaleQuantumToChar(image->colormap[i].green),
ScaleQuantumToChar(image->colormap[i].blue));
@@ -1099,7 +1099,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "Binary");
(void) WriteBlobString(image,buffer);
@@ -1119,11 +1119,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 1)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,
bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/ps3.c b/coders/ps3.c
index cb11b4c..ed26efa 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -218,8 +218,8 @@
status=MagickTrue;
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent);
- (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent);
+ (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent);
group4_image=CloneImage(inject_image,0,0,MagickTrue,exception);
if (group4_image == (Image *) NULL)
return(MagickFalse);
@@ -431,7 +431,7 @@
Image *image,const CompressionType compression,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
Image
*mask_image;
@@ -470,7 +470,7 @@
start=TellBlob(image);
if (start < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,compression == NoCompression ?
"ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -485,7 +485,7 @@
case NoCompression:
default:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"currentfile %.20g %.20g "PS3_NoCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
@@ -493,28 +493,28 @@
case FaxCompression:
case Group4Compression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"currentfile %.20g %.20g "PS3_FaxCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case LZWCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"currentfile %.20g %.20g "PS3_LZWCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case RLECompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"currentfile %.20g %.20g "PS3_RLECompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
}
case ZipCompression:
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"currentfile %.20g %.20g "PS3_ZipCompression" ByteStreamDecodeFilter\n",
(double) image->columns,(double) image->rows);
break;
@@ -600,7 +600,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -808,10 +808,10 @@
};
char
- buffer[MaxTextExtent],
- date[MaxTextExtent],
+ buffer[MagickPathExtent],
+ date[MagickPathExtent],
**labels,
- page_geometry[MaxTextExtent];
+ page_geometry[MagickPathExtent];
CompressionType
compression;
@@ -957,20 +957,20 @@
resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0;
}
SetGeometry(image,&geometry);
- (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g",
(double) image->columns,(double) image->rows);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent);
else
if ((image->page.width != 0) && (image->page.height != 0))
- (void) FormatLocaleString(page_geometry,MaxTextExtent,
+ (void) FormatLocaleString(page_geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double)
image->page.height,(double) image->page.x,(double) image->page.y);
else
if ((image->gravity != UndefinedGravity) &&
(LocaleCompare(image_info->magick,"PS") == 0))
- (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent);
- (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent);
+ (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent);
+ (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent);
(void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y,
&geometry.width,&geometry.height);
scale.x=(double) (geometry.width*delta.x)/resolution.x;
@@ -998,20 +998,20 @@
Postscript header on the first page.
*/
if (LocaleCompare(image_info->magick,"PS3") == 0)
- (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent);
else
(void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n",
- MaxTextExtent);
+ MagickPathExtent);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%Creator: ImageMagick %s\n",MagickLibVersionText);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: %s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: %s\n",
image->filename);
(void) WriteBlobString(image,buffer);
timer=time((time_t *) NULL);
- (void) FormatMagickTime(timer,MaxTextExtent,date);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatMagickTime(timer,MagickPathExtent,date);
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%CreationDate: %s\n",date);
(void) WriteBlobString(image,buffer);
bounds.x1=(double) geometry.x;
@@ -1026,11 +1026,11 @@
}
else
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %g %g %g %g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,
bounds.y1,bounds.x2,bounds.y2);
(void) WriteBlobString(image,buffer);
@@ -1060,9 +1060,9 @@
(void) WriteBlobString(image,"%%Orientation: Portrait\n");
(void) WriteBlobString(image,"%%PageOrder: Ascend\n");
if (image_info->adjoin == MagickFalse)
- (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"%%Pages: 1\n",MagickPathExtent);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%Pages: %.20g\n",(double) GetImageListLength(image));
(void) WriteBlobString(image,buffer);
}
@@ -1091,7 +1091,7 @@
{
(void) WriteBlobString(image,
" currentfile buffer readline pop token pop\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" 0 y %g add moveto show pop\n",i*pointsize+12);
(void) WriteBlobString(image,buffer);
}
@@ -1106,13 +1106,13 @@
}
(void)WriteBlobString(image,"%%EndProlog\n");
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n",
(double) page);
(void) WriteBlobString(image,buffer);
/*
Page bounding box.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x,
(double) geometry.y,geometry.x+(double) geometry.width,geometry.y+
(double) (geometry.height+text_size));
@@ -1180,7 +1180,7 @@
start=TellBlob(image);
if (start < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",0L,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -1191,7 +1191,7 @@
/*
Translate, scale, and font point size.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n",
(double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize);
(void) WriteBlobString(image,buffer);
/*
@@ -1239,7 +1239,7 @@
/*
Image columns, rows, and color space.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%s\n",
(double) image->columns,(double) image->rows,image->colorspace ==
CMYKColorspace ? PS3_CMYKColorspace : PS3_RGBColorspace);
(void) WriteBlobString(image,buffer);
@@ -1314,7 +1314,7 @@
/*
1 bit or 8 bit components?
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n",
SetImageMonochrome(image,exception) != MagickFalse ? 1 : 8);
(void) WriteBlobString(image,buffer);
/*
@@ -1491,7 +1491,7 @@
/*
Number of colors in color map.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",
(double) image->colors);
(void) WriteBlobString(image,buffer);
/*
@@ -1578,7 +1578,7 @@
offset=SeekBlob(image,start,SEEK_SET);
if (offset < 0)
ThrowWriterException(CorruptImageError,"ImproperImageHeader");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BeginData:%13ld %s Bytes\n",(long) length,
compression == NoCompression ? "ASCII" : "BINARY");
(void) WriteBlobString(image,buffer);
@@ -1601,11 +1601,11 @@
(void) WriteBlobString(image,"%%Trailer\n");
if (page > 1)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%BoundingBox: %g %g %g %g\n",ceil(bounds.x1-0.5),
ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5));
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,bounds.x2,
bounds.y2);
(void) WriteBlobString(image,buffer);
diff --git a/coders/psd.c b/coders/psd.c
index 50c1ef9..5e130ab 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -566,7 +566,7 @@
case 0x03ed:
{
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
unsigned short
resolution;
@@ -576,14 +576,14 @@
*/
p=PushShortPixel(MSBEndian,p,&resolution);
image->resolution.x=(double) resolution;
- (void) FormatLocaleString(value,MaxTextExtent,"%g",image->resolution.x);
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",image->resolution.x);
(void) SetImageProperty(image,"tiff:XResolution",value,exception);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&resolution);
image->resolution.y=(double) resolution;
- (void) FormatLocaleString(value,MaxTextExtent,"%g",image->resolution.y);
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",image->resolution.y);
(void) SetImageProperty(image,"tiff:YResolution",value,exception);
p=PushShortPixel(MSBEndian,p,&short_sans);
p=PushShortPixel(MSBEndian,p,&short_sans);
@@ -1110,7 +1110,7 @@
LayerInfo* layer_info,ExceptionInfo *exception)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
MagickStatusType
status;
@@ -1137,13 +1137,13 @@
/*
Set up some hidden attributes for folks that need them.
*/
- (void) FormatLocaleString(message,MaxTextExtent,"%.20gld",
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20gld",
(double) layer_info->page.x);
(void) SetImageArtifact(layer_info->image,"psd:layer.x",message);
- (void) FormatLocaleString(message,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g",
(double) layer_info->page.y);
(void) SetImageArtifact(layer_info->image,"psd:layer.y",message);
- (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double)
layer_info->opacity);
(void) SetImageArtifact(layer_info->image,"psd:layer.opacity",message);
(void) SetImageProperty(layer_info->image,"label",(char *) layer_info->name,
@@ -2744,12 +2744,12 @@
if (property == (const char *) NULL)
{
char
- layer_name[MaxTextExtent];
+ layer_name[MagickPathExtent];
(void) WriteBlobMSBLong(image,16);
(void) WriteBlobMSBLong(image,0);
(void) WriteBlobMSBLong(image,0);
- (void) FormatLocaleString(layer_name,MaxTextExtent,"L%04ld",(long)
+ (void) FormatLocaleString(layer_name,MagickPathExtent,"L%04ld",(long)
layer_count++);
WritePascalString(image,layer_name,4);
}
diff --git a/coders/pwp.c b/coders/pwp.c
index 23d1851..e6e5555 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -153,7 +153,7 @@
count;
unsigned char
- magick[MaxTextExtent];
+ magick[MagickPathExtent];
/*
Open image file.
@@ -221,7 +221,7 @@
next_image=ReadImage(read_info,exception);
if (next_image == (Image *) NULL)
break;
- (void) FormatLocaleString(next_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(next_image->filename,MagickPathExtent,
"slide_%02ld.sfw",(long) next_image->scene);
if (image == (Image *) NULL)
image=next_image;
diff --git a/coders/rgb.c b/coders/rgb.c
index 67ecdc0..2883542 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1327,7 +1327,7 @@
}
if (image_info->interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
@@ -1449,7 +1449,7 @@
}
(void) CloseBlob(image);
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,6,6);
diff --git a/coders/sfw.c b/coders/sfw.c
index ff7e8e2..5f7fa0c 100644
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -314,7 +314,7 @@
buffer=(unsigned char *) RelinquishMagickMemory(buffer);
read_info=DestroyImageInfo(read_info);
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
image->filename);
image=DestroyImageList(image);
@@ -353,8 +353,8 @@
image=DestroyImageList(image);
return(jpeg_image);
}
- (void) CopyMagickString(jpeg_image->filename,image->filename,MaxTextExtent);
- (void) CopyMagickString(jpeg_image->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(jpeg_image->filename,image->filename,MagickPathExtent);
+ (void) CopyMagickString(jpeg_image->magick,image->magick,MagickPathExtent);
image=DestroyImageList(image);
image=jpeg_image;
/*
diff --git a/coders/sixel.c b/coders/sixel.c
index fcd5221..77e8434 100644
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -991,7 +991,7 @@
/*
Read SIXEL file.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
sixel_buffer=(char *) AcquireQuantumMemory((size_t) length,sizeof(*sixel_buffer));
p=sixel_buffer;
if (sixel_buffer != (char *) NULL)
@@ -1002,10 +1002,10 @@
if ((*p == '}') && (*(p+1) == ';'))
break;
p+=strlen(p);
- if ((size_t) (p-sixel_buffer+MaxTextExtent) < length)
+ if ((size_t) (p-sixel_buffer+MagickPathExtent) < length)
continue;
length<<=1;
- sixel_buffer=(char *) ResizeQuantumMemory(sixel_buffer,length+MaxTextExtent,
+ sixel_buffer=(char *) ResizeQuantumMemory(sixel_buffer,length+MagickPathExtent,
sizeof(*sixel_buffer));
if (sixel_buffer == (char *) NULL)
break;
diff --git a/coders/svg.c b/coders/svg.c
index e9cb5aa..1ffb600 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -288,7 +288,7 @@
const char *string)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
@@ -775,8 +775,8 @@
{
char
*color,
- id[MaxTextExtent],
- token[MaxTextExtent],
+ id[MagickPathExtent],
+ token[MagickPathExtent],
**tokens,
*units;
@@ -871,7 +871,7 @@
{
if (LocaleCompare(keyword,"id") == 0)
{
- (void) CopyMagickString(id,value,MaxTextExtent);
+ (void) CopyMagickString(id,value,MagickPathExtent);
break;
}
break;
@@ -2583,7 +2583,7 @@
{
char
*message,
- reason[MaxTextExtent];
+ reason[MagickPathExtent];
SVGInfo
*svg_info;
@@ -2602,7 +2602,7 @@
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
- (void) vsnprintf(reason,MaxTextExtent,format,operands);
+ (void) vsnprintf(reason,MagickPathExtent,format,operands);
#endif
message=GetExceptionMessage(errno);
(void) ThrowMagickException(svg_info->exception,GetMagickModule(),
@@ -2615,7 +2615,7 @@
{
char
*message,
- reason[MaxTextExtent];
+ reason[MagickPathExtent];
SVGInfo
*svg_info;
@@ -2634,7 +2634,7 @@
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
- (void) vsnprintf(reason,MaxTextExtent,format,operands);
+ (void) vsnprintf(reason,MagickPathExtent,format,operands);
#endif
message=GetExceptionMessage(errno);
(void) ThrowMagickException(svg_info->exception,GetMagickModule(),CoderError,
@@ -2750,7 +2750,7 @@
static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*file;
@@ -2769,7 +2769,7 @@
*svg_info;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
xmlSAXHandler
sax_modules;
@@ -2817,13 +2817,13 @@
if (delegate_info != (const DelegateInfo *) NULL)
{
char
- background[MaxTextExtent],
- command[MaxTextExtent],
+ background[MagickPathExtent],
+ command[MagickPathExtent],
*density,
- input_filename[MaxTextExtent],
- opacity[MaxTextExtent],
- output_filename[MaxTextExtent],
- unique[MaxTextExtent];
+ input_filename[MagickPathExtent],
+ opacity[MagickPathExtent],
+ output_filename[MagickPathExtent],
+ unique[MagickPathExtent];
int
status;
@@ -2838,16 +2838,16 @@
(void) AcquireUniqueFilename(output_filename);
(void) AcquireUniqueFilename(unique);
density=AcquireString("");
- (void) FormatLocaleString(density,MaxTextExtent,"%.20g,%.20g",
+ (void) FormatLocaleString(density,MagickPathExtent,"%.20g,%.20g",
image->resolution.x,image->resolution.y);
- (void) FormatLocaleString(background,MaxTextExtent,
+ (void) FormatLocaleString(background,MagickPathExtent,
"rgb(%.20g%%,%.20g%%,%.20g%%)",
100.0*QuantumScale*image->background_color.red,
100.0*QuantumScale*image->background_color.green,
100.0*QuantumScale*image->background_color.blue);
- (void) FormatLocaleString(opacity,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(opacity,MagickPathExtent,"%.20g",
QuantumScale*image->background_color.alpha);
- (void) FormatLocaleString(command,MaxTextExtent,GetDelegateCommands(
+ (void) FormatLocaleString(command,MagickPathExtent,GetDelegateCommands(
delegate_info),input_filename,output_filename,density,background,
opacity,unique);
density=DestroyString(density);
@@ -2866,7 +2866,7 @@
read_info=CloneImageInfo(image_info);
(void) CopyMagickString(read_info->filename,output_filename,
- MaxTextExtent);
+ MagickPathExtent);
svg_image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
(void) RelinquishUniqueFileResource(output_filename);
@@ -2932,7 +2932,7 @@
if ((image->resolution.x != 90.0) && (image->resolution.y != 90.0))
rsvg_handle_set_dpi_x_y(svg_handle,image->resolution.x,
image->resolution.y);
- while ((n=ReadBlob(image,MaxTextExtent,message)) != 0)
+ while ((n=ReadBlob(image,MagickPathExtent,message)) != 0)
{
error=(GError *) NULL;
(void) rsvg_handle_write(svg_handle,message,n,&error);
@@ -3080,7 +3080,7 @@
file=fdopen(unique_file,"w");
if ((unique_file == -1) || (file == (FILE *) NULL))
{
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
image->filename);
image=DestroyImageList(image);
@@ -3135,12 +3135,12 @@
sax_modules.cdataBlock=SVGCDataBlock;
sax_modules.externalSubset=SVGExternalSubset;
sax_handler=(&sax_modules);
- n=ReadBlob(image,MaxTextExtent,message);
+ n=ReadBlob(image,MagickPathExtent,message);
if (n > 0)
{
svg_info->parser=xmlCreatePushParserCtxt(sax_handler,svg_info,(char *)
message,n,image->filename);
- while ((n=ReadBlob(image,MaxTextExtent,message)) != 0)
+ while ((n=ReadBlob(image,MagickPathExtent,message)) != 0)
{
status=xmlParseChunk(svg_info->parser,(char *) message,(int) n,0);
if (status != 0)
@@ -3174,13 +3174,13 @@
SetImageInfoBlob(read_info,(void *) NULL,0);
if (read_info->density != (char *) NULL)
read_info->density=DestroyString(read_info->density);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"mvg:%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"mvg:%s",
filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
}
/*
Relinquish resources.
@@ -3225,14 +3225,14 @@
ModuleExport size_t RegisterSVGImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(LIBXML_DOTTED_VERSION)
- (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MaxTextExtent);
+ (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MagickPathExtent);
#endif
#if defined(MAGICKCORE_RSVG_DELEGATE)
#if !GLIB_CHECK_VERSION(2,35,0)
@@ -3241,7 +3241,7 @@
#if defined(MAGICKCORE_XML_DELEGATE)
xmlInitParser();
#endif
- (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d",
+ (void) FormatLocaleString(version,MagickPathExtent,"RSVG %d.%d.%d",
LIBRSVG_MAJOR_VERSION,LIBRSVG_MINOR_VERSION,LIBRSVG_MICRO_VERSION);
#endif
entry=AcquireMagickInfo("SVG","SVG","Scalable Vector Graphics");
@@ -3339,7 +3339,7 @@
static void AffineToTransform(Image *image,AffineMatrix *affine)
{
char
- transform[MaxTextExtent];
+ transform[MagickPathExtent];
if ((fabs(affine->tx) < MagickEpsilon) && (fabs(affine->ty) < MagickEpsilon))
{
@@ -3352,7 +3352,7 @@
(void) WriteBlobString(image,"\">\n");
return;
}
- (void) FormatLocaleString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MagickPathExtent,
"\" transform=\"scale(%g,%g)\">\n",affine->sx,affine->sy);
(void) WriteBlobString(image,transform);
return;
@@ -3368,7 +3368,7 @@
theta;
theta=(180.0/MagickPI)*atan2(affine->rx,affine->sx);
- (void) FormatLocaleString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MagickPathExtent,
"\" transform=\"rotate(%g)\">\n",theta);
(void) WriteBlobString(image,transform);
return;
@@ -3382,13 +3382,13 @@
(fabs(affine->ry) < MagickEpsilon) &&
(fabs(affine->sy-1.0) < MagickEpsilon))
{
- (void) FormatLocaleString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MagickPathExtent,
"\" transform=\"translate(%g,%g)\">\n",affine->tx,affine->ty);
(void) WriteBlobString(image,transform);
return;
}
}
- (void) FormatLocaleString(transform,MaxTextExtent,
+ (void) FormatLocaleString(transform,MagickPathExtent,
"\" transform=\"matrix(%g %g %g %g %g %g)\">\n",
affine->sx,affine->rx,affine->ry,affine->sy,affine->tx,affine->ty);
(void) WriteBlobString(image,transform);
@@ -3483,7 +3483,7 @@
{
char
*base64,
- message[MaxTextExtent];
+ message[MagickPathExtent];
Image
*clone_image;
@@ -3510,7 +3510,7 @@
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
(void) WriteBlobString(image,
" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<svg version=\"1.1\" id=\"Layer_1\" "
"xmlns=\"http://www.w3.org/2000/svg\" "
"xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" "
@@ -3524,7 +3524,7 @@
if (clone_image == (Image *) NULL)
return(MagickFalse);
image_info=AcquireImageInfo();
- (void) CopyMagickString(image_info->magick,"PNG",MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,"PNG",MagickPathExtent);
blob_length=2048;
blob=(unsigned char *) ImageToBlob(image_info,clone_image,&blob_length,
exception);
@@ -3535,7 +3535,7 @@
encode_length=0;
base64=Base64Encode(blob,blob_length,&encode_length);
blob=(unsigned char *) RelinquishMagickMemory(blob);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <image id=\"image%.20g\" width=\"%.20g\" height=\"%.20g\" "
"x=\"%.20g\" y=\"%.20g\"\n xlink:href=\"data:image/png;base64,",
(double) image->scene,(double) image->columns,(double) image->rows,
@@ -3544,7 +3544,7 @@
p=base64;
for (i=(ssize_t) encode_length; i > 0; i-=76)
{
- (void) FormatLocaleString(message,MaxTextExtent,"%.76s",p);
+ (void) FormatLocaleString(message,MagickPathExtent,"%.76s",p);
(void) WriteBlobString(image,message);
p+=76;
if (i > 76)
@@ -3567,11 +3567,11 @@
affine;
char
- keyword[MaxTextExtent],
- message[MaxTextExtent],
- name[MaxTextExtent],
+ keyword[MagickPathExtent],
+ message[MagickPathExtent],
+ name[MagickPathExtent],
*token,
- type[MaxTextExtent];
+ type[MagickPathExtent];
const char
*p,
@@ -3644,7 +3644,7 @@
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n");
(void) WriteBlobString(image,
" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n");
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<svg width=\"%.20g\" height=\"%.20g\">\n",(double) image->columns,(double)
image->rows);
(void) WriteBlobString(image,message);
@@ -3763,7 +3763,7 @@
if (LocaleCompare("clip-path",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"clip-path:url(#%s);",token);
(void) WriteBlobString(image,message);
break;
@@ -3771,7 +3771,7 @@
if (LocaleCompare("clip-rule",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"clip-rule:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3779,7 +3779,7 @@
if (LocaleCompare("clip-units",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"clipPathUnits=%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3803,7 +3803,7 @@
if (LocaleCompare("decorate",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"text-decoration:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3828,7 +3828,7 @@
if (LocaleCompare("fill",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"fill:%s;",
+ (void) FormatLocaleString(message,MagickPathExtent,"fill:%s;",
token);
(void) WriteBlobString(image,message);
break;
@@ -3836,7 +3836,7 @@
if (LocaleCompare("fill-rule",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"fill-rule:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3844,7 +3844,7 @@
if (LocaleCompare("fill-alpha",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"fill-alpha:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3852,7 +3852,7 @@
if (LocaleCompare("font-family",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"font-family:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3860,7 +3860,7 @@
if (LocaleCompare("font-stretch",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"font-stretch:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3868,7 +3868,7 @@
if (LocaleCompare("font-style",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"font-style:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3876,7 +3876,7 @@
if (LocaleCompare("font-size",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"font-size:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3884,7 +3884,7 @@
if (LocaleCompare("font-weight",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"font-weight:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -3903,7 +3903,7 @@
if (LocaleCompare("text-align",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"text-align %s ",token);
(void) WriteBlobString(image,message);
break;
@@ -3911,7 +3911,7 @@
if (LocaleCompare("text-anchor",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"text-anchor %s ",token);
(void) WriteBlobString(image,message);
break;
@@ -3948,7 +3948,7 @@
if (LocaleCompare("opacity",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"opacity %s ",
+ (void) FormatLocaleString(message,MagickPathExtent,"opacity %s ",
token);
(void) WriteBlobString(image,message);
break;
@@ -3994,7 +3994,7 @@
}
if (LocaleCompare("gradient",token) == 0)
{
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"</%sGradient>\n",type);
(void) WriteBlobString(image,message);
break;
@@ -4022,7 +4022,7 @@
if (LocaleCompare("clip-path",token) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<clipPath id=\"%s\">\n",token);
(void) WriteBlobString(image,message);
break;
@@ -4035,9 +4035,9 @@
if (LocaleCompare("gradient",token) == 0)
{
GetMagickToken(q,&q,token);
- (void) CopyMagickString(name,token,MaxTextExtent);
+ (void) CopyMagickString(name,token,MagickPathExtent);
GetMagickToken(q,&q,token);
- (void) CopyMagickString(type,token,MaxTextExtent);
+ (void) CopyMagickString(type,token,MagickPathExtent);
GetMagickToken(q,&q,token);
svg_info.segment.x1=StringToDouble(token,(char **) NULL);
svg_info.element.cx=StringToDouble(token,(char **) NULL);
@@ -4058,7 +4058,7 @@
svg_info.segment.y2=StringToDouble(token,(char **) NULL);
svg_info.element.minor=StringToDouble(token,
(char **) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<%sGradient id=\"%s\" x1=\"%g\" y1=\"%g\" x2=\"%g\" "
"y2=\"%g\">\n",type,name,svg_info.segment.x1,
svg_info.segment.y1,svg_info.segment.x2,svg_info.segment.y2);
@@ -4069,7 +4069,7 @@
GetMagickToken(q,&q,token);
svg_info.element.angle=StringToDouble(token,
(char **) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<%sGradient id=\"%s\" cx=\"%g\" cy=\"%g\" r=\"%g\" "
"fx=\"%g\" fy=\"%g\">\n",type,name,
svg_info.element.cx,svg_info.element.cy,
@@ -4093,7 +4093,7 @@
if (LocaleCompare("pattern",token) == 0)
{
GetMagickToken(q,&q,token);
- (void) CopyMagickString(name,token,MaxTextExtent);
+ (void) CopyMagickString(name,token,MagickPathExtent);
GetMagickToken(q,&q,token);
svg_info.bounds.x=StringToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
@@ -4110,7 +4110,7 @@
GetMagickToken(q,&q,token);
svg_info.bounds.height=StringToDouble(token,
(char **) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"<pattern id=\"%s\" x=\"%g\" y=\"%g\" width=\"%g\" "
"height=\"%g\">\n",name,svg_info.bounds.x,
svg_info.bounds.y,svg_info.bounds.width,
@@ -4139,7 +4139,7 @@
if (LocaleCompare("rotate",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"rotate(%s) ",
+ (void) FormatLocaleString(message,MagickPathExtent,"rotate(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -4163,7 +4163,7 @@
if (LocaleCompare("skewX",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"skewX(%s) ",
+ (void) FormatLocaleString(message,MagickPathExtent,"skewX(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -4171,7 +4171,7 @@
if (LocaleCompare("skewY",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"skewY(%s) ",
+ (void) FormatLocaleString(message,MagickPathExtent,"skewY(%s) ",
token);
(void) WriteBlobString(image,message);
break;
@@ -4179,12 +4179,12 @@
if (LocaleCompare("stop-color",keyword) == 0)
{
char
- color[MaxTextExtent];
+ color[MagickPathExtent];
GetMagickToken(q,&q,token);
- (void) CopyMagickString(color,token,MaxTextExtent);
+ (void) CopyMagickString(color,token,MagickPathExtent);
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <stop offset=\"%s\" stop-color=\"%s\" />\n",token,color);
(void) WriteBlobString(image,message);
break;
@@ -4192,7 +4192,7 @@
if (LocaleCompare("stroke",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"stroke:%s;",
+ (void) FormatLocaleString(message,MagickPathExtent,"stroke:%s;",
token);
(void) WriteBlobString(image,message);
break;
@@ -4200,7 +4200,7 @@
if (LocaleCompare("stroke-antialias",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-antialias:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4220,7 +4220,7 @@
for (j=0; j < k; j++)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,"%s ",
+ (void) FormatLocaleString(message,MagickPathExtent,"%s ",
token);
(void) WriteBlobString(image,message);
}
@@ -4228,7 +4228,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-dasharray:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4236,7 +4236,7 @@
if (LocaleCompare("stroke-dashoffset",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-dashoffset:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4244,7 +4244,7 @@
if (LocaleCompare("stroke-linecap",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-linecap:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4252,7 +4252,7 @@
if (LocaleCompare("stroke-linejoin",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-linejoin:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4260,7 +4260,7 @@
if (LocaleCompare("stroke-miterlimit",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-miterlimit:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4268,7 +4268,7 @@
if (LocaleCompare("stroke-opacity",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-opacity:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4276,7 +4276,7 @@
if (LocaleCompare("stroke-width",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"stroke-width:%s;",token);
(void) WriteBlobString(image,message);
continue;
@@ -4295,7 +4295,7 @@
if (LocaleCompare("text-antialias",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"text-antialias:%s;",token);
(void) WriteBlobString(image,message);
break;
@@ -4415,7 +4415,7 @@
status=MagickFalse;
break;
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <line x1=\"%g\" y1=\"%g\" x2=\"%g\" y2=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x,primitive_info[j+1].point.y);
@@ -4429,7 +4429,7 @@
status=MagickFalse;
break;
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <rect x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x-primitive_info[j].point.x,
@@ -4444,7 +4444,7 @@
status=MagickFalse;
break;
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <rect x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\" rx=\"%g\" "
"ry=\"%g\"/>\n",primitive_info[j].point.x,
primitive_info[j].point.y,primitive_info[j+1].point.x-
@@ -4470,7 +4470,7 @@
status=MagickFalse;
break;
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <ellipse cx=\"%g\" cy=\"%g\" rx=\"%g\" ry=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
primitive_info[j+1].point.x,primitive_info[j+1].point.y);
@@ -4490,7 +4490,7 @@
}
alpha=primitive_info[j+1].point.x-primitive_info[j].point.x;
beta=primitive_info[j+1].point.y-primitive_info[j].point.y;
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <circle cx=\"%g\" cy=\"%g\" r=\"%g\"/>\n",
primitive_info[j].point.x,primitive_info[j].point.y,
hypot(alpha,beta));
@@ -4504,12 +4504,12 @@
status=MagickFalse;
break;
}
- (void) CopyMagickString(message," <polyline points=\"",MaxTextExtent);
+ (void) CopyMagickString(message," <polyline points=\"",MagickPathExtent);
(void) WriteBlobString(image,message);
length=strlen(message);
for ( ; j < i; j++)
{
- (void) FormatLocaleString(message,MaxTextExtent,"%g,%g ",
+ (void) FormatLocaleString(message,MagickPathExtent,"%g,%g ",
primitive_info[j].point.x,primitive_info[j].point.y);
length+=strlen(message);
if (length >= 80)
@@ -4533,12 +4533,12 @@
primitive_info[i].coordinates=0;
primitive_info[j].coordinates++;
i++;
- (void) CopyMagickString(message," <polygon points=\"",MaxTextExtent);
+ (void) CopyMagickString(message," <polygon points=\"",MagickPathExtent);
(void) WriteBlobString(image,message);
length=strlen(message);
for ( ; j < i; j++)
{
- (void) FormatLocaleString(message,MaxTextExtent,"%g,%g ",
+ (void) FormatLocaleString(message,MagickPathExtent,"%g,%g ",
primitive_info[j].point.x,primitive_info[j].point.y);
length+=strlen(message);
if (length >= 80)
@@ -4620,7 +4620,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <text x=\"%g\" y=\"%g\">",primitive_info[j].point.x,
primitive_info[j].point.y);
(void) WriteBlobString(image,message);
@@ -4643,7 +4643,7 @@
break;
}
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" <image x=\"%g\" y=\"%g\" width=\"%g\" height=\"%g\" "
"xlink:href=\"%s\"/>\n",primitive_info[j].point.x,
primitive_info[j].point.y,primitive_info[j+1].point.x,
diff --git a/coders/tga.c b/coders/tga.c
index 292c220..2cc0d0b 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -289,8 +289,8 @@
*/
length=(size_t) tga_info.id_length;
comment=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- comment=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ if (~length >= (MagickPathExtent-1))
+ comment=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*comment));
if (comment == (char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index d54a675..07dd0a1 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -177,7 +177,7 @@
offset;
unsigned char
- magick[MaxTextExtent];
+ magick[MagickPathExtent];
profile=GetImageProfile(image,"exif");
if (profile == (const StringInfo *) NULL)
@@ -206,11 +206,11 @@
(void) SetImageType(thumbnail_image,thumbnail_image->alpha_trait ==
UndefinedPixelTrait ? TrueColorType : TrueColorAlphaType,exception);
(void) CopyMagickString(thumbnail_image->filename,image->filename,
- MaxTextExtent);
+ MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"THUMBNAIL") == 0)
- (void) FormatLocaleString(thumbnail_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(thumbnail_image->filename,MagickPathExtent,
"miff:%s",write_info->filename);
status=WriteImage(write_info,thumbnail_image,exception);
thumbnail_image=DestroyImage(thumbnail_image);
diff --git a/coders/tiff.c b/coders/tiff.c
index a85eebe..43997f6 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -303,7 +303,7 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*file;
@@ -392,16 +392,16 @@
Read TIFF image.
*/
read_info=CloneImageInfo((ImageInfo *) NULL);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s",filename);
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s",filename);
image=ReadTIFFImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(image->magick_filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,"GROUP4",MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,"GROUP4",MagickPathExtent);
}
(void) RelinquishUniqueFileResource(filename);
return(image);
@@ -535,17 +535,17 @@
static void TIFFErrors(const char *module,const char *format,va_list error)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
ExceptionInfo
*exception;
#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- (void) vsnprintf(message,MaxTextExtent,format,error);
+ (void) vsnprintf(message,MagickPathExtent,format,error);
#else
(void) vsprintf(message,format,error);
#endif
- (void) ConcatenateMagickString(message,".",MaxTextExtent);
+ (void) ConcatenateMagickString(message,".",MagickPathExtent);
exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception);
if (exception != (ExceptionInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),CoderError,message,
@@ -601,7 +601,7 @@
static void TIFFGetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception)
{
char
- message[MaxTextExtent],
+ message[MagickPathExtent],
*text;
uint32
@@ -625,8 +625,8 @@
(void) SetImageProperty(image,"tiff:model",text,exception);
if (TIFFGetField(tiff,TIFFTAG_OPIIMAGEID,&count,&text) == 1)
{
- if (count >= MaxTextExtent)
- count=MaxTextExtent-1;
+ if (count >= MagickPathExtent)
+ count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
(void) SetImageProperty(image,"tiff:image-id",message,exception);
}
@@ -636,15 +636,15 @@
(void) SetImageProperty(image,"tiff:software",text,exception);
if (TIFFGetField(tiff,33423,&count,&text) == 1)
{
- if (count >= MaxTextExtent)
- count=MaxTextExtent-1;
+ if (count >= MagickPathExtent)
+ count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
(void) SetImageProperty(image,"tiff:kodak-33423",message,exception);
}
if (TIFFGetField(tiff,36867,&count,&text) == 1)
{
- if (count >= MaxTextExtent)
- count=MaxTextExtent-1;
+ if (count >= MagickPathExtent)
+ count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
(void) SetImageProperty(image,"tiff:kodak-36867",message,exception);
}
@@ -655,7 +655,7 @@
{
#if defined(MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY)
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
register ssize_t
i;
@@ -699,7 +699,7 @@
ascii=(char *) NULL;
if ((TIFFGetField(tiff,exif_info[i].tag,&ascii,&sans,&sans) == 1) &&
(ascii != (char *) NULL) && (*ascii != '\0'))
- (void) CopyMagickString(value,ascii,MaxTextExtent);
+ (void) CopyMagickString(value,ascii,MagickPathExtent);
break;
}
case TIFF_SHORT:
@@ -711,7 +711,7 @@
shorty=0;
if (TIFFGetField(tiff,exif_info[i].tag,&shorty,&sans,&sans) == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%d",shorty);
+ (void) FormatLocaleString(value,MagickPathExtent,"%d",shorty);
}
else
{
@@ -727,7 +727,7 @@
tiff_status=TIFFGetField(tiff,exif_info[i].tag,&shorty_num,&shorty,
&sans,&sans);
if (tiff_status == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%d",
+ (void) FormatLocaleString(value,MagickPathExtent,"%d",
shorty_num != 0 ? shorty[0] : 0);
}
break;
@@ -739,7 +739,7 @@
longy=0;
if (TIFFGetField(tiff,exif_info[i].tag,&longy,&sans,&sans) == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%d",longy);
+ (void) FormatLocaleString(value,MagickPathExtent,"%d",longy);
break;
}
#if defined(TIFF_VERSION_BIG)
@@ -750,7 +750,7 @@
long8y=0;
if (TIFFGetField(tiff,exif_info[i].tag,&long8y,&sans,&sans) == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
((MagickOffsetType) long8y));
break;
}
@@ -764,7 +764,7 @@
floaty=0.0;
if (TIFFGetField(tiff,exif_info[i].tag,&floaty,&sans,&sans) == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%g",(double) floaty);
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",(double) floaty);
break;
}
case TIFF_DOUBLE:
@@ -774,7 +774,7 @@
doubley=0.0;
if (TIFFGetField(tiff,exif_info[i].tag,&doubley,&sans,&sans) == 1)
- (void) FormatLocaleString(value,MaxTextExtent,"%g",doubley);
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",doubley);
break;
}
default:
@@ -836,17 +836,17 @@
static void TIFFWarnings(const char *module,const char *format,va_list warning)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
ExceptionInfo
*exception;
#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- (void) vsnprintf(message,MaxTextExtent,format,warning);
+ (void) vsnprintf(message,MagickPathExtent,format,warning);
#else
(void) vsprintf(message,format,warning);
#endif
- (void) ConcatenateMagickString(message,".",MaxTextExtent);
+ (void) ConcatenateMagickString(message,".",MagickPathExtent);
exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception);
if (exception != (ExceptionInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),CoderWarning,
@@ -1276,7 +1276,7 @@
#if defined(JPEG_SUPPORT)
{
char
- sampling_factor[MaxTextExtent];
+ sampling_factor[MagickPathExtent];
int
tiff_status;
@@ -1289,7 +1289,7 @@
&horizontal,&vertical);
if (tiff_status == 1)
{
- (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%dx%d",
horizontal,vertical);
(void) SetImageProperty(image,"jpeg:sampling-factor",
sampling_factor,exception);
@@ -1448,10 +1448,10 @@
if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1)
{
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
method=ReadStripMethod;
- (void) FormatLocaleString(value,MaxTextExtent,"%u",
+ (void) FormatLocaleString(value,MagickPathExtent,"%u",
(unsigned int) rows_per_strip);
(void) SetImageProperty(image,"tiff:rows-per-strip",value,exception);
}
@@ -2114,7 +2114,7 @@
#define TIFFDescription "Tagged Image File Format"
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
@@ -2135,7 +2135,7 @@
UnlockSemaphoreInfo(tiff_semaphore);
*version='\0';
#if defined(TIFF_VERSION)
- (void) FormatLocaleString(version,MaxTextExtent,"%d",TIFF_VERSION);
+ (void) FormatLocaleString(version,MagickPathExtent,"%d",TIFF_VERSION);
#endif
#if defined(MAGICKCORE_TIFF_DELEGATE)
{
@@ -2146,7 +2146,7 @@
i;
p=TIFFGetVersion();
- for (i=0; (i < (MaxTextExtent-1)) && (*p != 0) && (*p != '\n'); i++)
+ for (i=0; (i < (MagickPathExtent-1)) && (*p != 0) && (*p != '\n'); i++)
version[i]=(*p++);
version[i]='\0';
}
@@ -2291,7 +2291,7 @@
Image *image,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*file;
@@ -2355,7 +2355,7 @@
filename);
return(MagickFalse);
}
- (void) FormatLocaleString(huffman_image->filename,MaxTextExtent,"tiff:%s",
+ (void) FormatLocaleString(huffman_image->filename,MagickPathExtent,"tiff:%s",
filename);
(void) SetImageType(huffman_image,BilevelType,exception);
write_info=CloneImageInfo((ImageInfo *) NULL);
@@ -2513,8 +2513,8 @@
*/
write_info=CloneImageInfo(image_info);
write_info->adjoin=MagickTrue;
- (void) CopyMagickString(write_info->magick,"TIFF",MaxTextExtent);
- (void) CopyMagickString(images->magick,"TIFF",MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent);
+ (void) CopyMagickString(images->magick,"TIFF",MagickPathExtent);
status=WriteTIFFImage(write_info,images,exception);
images=DestroyImageList(images);
write_info=DestroyImageInfo(write_info);
diff --git a/coders/tile.c b/coders/tile.c
index 03924e4..cafe8dc 100644
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -126,7 +126,7 @@
image->alpha_trait=tile_image->alpha_trait;
if (image->alpha_trait != UndefinedPixelTrait)
(void) SetImageBackgroundColor(image,exception);
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
if (LocaleCompare(tile_image->magick,"PATTERN") == 0)
{
tile_image->tile_offset.x=0;
diff --git a/coders/ttf.c b/coders/ttf.c
index 559f6be..11cd34d 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -167,7 +167,7 @@
static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
*text;
const char
@@ -217,7 +217,7 @@
type_info=GetTypeInfo(image_info->filename,exception);
if ((type_info != (const TypeInfo *) NULL) &&
(type_info->glyphs != (char *) NULL))
- (void) CopyMagickString(image->filename,type_info->glyphs,MaxTextExtent);
+ (void) CopyMagickString(image->filename,type_info->glyphs,MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
@@ -244,8 +244,8 @@
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
- (void) CopyMagickString(image->magick,image_info->magick,MaxTextExtent);
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->magick,image_info->magick,MagickPathExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
/*
Prepare drawing commands
*/
@@ -253,29 +253,29 @@
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
draw_info->font=AcquireString(image->filename);
ConcatenateString(&draw_info->primitive,"push graphic-context\n");
- (void) FormatLocaleString(buffer,MaxTextExtent," viewbox 0 0 %.20g %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent," viewbox 0 0 %.20g %.20g\n",
(double) image->columns,(double) image->rows);
ConcatenateString(&draw_info->primitive,buffer);
ConcatenateString(&draw_info->primitive," font-size 18\n");
- (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '",(double) y);
+ (void) FormatLocaleString(buffer,MagickPathExtent," text 10,%.20g '",(double) y);
ConcatenateString(&draw_info->primitive,buffer);
text=EscapeString(Text,'"');
ConcatenateString(&draw_info->primitive,text);
text=DestroyString(text);
- (void) FormatLocaleString(buffer,MaxTextExtent,"'\n");
+ (void) FormatLocaleString(buffer,MagickPathExtent,"'\n");
ConcatenateString(&draw_info->primitive,buffer);
y+=20*(ssize_t) MultilineCensus((char *) Text)+20;
for (i=12; i <= 72; i+=6)
{
y+=i+12;
ConcatenateString(&draw_info->primitive," font-size 18\n");
- (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '%.20g'\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent," text 10,%.20g '%.20g'\n",
(double) y,(double) i);
ConcatenateString(&draw_info->primitive,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent," font-size %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent," font-size %.20g\n",
(double) i);
ConcatenateString(&draw_info->primitive,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent," text 50,%.20g "
+ (void) FormatLocaleString(buffer,MagickPathExtent," text 50,%.20g "
"'That which does not destroy me, only makes me stronger.'\n",(double) y);
ConcatenateString(&draw_info->primitive,buffer);
if (i >= 24)
@@ -318,14 +318,14 @@
ModuleExport size_t RegisterTTFImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
*version='\0';
#if defined(FREETYPE_MAJOR) && defined(FREETYPE_MINOR) && defined(FREETYPE_PATCH)
- (void) FormatLocaleString(version,MaxTextExtent,"Freetype %d.%d.%d",
+ (void) FormatLocaleString(version,MagickPathExtent,"Freetype %d.%d.%d",
FREETYPE_MAJOR,FREETYPE_MINOR,FREETYPE_PATCH);
#endif
entry=AcquireMagickInfo("TTF","DFONT","Multi-face font package");
diff --git a/coders/txt.c b/coders/txt.c
index fa321a0..b92a0fa 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -104,7 +104,7 @@
#define MagickID "# ImageMagick pixel enumeration:"
char
- colorspace[MaxTextExtent];
+ colorspace[MagickPathExtent];
ssize_t
count;
@@ -160,8 +160,8 @@
char *text,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
*p;
DrawInfo
@@ -241,7 +241,7 @@
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
(void) CopyMagickString(read_info->filename,image_info->texture,
- MaxTextExtent);
+ MagickPathExtent);
texture=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
}
@@ -251,17 +251,17 @@
(void) SetImageBackgroundColor(image,exception);
draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
(void) CloneString(&draw_info->text,image_info->filename);
- (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+ (void) FormatLocaleString(geometry,MagickPathExtent,"0x0%+ld%+ld",(long) page.x,
(long) page.y);
(void) CloneString(&draw_info->geometry,geometry);
status=GetTypeMetrics(image,draw_info,&metrics,exception);
if (status == MagickFalse)
ThrowReaderException(TypeError,"UnableToGetTypeMetrics");
page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5);
- (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
+ (void) FormatLocaleString(geometry,MagickPathExtent,"0x0%+ld%+ld",(long) page.x,
(long) page.y);
(void) CloneString(&draw_info->geometry,geometry);
- (void) CopyMagickString(filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image_info->filename,MagickPathExtent);
if (*draw_info->text != '\0')
*draw_info->text='\0';
p=text;
@@ -310,7 +310,7 @@
image->next->columns=image->columns;
image->next->rows=image->rows;
image=SyncNextImageInList(image);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
(void) SetImageBackgroundColor(image,exception);
status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
GetBlobSize(image));
@@ -364,8 +364,8 @@
static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- colorspace[MaxTextExtent],
- text[MaxTextExtent];
+ colorspace[MagickPathExtent],
+ text[MagickPathExtent];
Image
*image;
@@ -672,9 +672,9 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
- colorspace[MaxTextExtent],
- tuple[MaxTextExtent];
+ buffer[MagickPathExtent],
+ colorspace[MagickPathExtent],
+ tuple[MagickPathExtent];
MagickBooleanType
status;
@@ -713,15 +713,15 @@
compliance;
(void) CopyMagickString(colorspace,CommandOptionToMnemonic(
- MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent);
+ MagickColorspaceOptions,(ssize_t) image->colorspace),MagickPathExtent);
LocaleLower(colorspace);
image->depth=GetImageQuantumDepth(image,MagickTrue);
if (image->alpha_trait != UndefinedPixelTrait)
- (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent);
+ (void) ConcatenateMagickString(colorspace,"a",MagickPathExtent);
compliance=NoCompliance;
if (LocaleCompare(image_info->magick,"SPARSE-COLOR") != 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double) ((MagickOffsetType)
GetQuantumRange(image->depth)),colorspace);
@@ -750,7 +750,7 @@
if (GetPixelAlpha(image,p) == (Quantum) OpaqueAlpha)
{
GetColorTuple(&pixel,MagickFalse,tuple);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g,",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g,",
(double) x,(double) y);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,tuple);
@@ -759,39 +759,39 @@
p+=GetPixelChannels(image);
continue;
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- (void) CopyMagickString(tuple,"(",MaxTextExtent);
+ (void) CopyMagickString(tuple,"(",MagickPathExtent);
if (pixel.colorspace == GRAYColorspace)
ConcatenateColorComponent(&pixel,GrayPixelChannel,compliance,
tuple);
else
{
ConcatenateColorComponent(&pixel,RedPixelChannel,compliance,tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,GreenPixelChannel,compliance,
tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,BluePixelChannel,compliance,tuple);
}
if (pixel.colorspace == CMYKColorspace)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,BlackPixelChannel,compliance,
tuple);
}
if (pixel.alpha_trait != UndefinedPixelTrait)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&pixel,AlphaPixelChannel,compliance,
tuple);
}
- (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,")",MagickPathExtent);
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image," ");
GetColorTuple(&pixel,MagickTrue,tuple);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s",tuple);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image," ");
(void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
diff --git a/coders/uil.c b/coders/uil.c
index ad42fdf..82e6d4b 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -161,9 +161,9 @@
#define MaxCixels 92
char
- basename[MaxTextExtent],
- buffer[MaxTextExtent],
- name[MaxTextExtent],
+ basename[MagickPathExtent],
+ buffer[MagickPathExtent],
+ name[MagickPathExtent],
*symbol;
int
@@ -291,7 +291,7 @@
symbol=AcquireString("");
(void) WriteBlobString(image,"/* UIL */\n");
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"value\n %s_ct : color_table(\n",basename);
(void) WriteBlobString(image,buffer);
GetPixelInfo(image,&pixel);
@@ -307,7 +307,7 @@
GetColorTuple(&pixel,MagickTrue,name);
if (transparent != MagickFalse)
if (i == (ssize_t) (colors-1))
- (void) CopyMagickString(name,"None",MaxTextExtent);
+ (void) CopyMagickString(name,"None",MagickPathExtent);
/*
Write UIL color.
*/
@@ -321,15 +321,15 @@
symbol[j]='\0';
(void) SubstituteString(&symbol,"'","''");
if (LocaleCompare(name,"None") == 0)
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" background color = '%s'",symbol);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" color('%s',%s) = '%s'",name,
GetPixelInfoIntensity(image,image->colormap+i) <
(QuantumRange/2.0) ? "background" : "foreground",symbol);
(void) WriteBlobString(image,buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s",
(i == (ssize_t) (colors-1) ? ");\n" : ",\n"));
(void) WriteBlobString(image,buffer);
}
@@ -337,7 +337,7 @@
Define UIL pixels.
*/
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
" %s_icon : icon(color_table = %s_ct,\n",basename,basename);
(void) WriteBlobString(image,buffer);
for (y=0; y < (ssize_t) image->rows; y++)
@@ -357,11 +357,11 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) CopyMagickString(buffer,symbol,MaxTextExtent);
+ (void) CopyMagickString(buffer,symbol,MagickPathExtent);
(void) WriteBlobString(image,buffer);
p+=GetPixelChannels(image);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? ");" : ","));
(void) WriteBlobString(image,buffer);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/url.c b/coders/url.c
index b8b241e..5449b42 100644
--- a/coders/url.c
+++ b/coders/url.c
@@ -133,7 +133,7 @@
#define MaxBufferExtent 8192
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*file;
@@ -161,16 +161,16 @@
read_info=DestroyImageInfo(read_info);
return((Image *) NULL);
}
- (void) CopyMagickString(filename,image_info->magick,MaxTextExtent);
- (void) ConcatenateMagickString(filename,":",MaxTextExtent);
+ (void) CopyMagickString(filename,image_info->magick,MagickPathExtent);
+ (void) ConcatenateMagickString(filename,":",MagickPathExtent);
LocaleLower(filename);
- (void) ConcatenateMagickString(filename,image_info->filename,MaxTextExtent);
+ (void) ConcatenateMagickString(filename,image_info->filename,MagickPathExtent);
if (LocaleCompare(read_info->magick,"file") == 0)
{
(void) RelinquishUniqueFileResource(read_info->filename);
unique_file=(-1);
(void) CopyMagickString(read_info->filename,image_info->filename+2,
- MaxTextExtent);
+ MagickPathExtent);
}
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
!(defined(__MINGW32__) || defined(__MINGW64__))
@@ -246,7 +246,7 @@
clone_info=CloneImageInfo(image_info);
sans=AcquireExceptionInfo();
(void) SetImageInfo(clone_info,0,sans);
- (void) CopyMagickString(read_info->magick,clone_info->magick,MaxTextExtent);
+ (void) CopyMagickString(read_info->magick,clone_info->magick,MagickPathExtent);
clone_info=DestroyImageInfo(clone_info);
sans=DestroyExceptionInfo(sans);
}
diff --git a/coders/uyvy.c b/coders/uyvy.c
index b31eb44..ff9ec4f 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -132,7 +132,7 @@
ThrowReaderException(OptionError,"MustSpecifyImageSize");
if ((image->columns % 2) != 0)
image->columns++;
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
return((Image *) NULL);
diff --git a/coders/vicar.c b/coders/vicar.c
index 876a42c..0d7e389 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -146,8 +146,8 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
- value[MaxTextExtent];
+ keyword[MagickPathExtent],
+ value[MagickPathExtent];
const void
*pixels;
@@ -226,7 +226,7 @@
p=keyword;
do
{
- if ((size_t) (p-keyword) < (MaxTextExtent-1))
+ if ((size_t) (p-keyword) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
count++;
@@ -245,7 +245,7 @@
p=value;
while (isalnum(c))
{
- if ((size_t) (p-value) < (MaxTextExtent-1))
+ if ((size_t) (p-value) < (MagickPathExtent-1))
*p++=c;
c=ReadBlobByte(image);
count++;
@@ -425,7 +425,7 @@
Image *image,ExceptionInfo *exception)
{
char
- header[MaxTextExtent];
+ header[MagickPathExtent];
int
y;
@@ -466,13 +466,13 @@
/*
Write header.
*/
- (void) ResetMagickMemory(header,' ',MaxTextExtent);
- (void) FormatLocaleString(header,MaxTextExtent,
+ (void) ResetMagickMemory(header,' ',MagickPathExtent);
+ (void) FormatLocaleString(header,MagickPathExtent,
"LBLSIZE=%.20g FORMAT='BYTE' TYPE='IMAGE' BUFSIZE=20000 DIM=2 EOL=0 "
"RECSIZE=%.20g ORG='BSQ' NL=%.20g NS=%.20g NB=1 N1=0 N2=0 N3=0 N4=0 NBB=0 "
- "NLB=0 TASK='ImageMagick'",(double) MaxTextExtent,(double) image->columns,
+ "NLB=0 TASK='ImageMagick'",(double) MagickPathExtent,(double) image->columns,
(double) image->rows,(double) image->columns);
- (void) WriteBlob(image,MaxTextExtent,(unsigned char *) header);
+ (void) WriteBlob(image,MagickPathExtent,(unsigned char *) header);
/*
Write VICAR pixels.
*/
diff --git a/coders/vid.c b/coders/vid.c
index 68ee524..b57d26b 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -163,7 +163,7 @@
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"name: %s",
filelist[i]);
- (void) CopyMagickString(read_info->filename,filelist[i],MaxTextExtent);
+ (void) CopyMagickString(read_info->filename,filelist[i],MagickPathExtent);
filelist[i]=DestroyString(filelist[i]);
*read_info->magick='\0';
next_image=ReadImage(read_info,exception);
@@ -331,11 +331,11 @@
if (montage_image == (Image *) NULL)
return(MagickFalse);
(void) CopyMagickString(montage_image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
write_info=CloneImageInfo(image_info);
(void) SetImageInfo(write_info,1,exception);
if (LocaleCompare(write_info->magick,"VID") == 0)
- (void) FormatLocaleString(montage_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(montage_image->filename,MagickPathExtent,
"miff:%s",write_info->filename);
status=WriteImage(write_info,montage_image,exception);
montage_image=DestroyImage(montage_image);
diff --git a/coders/vips.c b/coders/vips.c
index 4267fa1..11519ec 100644
--- a/coders/vips.c
+++ b/coders/vips.c
@@ -363,7 +363,7 @@
ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
*metadata;
Image
@@ -502,7 +502,7 @@
else
ThrowReaderException(CoderError,"Unsupported coding");
metadata=(char *) NULL;
- while ((n=ReadBlob(image,MaxTextExtent-1,(unsigned char *) buffer)) != 0)
+ while ((n=ReadBlob(image,MagickPathExtent-1,(unsigned char *) buffer)) != 0)
{
buffer[n]='\0';
if (metadata == (char *) NULL)
diff --git a/coders/webp.c b/coders/webp.c
index 372b109..d65e6e2 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -395,7 +395,7 @@
ModuleExport size_t RegisterWEBPImage(void)
{
char
- version[MaxTextExtent];
+ version[MagickPathExtent];
MagickInfo
*entry;
@@ -405,7 +405,7 @@
#if defined(MAGICKCORE_WEBP_DELEGATE)
entry->decoder=(DecodeImageHandler *) ReadWEBPImage;
entry->encoder=(EncodeImageHandler *) WriteWEBPImage;
- (void) FormatLocaleString(version,MaxTextExtent,"libwebp %d.%d.%d [%04X]",
+ (void) FormatLocaleString(version,MagickPathExtent,"libwebp %d.%d.%d [%04X]",
(WebPGetDecoderVersion() >> 16) & 0xff,
(WebPGetDecoderVersion() >> 8) & 0xff,
(WebPGetDecoderVersion() >> 0) & 0xff,WEBP_DECODER_ABI_VERSION);
diff --git a/coders/wmf.c b/coders/wmf.c
index a0ad8aa..c52d1d4 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -116,7 +116,7 @@
static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
int
unique_file;
@@ -220,17 +220,17 @@
*/
read_info=CloneImageInfo(image_info);
SetImageInfoBlob(read_info,(void *) NULL,0);
- (void) FormatLocaleString(read_info->filename,MaxTextExtent,"eps:%s",
+ (void) FormatLocaleString(read_info->filename,MagickPathExtent,"eps:%s",
filename);
image=ReadImage(read_info,exception);
read_info=DestroyImageInfo(read_info);
if (image != (Image *) NULL)
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(image->magick_filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,"WMF",MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,"WMF",MagickPathExtent);
}
(void) RelinquishUniqueFileResource(filename);
return(GetFirstImageInList(image));
@@ -532,9 +532,9 @@
unsigned long rows )
{
char
- pattern_id[MaxTextExtent];
+ pattern_id[MagickPathExtent];
- (void) FormatLocaleString(pattern_id,MaxTextExtent,"brush_%lu",id);
+ (void) FormatLocaleString(pattern_id,MagickPathExtent,"brush_%lu",id);
(void) DrawPushPattern(WmfDrawingWand,pattern_id,0,0,columns,rows);
}
@@ -744,13 +744,13 @@
image_info=CloneImageInfo(ddata->image_info);
exception=ddata->exception;
- (void) CopyMagickString(image_info->magick,"DIB",MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,"DIB",MagickPathExtent);
if (bmp_read->width || bmp_read->height)
{
char
- size[MaxTextExtent];
+ size[MagickPathExtent];
- (void) FormatLocaleString(size,MaxTextExtent,"%ux%u",bmp_read->width,
+ (void) FormatLocaleString(size,MagickPathExtent,"%ux%u",bmp_read->width,
bmp_read->height);
CloneString(&image_info->size,size);
}
@@ -827,7 +827,7 @@
static void ipa_device_begin(wmfAPI * API)
{
char
- comment[MaxTextExtent];
+ comment[MagickPathExtent];
wmf_magick_t
*ddata = WMF_MAGICK_GetData(API);
@@ -837,7 +837,7 @@
DrawSetViewbox(WmfDrawingWand, 0, 0, ddata->image->columns, ddata->image->rows );
- (void) FormatLocaleString(comment,MaxTextExtent,"Created by ImageMagick %s",
+ (void) FormatLocaleString(comment,MagickPathExtent,"Created by ImageMagick %s",
GetMagickVersion((size_t *) NULL));
DrawComment(WmfDrawingWand,comment);
@@ -880,7 +880,7 @@
image_info = CloneImageInfo((ImageInfo *) 0);
(void) CopyMagickString(image_info->filename,ddata->image_info->texture,
- MaxTextExtent);
+ MagickPathExtent);
if ( ddata->image_info->size )
CloneString(&image_info->size,ddata->image_info->size);
@@ -890,12 +890,12 @@
if (image)
{
char
- pattern_id[MaxTextExtent];
+ pattern_id[MagickPathExtent];
MagickWand
*magick_wand;
- (void) CopyMagickString(image->magick,"MIFF",MaxTextExtent);
+ (void) CopyMagickString(image->magick,"MIFF",MagickPathExtent);
DrawPushDefs(WmfDrawingWand);
draw_pattern_push(API,ddata->pattern_id,image->columns,image->rows);
magick_wand=NewMagickWandFromImage(image);
@@ -904,7 +904,7 @@
magick_wand=DestroyMagickWand(magick_wand);
(void) DrawPopPattern(WmfDrawingWand);
DrawPopDefs(WmfDrawingWand);
- (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
+ (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu",
ddata->pattern_id);
(void) DrawSetFillPatternURL(WmfDrawingWand,pattern_id);
++ddata->pattern_id;
@@ -1345,12 +1345,12 @@
if (poly_rect->count > 0)
{
char
- clip_mask_id[MaxTextExtent];
+ clip_mask_id[MagickPathExtent];
/* Define clip path */
ddata->clip_mask_id++;
DrawPushDefs(WmfDrawingWand);
- (void) FormatLocaleString(clip_mask_id,MaxTextExtent,"clip_%lu",
+ (void) FormatLocaleString(clip_mask_id,MagickPathExtent,"clip_%lu",
ddata->clip_mask_id);
DrawPushClipPath(WmfDrawingWand,clip_mask_id);
(void) PushDrawingWand(WmfDrawingWand);
@@ -1829,9 +1829,9 @@
DrawPopDefs(WmfDrawingWand);
{
char
- pattern_id[MaxTextExtent];
+ pattern_id[MagickPathExtent];
- (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
+ (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu",
ddata->pattern_id);
if (brush_apply == BrushApplyStroke )
(void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id);
@@ -1942,9 +1942,9 @@
{
char
- pattern_id[MaxTextExtent];
+ pattern_id[MagickPathExtent];
- (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu",
+ (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu",
ddata->pattern_id);
if ( brush_apply == BrushApplyStroke )
(void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id);
@@ -2436,7 +2436,7 @@
if (!magick_font->ps_name)
{
char
- target[MaxTextExtent];
+ target[MagickPathExtent];
int
target_weight = 400,
@@ -2456,13 +2456,13 @@
strstr(wmf_font_name,"Oblique"))) )
want_italic = MagickTrue;
- (void) CopyMagickString(target,"Times",MaxTextExtent);
+ (void) CopyMagickString(target,"Times",MagickPathExtent);
for( i=0; SubFontMap[i].name != NULL; i++ )
{
if (LocaleCompare(wmf_font_name, SubFontMap[i].name) == 0)
{
(void) CopyMagickString(target,SubFontMap[i].mapping,
- MaxTextExtent);
+ MagickPathExtent);
break;
}
}
diff --git a/coders/wpg.c b/coders/wpg.c
index ef961f0..0c73244 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -737,7 +737,7 @@
MagickOffsetType PS_Offset,ssize_t PS_Size,ExceptionInfo *exception)
{
char
- postscript_file[MaxTextExtent];
+ postscript_file[MagickPathExtent];
const MagicInfo
*magic_info;
@@ -752,7 +752,7 @@
*image2;
unsigned char
- magick[2*MaxTextExtent];
+ magick[2*MagickPathExtent];
if ((clone_info=CloneImageInfo(image_info)) == NULL)
@@ -768,7 +768,7 @@
/* Copy postscript to temporary file */
(void) SeekBlob(image,PS_Offset,SEEK_SET);
- (void) ReadBlob(image, 2*MaxTextExtent, magick);
+ (void) ReadBlob(image, 2*MagickPathExtent, magick);
(void) SeekBlob(image,PS_Offset,SEEK_SET);
while(PS_Size-- > 0)
@@ -778,17 +778,17 @@
(void) fclose(ps_file);
/* Detect file format - Check magic.mgk configuration file. */
- magic_info=GetMagicInfo(magick,2*MaxTextExtent,exception);
+ magic_info=GetMagicInfo(magick,2*MagickPathExtent,exception);
if(magic_info == (const MagicInfo *) NULL) goto FINISH_UNL;
/* printf("Detected:%s \n",magic_info->name); */
if(exception->severity != UndefinedException) goto FINISH_UNL;
if(magic_info->name == (char *) NULL) goto FINISH_UNL;
- (void) CopyMagickMemory(clone_info->magick,magic_info->name,MaxTextExtent);
+ (void) CopyMagickMemory(clone_info->magick,magic_info->name,MagickPathExtent);
/* Read nested image */
/*FormatString(clone_info->filename,"%s:%s",magic_info->name,postscript_file);*/
- FormatLocaleString(clone_info->filename,MaxTextExtent,"%s",postscript_file);
+ FormatLocaleString(clone_info->filename,MagickPathExtent,"%s",postscript_file);
image2=ReadImage(clone_info,exception);
if (!image2)
@@ -798,9 +798,9 @@
Replace current image with new image while copying base image
attributes.
*/
- (void) CopyMagickMemory(image2->filename,image->filename,MaxTextExtent);
- (void) CopyMagickMemory(image2->magick_filename,image->magick_filename,MaxTextExtent);
- (void) CopyMagickMemory(image2->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickMemory(image2->filename,image->filename,MagickPathExtent);
+ (void) CopyMagickMemory(image2->magick_filename,image->magick_filename,MagickPathExtent);
+ (void) CopyMagickMemory(image2->magick,image->magick,MagickPathExtent);
image2->depth=image->depth;
DestroyBlob(image2);
image2->blob=ReferenceBlob(image->blob);
diff --git a/coders/xbm.c b/coders/xbm.c
index c3c0800..8350c72 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -171,8 +171,8 @@
static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
char
- buffer[MaxTextExtent],
- name[MaxTextExtent];
+ buffer[MagickPathExtent],
+ name[MagickPathExtent];
Image
*image;
@@ -483,8 +483,8 @@
ExceptionInfo *exception)
{
char
- basename[MaxTextExtent],
- buffer[MaxTextExtent];
+ basename[MagickPathExtent],
+ buffer[MagickPathExtent];
MagickBooleanType
status;
@@ -522,16 +522,16 @@
Write X bitmap header.
*/
GetPathComponent(image->filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_width %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_width %.20g\n",
basename,(double) image->columns);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_height %.20g\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_height %.20g\n",
basename,(double) image->rows);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"static char %s_bits[] = {\n",basename);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
- (void) CopyMagickString(buffer," ",MaxTextExtent);
+ (void) CopyMagickString(buffer," ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
/*
Convert MIFF to X bitmap pixels.
@@ -542,7 +542,7 @@
count=0;
x=0;
y=0;
- (void) CopyMagickString(buffer," ",MaxTextExtent);
+ (void) CopyMagickString(buffer," ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -560,13 +560,13 @@
/*
Write a bitmap byte to the image file.
*/
- (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
if (count == 12)
{
- (void) CopyMagickString(buffer,"\n ",MaxTextExtent);
+ (void) CopyMagickString(buffer,"\n ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count=0;
};
@@ -581,13 +581,13 @@
Write a bitmap byte to the image file.
*/
byte>>=(8-bit);
- (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",
(unsigned int) (byte & 0xff));
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count++;
if (count == 12)
{
- (void) CopyMagickString(buffer,"\n ",MaxTextExtent);
+ (void) CopyMagickString(buffer,"\n ",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
count=0;
};
@@ -599,7 +599,7 @@
if (status == MagickFalse)
break;
}
- (void) CopyMagickString(buffer,"};\n",MaxTextExtent);
+ (void) CopyMagickString(buffer,"};\n",MagickPathExtent);
(void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
(void) CloseBlob(image);
return(MagickTrue);
diff --git a/coders/xc.c b/coders/xc.c
index ff84567..506a88d 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -127,7 +127,7 @@
status=SetImageExtent(image,image->columns,image->rows,exception);
if (status == MagickFalse)
return(DestroyImageList(image));
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
if (*image_info->filename == '\0')
pixel=image->background_color;
else
diff --git a/coders/xpm.c b/coders/xpm.c
index 8c3bb1c..66cedba 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -237,8 +237,8 @@
{
char
*grey,
- key[MaxTextExtent],
- target[MaxTextExtent],
+ key[MagickPathExtent],
+ target[MagickPathExtent],
*xpm_buffer;
Image
@@ -296,7 +296,7 @@
/*
Read XPM file.
*/
- length=MaxTextExtent;
+ length=MagickPathExtent;
xpm_buffer=(char *) AcquireQuantumMemory((size_t) length,sizeof(*xpm_buffer));
if (xpm_buffer == (char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
@@ -309,10 +309,10 @@
if ((*p == '}') && (*(p+1) == ';'))
break;
p+=strlen(p);
- if ((size_t) (p-xpm_buffer+MaxTextExtent) < length)
+ if ((size_t) (p-xpm_buffer+MagickPathExtent) < length)
continue;
length<<=1;
- xpm_buffer=(char *) ResizeQuantumMemory(xpm_buffer,length+MaxTextExtent,
+ xpm_buffer=(char *) ResizeQuantumMemory(xpm_buffer,length+MagickPathExtent,
sizeof(*xpm_buffer));
if (xpm_buffer == (char *) NULL)
break;
@@ -375,12 +375,12 @@
{
p=next;
next=NextXPMLine(p);
- (void) CopyXPMColor(key,p,MagickMin((size_t) width,MaxTextExtent-1));
+ (void) CopyXPMColor(key,p,MagickMin((size_t) width,MagickPathExtent-1));
status=AddValueToSplayTree(xpm_colors,ConstantString(key),(void *) j);
/*
Parse color.
*/
- (void) CopyMagickString(target,"gray",MaxTextExtent);
+ (void) CopyMagickString(target,"gray",MagickPathExtent);
q=ParseXPMColor(p+width,MagickTrue);
if (q != (char *) NULL)
{
@@ -390,9 +390,9 @@
break;
if (next != (char *) NULL)
(void) CopyXPMColor(target,q,MagickMin((size_t) (next-q),
- MaxTextExtent-1));
+ MagickPathExtent-1));
else
- (void) CopyMagickString(target,q,MaxTextExtent);
+ (void) CopyMagickString(target,q,MagickPathExtent);
q=ParseXPMColor(target,MagickFalse);
if (q != (char *) NULL)
*q='\0';
@@ -438,7 +438,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ssize_t count=CopyXPMColor(key,p,MagickMin(width,MaxTextExtent-1));
+ ssize_t count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1));
if (count != (ssize_t) width)
break;
j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
@@ -613,10 +613,10 @@
"lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
char
- buffer[MaxTextExtent],
- basename[MaxTextExtent],
- name[MaxTextExtent],
- symbol[MaxTextExtent];
+ buffer[MagickPathExtent],
+ basename[MagickPathExtent],
+ name[MagickPathExtent],
+ symbol[MagickPathExtent];
Image
*affinity_image,
@@ -762,11 +762,11 @@
*/
(void) WriteBlobString(image,"/* XPM */\n");
GetPathComponent(picon->filename,BasePath,basename);
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"static char *%s[] = {\n",basename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"\"%.20g %.20g %.20g %.20g\",\n",(double) picon->columns,(double)
picon->rows,(double) colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
@@ -784,7 +784,7 @@
if (transparent != MagickFalse)
{
if (i == (ssize_t) (colors-1))
- (void) CopyMagickString(name,"grey75",MaxTextExtent);
+ (void) CopyMagickString(name,"grey75",MagickPathExtent);
}
/*
Write XPM color.
@@ -797,7 +797,7 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s c %s\",\n",
symbol,name);
(void) WriteBlobString(image,buffer);
}
@@ -821,11 +821,11 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) CopyMagickString(buffer,symbol,MaxTextExtent);
+ (void) CopyMagickString(buffer,symbol,MagickPathExtent);
(void) WriteBlobString(image,buffer);
p+=GetPixelChannels(image);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n",
y == (ssize_t) (picon->rows-1) ? "" : ",");
(void) WriteBlobString(image,buffer);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -876,10 +876,10 @@
"lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
char
- buffer[MaxTextExtent],
- basename[MaxTextExtent],
- name[MaxTextExtent],
- symbol[MaxTextExtent];
+ buffer[MagickPathExtent],
+ basename[MagickPathExtent],
+ name[MagickPathExtent],
+ symbol[MagickPathExtent];
MagickBooleanType
status;
@@ -990,19 +990,19 @@
GetPathComponent(image->filename,BasePath,basename);
if (isalnum((int) ((unsigned char) *basename)) == 0)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"xpm_%s",basename);
- (void) CopyMagickString(basename,buffer,MaxTextExtent);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"xpm_%s",basename);
+ (void) CopyMagickString(basename,buffer,MagickPathExtent);
}
if (isalpha((int) ((unsigned char) basename[0])) == 0)
basename[0]='_';
for (i=1; basename[i] != '\0'; i++)
if (isalnum((int) ((unsigned char) basename[i])) == 0)
basename[i]='_';
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"static char *%s[] = {\n",basename);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
- (void) FormatLocaleString(buffer,MaxTextExtent,
+ (void) FormatLocaleString(buffer,MagickPathExtent,
"\"%.20g %.20g %.20g %.20g \",\n",(double) image->columns,(double)
image->rows,(double) image->colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
@@ -1018,7 +1018,7 @@
pixel.alpha=(double) OpaqueAlpha;
(void) QueryColorname(image,&pixel,XPMCompliance,name,exception);
if (i == opacity)
- (void) CopyMagickString(name,"None",MaxTextExtent);
+ (void) CopyMagickString(name,"None",MagickPathExtent);
/*
Write XPM color.
*/
@@ -1030,7 +1030,7 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n",symbol,
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s c %s\",\n",symbol,
name);
(void) WriteBlobString(image,buffer);
}
@@ -1054,11 +1054,11 @@
symbol[j]=Cixel[k];
}
symbol[j]='\0';
- (void) CopyMagickString(buffer,symbol,MaxTextExtent);
+ (void) CopyMagickString(buffer,symbol,MagickPathExtent);
(void) WriteBlobString(image,buffer);
p+=GetPixelChannels(image);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? "" : ","));
(void) WriteBlobString(image,buffer);
if (image->previous == (Image *) NULL)
diff --git a/coders/xps.c b/coders/xps.c
index 41ce541..a7f8515 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -105,12 +105,12 @@
#define RenderXPSText " Rendering XPS... "
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*density,
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
*options,
- input_filename[MaxTextExtent];
+ input_filename[MagickPathExtent];
const char
*option;
@@ -215,7 +215,7 @@
*/
*p++=(char) c;
if ((c != (int) '/') && (c != '\n') &&
- ((size_t) (p-command) < (MaxTextExtent-1)))
+ ((size_t) (p-command) < (MagickPathExtent-1)))
continue;
*p='\0';
p=command;
@@ -266,7 +266,7 @@
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
if (image_info->page != (char *) NULL)
(void) ParseAbsoluteGeometry(image_info->page,&page);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double)
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",(double)
page.width,(double) page.height);
if (image_info->monochrome != MagickFalse)
delegate_info=GetDelegateInfo("xps:mono",(char *) NULL,exception);
@@ -279,7 +279,7 @@
return((Image *) NULL);
density=AcquireString("");
options=AcquireString("");
- (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",
+ (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",
image->resolution.x,image->resolution.y);
if ((page.width == 0) || (page.height == 0))
(void) ParseAbsoluteGeometry(PSPageGeometry,&page);
@@ -287,7 +287,7 @@
(void) ParseAbsoluteGeometry(image_info->page,&page);
page.width=(size_t) floor(page.width*image->resolution.y/delta.x+0.5);
page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5);
- (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double)
+ (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double)
page.width,(double) page.height);
image=DestroyImage(image);
read_info=CloneImageInfo(image_info);
@@ -295,10 +295,10 @@
if (read_info->number_scenes != 0)
{
if (read_info->number_scenes != 1)
- (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g",
+ (void) FormatLocaleString(options,MagickPathExtent,"-dLastPage=%.20g",
(double) (read_info->scene+read_info->number_scenes));
else
- (void) FormatLocaleString(options,MaxTextExtent,
+ (void) FormatLocaleString(options,MagickPathExtent,
"-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1,
(double) (read_info->scene+read_info->number_scenes));
read_info->number_scenes=0;
@@ -307,11 +307,11 @@
}
option=GetImageOption(image_info,"authenticate");
if (option != (const char *) NULL)
- (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
+ (void) FormatLocaleString(options+strlen(options),MagickPathExtent,
" -sPCLPassword=%s",option);
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
(void) AcquireUniqueFilename(read_info->filename);
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MagickPathExtent,
GetDelegateCommands(delegate_info),
read_info->antialias != MagickFalse ? 4 : 1,
read_info->antialias != MagickFalse ? 4 : 1,density,options,
@@ -340,7 +340,7 @@
}
do
{
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
image->page=page;
next_image=SyncNextImageInList(image);
if (next_image != (Image *) NULL)
diff --git a/coders/xtrn.c b/coders/xtrn.c
index 5479825..9774709 100644
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -166,7 +166,7 @@
*blob_length;
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
(void) sscanf(clone_info->filename,"%lx,%lx,%s",¶m1,¶m2,&filename);
blob_data=(char **) param1;
@@ -178,7 +178,7 @@
{
char
*blob_data,
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
HRESULT
hr;
@@ -213,7 +213,7 @@
*clone_info->magick='\0';
if (*filename != '\0')
(void) CopyMagickString(clone_info->filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
image=BlobToImage(clone_info,blob_data,blob_length,
exception);
hr=SafeArrayUnaccessData(pSafeArray);
@@ -459,7 +459,7 @@
*blob_length;
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
clone_info=CloneImageInfo(image_info);
if (clone_info->filename[0])
@@ -470,15 +470,15 @@
blob_data=(char **) param1;
blob_length=(size_t *) param2;
scene = 0;
- (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(clone_info->filename,filename,MagickPathExtent);
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
{
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(p->filename,filename,MagickPathExtent);
p->scene=scene++;
}
SetImageInfo(clone_info,1,exception);
(void) CopyMagickString(image->magick,clone_info->magick,
- MaxTextExtent);
+ MagickPathExtent);
if (*blob_length == 0)
*blob_length=8192;
*blob_data=(char *) ImageToBlob(clone_info,image,blob_length,
@@ -493,7 +493,7 @@
else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
size_t
blob_length;
@@ -507,15 +507,15 @@
(void) sscanf(clone_info->filename,"%lx,%s",¶m1,&filename);
image->client_data=param1;
scene=0;
- (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(clone_info->filename,filename,MagickPathExtent);
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
{
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(p->filename,filename,MagickPathExtent);
p->scene=scene++;
}
SetImageInfo(clone_info,1,exception);
(void) CopyMagickString(image->magick,clone_info->magick,
- MaxTextExtent);
+ MagickPathExtent);
blob_data=ImageToBlob(clone_info,image,&blob_length,
exception);
if (blob_data == (unsigned char *) NULL)
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index cf2f2eb..e2f0d20 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -1203,7 +1203,7 @@
}
if (image_info->interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,5,5);
@@ -1313,7 +1313,7 @@
}
(void) CloseBlob(image);
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,5,5);
diff --git a/coders/yuv.c b/coders/yuv.c
index f92d6d6..f24b2a3 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -424,7 +424,7 @@
SetImageColorspace(image,YCbCrColorspace,exception);
if (interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (EOFBlob(image) != MagickFalse)
{
ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
@@ -825,7 +825,7 @@
chroma_image=DestroyImage(chroma_image);
if (interlace == PartitionInterlace)
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (GetNextImageInList(image) == (Image *) NULL)
break;
image=SyncNextImageInList(image);
