diff --git a/MagickCore/PreRvIcccm.c b/MagickCore/PreRvIcccm.c
index 17937f1..6b9c870 100644
--- a/MagickCore/PreRvIcccm.c
+++ b/MagickCore/PreRvIcccm.c
@@ -311,7 +311,7 @@
*buffer++='\0';
else
{
- (void) CopyMagickString(buffer,argument,MaxTextExtent);
+ (void) CopyMagickString(buffer,argument,MagickPathExtent);
buffer+=(strlen(argument)+1);
}
}
diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 96adf73..bc47dca 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -836,7 +836,7 @@
*image_view;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
cl_command_queue
queue;
@@ -978,7 +978,7 @@
/* create processing kernel */
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel=AcquireKernelInfo(geometry,exception);
if (kernel == (KernelInfo *) NULL)
{
@@ -1184,7 +1184,7 @@
*image_view;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
cl_command_queue
queue;
@@ -1326,7 +1326,7 @@
/* create processing kernel */
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel=AcquireKernelInfo(geometry,exception);
if (kernel == (KernelInfo *) NULL)
{
@@ -1982,7 +1982,7 @@
*image_view;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
cl_command_queue
queue;
@@ -2131,7 +2131,7 @@
/* create the blur kernel */
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel=AcquireKernelInfo(geometry,exception);
if (kernel == (KernelInfo *) NULL)
{
@@ -2343,7 +2343,7 @@
*image_view;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
cl_command_queue
queue;
@@ -2492,7 +2492,7 @@
/* create the blur kernel */
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel=AcquireKernelInfo(geometry,exception);
if (kernel == (KernelInfo *) NULL)
{
@@ -2725,7 +2725,7 @@
*image_view;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
cl_command_queue
queue;
@@ -2868,7 +2868,7 @@
/* create the blur kernel */
{
- (void) FormatLocaleString(geometry,MaxTextExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ (void) FormatLocaleString(geometry,MagickPathExtent,"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel=AcquireKernelInfo(geometry,exception);
if (kernel == (KernelInfo *) NULL)
{
diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index e9ce6c2..b5124e6 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -408,7 +408,7 @@
i;
static char
- filenames[MaxTextExtent] = "*";
+ filenames[MagickPathExtent] = "*";
if (resource_info->immutable != MagickFalse)
break;
@@ -448,7 +448,7 @@
XCheckRefreshWindows(display,windows);
for (i=0; i < number_files; 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=ReadImage(read_info,exception);
@@ -477,7 +477,7 @@
case PlayCommand:
{
char
- basename[MaxTextExtent];
+ basename[MagickPathExtent];
int
status;
@@ -488,7 +488,7 @@
*state|=PlayAnimationState;
*state&=(~AutoReverseAnimationState);
GetPathComponent((*image)->magick_filename,BasePath,basename);
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s",MagickPackageName,basename);
if (resource_info->title != (char *) NULL)
{
@@ -497,7 +497,7 @@
title=InterpretImageProperties(resource_info->image_info,*image,
resource_info->title,exception);
- (void) CopyMagickString(windows->image.name,title,MaxTextExtent);
+ (void) CopyMagickString(windows->image.name,title,MagickPathExtent);
title=DestroyString(title);
}
status=XStringListToTextProperty(&windows->image.name,1,&window_name);
@@ -544,9 +544,9 @@
if (status == MagickFalse)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(message,MagickPathExtent,"%s:%s",
exception->reason != (char *) NULL ? exception->reason : "",
exception->description != (char *) NULL ? exception->description :
"");
@@ -612,14 +612,14 @@
if (mozilla_window != (Window) NULL)
{
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*url;
/*
Display documentation using Netscape remote control.
*/
url=GetMagickHomeURL();
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MagickPathExtent,
"openurl(%s,new-tab)",url);
url=DestroyString(url);
mozilla_atom=XInternAtom(display,"_MOZILLA_COMMAND",MagickFalse);
@@ -731,8 +731,8 @@
XResourceInfo *resource_info,Image *images,ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent],
- visual_type[MaxTextExtent];
+ geometry[MagickPathExtent],
+ visual_type[MagickPathExtent];
Image
*coalesce_image,
@@ -820,11 +820,11 @@
*/
window_attributes.width=XDisplayWidth(display,XDefaultScreen(display));
window_attributes.height=XDisplayHeight(display,XDefaultScreen(display));
- (void) CopyMagickString(visual_type,"default",MaxTextExtent);
+ (void) CopyMagickString(visual_type,"default",MagickPathExtent);
status=XGetWindowAttributes(display,window_info.id,&window_attributes) != 0 ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
- (void) FormatLocaleString(visual_type,MaxTextExtent,"0x%lx",
+ (void) FormatLocaleString(visual_type,MagickPathExtent,"0x%lx",
XVisualIDFromVisual(window_attributes.visual));
if (visual_info == (XVisualInfo *) NULL)
{
@@ -951,7 +951,7 @@
(image_list[0]->rows != window_info.height))
ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage",
image_list[0]->filename);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%ux%u+0+0>",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%ux%u+0+0>",
window_attributes.width,window_attributes.height);
geometry_info.width=window_info.width;
geometry_info.height=window_info.height;
@@ -1002,7 +1002,7 @@
if (resources.image_geometry != (char *) NULL)
{
char
- default_geometry[MaxTextExtent];
+ default_geometry[MagickPathExtent];
int
flags,
@@ -1019,7 +1019,7 @@
ThrowXWindowFatalException(ResourceLimitFatalError,
"MemoryAllocationFailed",images->filename);
size_hints->flags=0L;
- (void) FormatLocaleString(default_geometry,MaxTextExtent,"%ux%u",width,
+ (void) FormatLocaleString(default_geometry,MagickPathExtent,"%ux%u",width,
height);
flags=XWMGeometry(display,visual_info->screen,resources.image_geometry,
default_geometry,window_info.border_width,size_hints,&window_info.x,
@@ -1302,10 +1302,10 @@
};
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*directory,
- geometry[MaxTextExtent],
- resource_name[MaxTextExtent];
+ geometry[MagickPathExtent],
+ resource_name[MagickPathExtent];
CommandType
command_type;
@@ -1342,7 +1342,7 @@
scene;
static char
- working_directory[MaxTextExtent];
+ working_directory[MagickPathExtent];
static size_t
number_windows;
@@ -1414,7 +1414,7 @@
status;
if (*working_directory == '\0')
- (void) CopyMagickString(working_directory,".",MaxTextExtent);
+ (void) CopyMagickString(working_directory,".",MagickPathExtent);
status=chdir(working_directory);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
@@ -1655,29 +1655,29 @@
title=InterpretImageProperties(resource_info->image_info,display_image,
resource_info->title,exception);
- (void) CopyMagickString(windows->image.name,title,MaxTextExtent);
- (void) CopyMagickString(windows->image.icon_name,title,MaxTextExtent);
+ (void) CopyMagickString(windows->image.name,title,MagickPathExtent);
+ (void) CopyMagickString(windows->image.icon_name,title,MagickPathExtent);
title=DestroyString(title);
}
else
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
/*
Window name is the base of the filename.
*/
GetPathComponent(display_image->magick_filename,TailPath,filename);
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s[scene: %.20g frames: %.20g]",MagickPackageName,filename,(double)
display_image->scene,(double) number_scenes);
- (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent);
+ (void) CopyMagickString(windows->image.icon_name,filename,MagickPathExtent);
}
if (resource_info->immutable != MagickFalse)
windows->image.immutable=MagickTrue;
windows->image.shape=MagickTrue;
windows->image.geometry=resource_info->image_geometry;
- (void) FormatLocaleString(geometry,MaxTextExtent,"%ux%u+0+0>!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%ux%u+0+0>!",
XDisplayWidth(display,visual_info->screen),
XDisplayHeight(display,visual_info->screen));
geometry_info.width=display_image->columns;
@@ -1804,7 +1804,7 @@
resource_info,&windows->command);
windows->command.data=MagickMenus;
(void) XCommandWidget(display,windows,CommandMenu,(XEvent *) NULL);
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.command",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.command",
resource_info->client_name);
windows->command.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
@@ -1834,7 +1834,7 @@
*/
XGetWindowInfo(display,visual_info,map_info,pixel,font_info,
resource_info,&windows->widget);
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.widget",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.widget",
resource_info->client_name);
windows->widget.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
@@ -1965,7 +1965,7 @@
title=InterpretImageProperties(resource_info->image_info,
image_list[scene],resource_info->title,exception);
- (void) CopyMagickString(windows->image.name,title,MaxTextExtent);
+ (void) CopyMagickString(windows->image.name,title,MagickPathExtent);
title=DestroyString(title);
}
else
@@ -1974,7 +1974,7 @@
strlen(image_list[scene]->magick_filename)-1;
while ((p > image_list[scene]->magick_filename) && (*(p-1) != '/'))
p--;
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s[%.20g of %.20g]",MagickPackageName,p,(double) scene+1,
(double) number_scenes);
}
@@ -2093,7 +2093,7 @@
strlen(image_list[scene]->filename)-1;
while ((p > image_list[scene]->filename) && (*(p-1) != '/'))
p--;
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s[%.20g of %.20g]",MagickPackageName,p,(double)
scene+1,(double) number_scenes);
if (resource_info->title != (char *) NULL)
@@ -2104,7 +2104,7 @@
title=InterpretImageProperties(resource_info->image_info,
image,resource_info->title,exception);
(void) CopyMagickString(windows->image.name,title,
- MaxTextExtent);
+ MagickPathExtent);
title=DestroyString(title);
}
status=XStringListToTextProperty(&windows->image.name,1,
@@ -2180,7 +2180,7 @@
id=XCommandWidget(display,windows,CommandMenu,&event);
if (id < 0)
continue;
- (void) CopyMagickString(command,CommandMenu[id],MaxTextExtent);
+ (void) CopyMagickString(command,CommandMenu[id],MagickPathExtent);
command_type=CommandMenus[id];
if (id < MagickMenus)
{
@@ -2194,7 +2194,7 @@
command);
if (entry < 0)
continue;
- (void) CopyMagickString(command,Menus[id][entry],MaxTextExtent);
+ (void) CopyMagickString(command,Menus[id][entry],MagickPathExtent);
command_type=Commands[id][entry];
}
if (command_type != NullCommand)
@@ -2340,7 +2340,7 @@
Offix DND.
*/
(void) CopyMagickString(resource_info->image_info->filename,
- (char *) data,MaxTextExtent);
+ (char *) data,MagickPathExtent);
}
else
{
@@ -2353,7 +2353,7 @@
break;
}
(void) CopyMagickString(resource_info->image_info->filename,
- ((char *) data)+5,MaxTextExtent);
+ ((char *) data)+5,MagickPathExtent);
}
nexus=ReadImage(resource_info->image_info,exception);
CatchException(exception);
@@ -2693,12 +2693,12 @@
Display image named by the remote command protocol.
*/
status=XGetWindowProperty(display,event.xproperty.window,
- event.xproperty.atom,0L,(long) MaxTextExtent,MagickFalse,(Atom)
+ event.xproperty.atom,0L,(long) MagickPathExtent,MagickFalse,(Atom)
AnyPropertyType,&type,&format,&length,&after,&data);
if ((status != Success) || (length == 0))
break;
(void) CopyMagickString(resource_info->image_info->filename,
- (char *) data,MaxTextExtent);
+ (char *) data,MagickPathExtent);
nexus=ReadImage(resource_info->image_info,exception);
CatchException(exception);
if (nexus != (Image *) NULL)
@@ -2841,10 +2841,10 @@
/*
Change to home directory.
*/
- directory=getcwd(working_directory,MaxTextExtent);
+ directory=getcwd(working_directory,MagickPathExtent);
(void) directory;
if (*resource_info->home_directory == '\0')
- (void) CopyMagickString(resource_info->home_directory,".",MaxTextExtent);
+ (void) CopyMagickString(resource_info->home_directory,".",MagickPathExtent);
status=chdir(resource_info->home_directory);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
@@ -2892,7 +2892,7 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
ImageInfo
*image_info;
@@ -2905,11 +2905,11 @@
*/
if (resource_info->write_filename != (char *) NULL)
(void) CopyMagickString(filename,resource_info->write_filename,
- MaxTextExtent);
+ MagickPathExtent);
else
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
int
status;
@@ -2917,7 +2917,7 @@
GetPathComponent(image->filename,HeadPath,path);
GetPathComponent(image->filename,TailPath,filename);
if (*path == '\0')
- (void) CopyMagickString(path,".",MaxTextExtent);
+ (void) CopyMagickString(path,".",MagickPathExtent);
status=chdir(path);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
@@ -2939,13 +2939,13 @@
return(MagickTrue);
}
image_info=CloneImageInfo(resource_info->image_info);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
(void) SetImageInfo(image_info,1,exception);
if ((LocaleCompare(image_info->magick,"JPEG") == 0) ||
(LocaleCompare(image_info->magick,"JPG") == 0))
{
char
- quality[MaxTextExtent];
+ quality[MagickPathExtent];
int
status;
@@ -2953,7 +2953,7 @@
/*
Request JPEG quality from user.
*/
- (void) FormatLocaleString(quality,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(quality,MagickPathExtent,"%.20g",(double)
image_info->quality);
status=XDialogWidget(display,windows,"Save","Enter JPEG quality:",
quality);
@@ -2969,16 +2969,16 @@
(LocaleCompare(image_info->magick,"PS2") == 0))
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
/*
Request page geometry from user.
*/
- (void) CopyMagickString(geometry,PSPageGeometry,MaxTextExtent);
+ (void) CopyMagickString(geometry,PSPageGeometry,MagickPathExtent);
if (LocaleCompare(image_info->magick,"PDF") == 0)
- (void) CopyMagickString(geometry,PSPageGeometry,MaxTextExtent);
+ (void) CopyMagickString(geometry,PSPageGeometry,MagickPathExtent);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(geometry,image_info->page,MagickPathExtent);
XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select",
"Select page geometry:",geometry);
if (*geometry != '\0')
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 3670f9d..c06c7c3 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -256,7 +256,7 @@
const DrawInfo *draw_info,ExceptionInfo *exception)
{
char
- primitive[MaxTextExtent],
+ primitive[MagickPathExtent],
**textlist;
DrawInfo
@@ -489,7 +489,7 @@
undercolor_info->affine=draw_info->affine;
undercolor_info->affine.tx=offset.x-draw_info->affine.ry*metrics.ascent;
undercolor_info->affine.ty=offset.y-draw_info->affine.sy*metrics.ascent;
- (void) FormatLocaleString(primitive,MaxTextExtent,
+ (void) FormatLocaleString(primitive,MagickPathExtent,
"rectangle -0.5,-0.5 %g,%.20g",metrics.origin.x,(double) height);
(void) CloneString(&undercolor_info->primitive,primitive);
(void) DrawImage(image,undercolor_info,exception);
@@ -497,7 +497,7 @@
}
annotate_info->affine.tx=offset.x;
annotate_info->affine.ty=offset.y;
- (void) FormatLocaleString(primitive,MaxTextExtent,"stroke-width %g "
+ (void) FormatLocaleString(primitive,MagickPathExtent,"stroke-width %g "
"line 0,0 %g,0",metrics.underline_thickness,metrics.width);
if (annotate->decorate == OverlineDecoration)
{
@@ -1006,10 +1006,10 @@
affine;
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
affine=draw_info->affine;
- (void) FormatLocaleString(path,MaxTextExtent,
+ (void) FormatLocaleString(path,MagickPathExtent,
"C%g,%g %g,%g %g,%g",affine.tx+p->x/64.0,affine.ty-
p->y/64.0,affine.tx+q->x/64.0,affine.ty-q->y/64.0,affine.tx+to->x/64.0,
affine.ty-to->y/64.0);
@@ -1023,10 +1023,10 @@
affine;
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
affine=draw_info->affine;
- (void) FormatLocaleString(path,MaxTextExtent,"L%g,%g",affine.tx+
+ (void) FormatLocaleString(path,MagickPathExtent,"L%g,%g",affine.tx+
to->x/64.0,affine.ty-to->y/64.0);
(void) ConcatenateString(&draw_info->primitive,path);
return(0);
@@ -1038,10 +1038,10 @@
affine;
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
affine=draw_info->affine;
- (void) FormatLocaleString(path,MaxTextExtent,"M%g,%g",affine.tx+
+ (void) FormatLocaleString(path,MagickPathExtent,"M%g,%g",affine.tx+
to->x/64.0,affine.ty-to->y/64.0);
(void) ConcatenateString(&draw_info->primitive,path);
return(0);
@@ -1054,10 +1054,10 @@
affine;
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
affine=draw_info->affine;
- (void) FormatLocaleString(path,MaxTextExtent,"Q%g,%g %g,%g",
+ (void) FormatLocaleString(path,MagickPathExtent,"Q%g,%g %g,%g",
affine.tx+control->x/64.0,affine.ty-control->y/64.0,affine.tx+to->x/64.0,
affine.ty-to->y/64.0);
(void) ConcatenateString(&draw_info->primitive,path);
@@ -1637,7 +1637,7 @@
escapes=0;
buffer=AcquireString(text);
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] == ')'))
{
@@ -1655,8 +1655,8 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
*text;
FILE
@@ -1756,10 +1756,10 @@
text=DestroyString(text);
(void) FormatLocaleFile(file,"showpage\n");
(void) fclose(file);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g+0+0!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g+0+0!",
floor(extent.x+0.5),floor(extent.y+0.5));
annotate_info=AcquireImageInfo();
- (void) FormatLocaleString(annotate_info->filename,MaxTextExtent,"ps:%s",
+ (void) FormatLocaleString(annotate_info->filename,MagickPathExtent,"ps:%s",
filename);
(void) CloneString(&annotate_info->page,geometry);
if (draw_info->density != (char *) NULL)
@@ -1800,7 +1800,7 @@
ExpandAffine(&draw_info->affine)*draw_info->pointsize+0.5);
crop_info.y=(ssize_t) ceil((resolution.y/DefaultResolution)*extent.y/8.0-
0.5);
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
crop_info.height,(double) crop_info.x,(double) crop_info.y);
(void) TransformImage(&annotate_image,geometry,(char *) NULL,exception);
diff --git a/MagickCore/artifact.c b/MagickCore/artifact.c
index 81902c8..df92fbf 100644
--- a/MagickCore/artifact.c
+++ b/MagickCore/artifact.c
@@ -152,21 +152,21 @@
const char *artifact)
{
char
- key[MaxTextExtent],
- value[MaxTextExtent];
+ key[MagickPathExtent],
+ value[MagickPathExtent];
register char
*p;
assert(image != (Image *) NULL);
assert(artifact != (const char *) NULL);
- (void) CopyMagickString(key,artifact,MaxTextExtent-1);
+ (void) CopyMagickString(key,artifact,MagickPathExtent-1);
for (p=key; *p != '\0'; p++)
if (*p == '=')
break;
*value='\0';
if (*p == '=')
- (void) CopyMagickString(value,p+1,MaxTextExtent);
+ (void) CopyMagickString(value,p+1,MagickPathExtent);
*p='\0';
return(SetImageArtifact(image,key,value));
}
diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 9ff189a..3abb8ba 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -359,9 +359,9 @@
Native blob support for this image format.
*/
(void) CopyMagickString(blob_info->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(blob_info->magick,image_info->magick,
- MaxTextExtent);
+ MagickPathExtent);
image=ReadImage(blob_info,exception);
if (image != (Image *) NULL)
(void) DetachBlob(image->blob);
@@ -382,7 +382,7 @@
return((Image *) NULL);
}
clone_info=CloneImageInfo(blob_info);
- (void) FormatLocaleString(clone_info->filename,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(clone_info->filename,MagickPathExtent,"%s:%s",
blob_info->magick,blob_info->filename);
image=ReadImage(clone_info,exception);
if (image != (Image *) NULL)
@@ -396,11 +396,11 @@
for (images=GetFirstImageInList(image); images != (Image *) NULL; )
{
(void) CopyMagickString(images->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(images->magick_filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(images->magick,magick_info->name,
- MaxTextExtent);
+ MagickPathExtent);
images=GetNextImageInList(images);
}
}
@@ -1042,8 +1042,8 @@
}
*length=(size_t) MagickMin((MagickSizeType) offset,extent);
blob=(unsigned char *) NULL;
- if (~(*length) >= (MaxTextExtent-1))
- blob=(unsigned char *) AcquireQuantumMemory(*length+MaxTextExtent,
+ if (~(*length) >= (MagickPathExtent-1))
+ blob=(unsigned char *) AcquireQuantumMemory(*length+MagickPathExtent,
sizeof(*blob));
if (blob == (unsigned char *) NULL)
{
@@ -1542,7 +1542,7 @@
blob_info->adjoin=MagickFalse;
(void) SetImageInfo(blob_info,1,exception);
if (*blob_info->magick != '\0')
- (void) CopyMagickString(image->magick,blob_info->magick,MaxTextExtent);
+ (void) CopyMagickString(image->magick,blob_info->magick,MagickPathExtent);
magick_info=GetMagickInfo(image->magick,exception);
if (magick_info == (const MagickInfo *) NULL)
{
@@ -1552,7 +1552,7 @@
blob_info=DestroyImageInfo(blob_info);
return(blob);
}
- (void) CopyMagickString(blob_info->magick,image->magick,MaxTextExtent);
+ (void) CopyMagickString(blob_info->magick,image->magick,MagickPathExtent);
if (GetMagickBlobSupport(magick_info) != MagickFalse)
{
/*
@@ -1582,7 +1582,7 @@
else
{
char
- unique[MaxTextExtent];
+ unique[MagickPathExtent];
int
file;
@@ -1601,7 +1601,7 @@
blob_info->file=fdopen(file,"wb");
if (blob_info->file != (FILE *) NULL)
{
- (void) FormatLocaleString(image->filename,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(image->filename,MagickPathExtent,"%s:%s",
image->magick,unique);
status=WriteImage(blob_info,image,exception);
(void) CloseBlob(image);
@@ -1795,7 +1795,7 @@
(void) SetImageInfo(blob_info,(unsigned int) GetImageListLength(images),
exception);
if (*blob_info->magick != '\0')
- (void) CopyMagickString(images->magick,blob_info->magick,MaxTextExtent);
+ (void) CopyMagickString(images->magick,blob_info->magick,MagickPathExtent);
magick_info=GetMagickInfo(images->magick,exception);
if (magick_info == (const MagickInfo *) NULL)
{
@@ -1810,7 +1810,7 @@
blob_info=DestroyImageInfo(blob_info);
return(ImageToBlob(image_info,images,length,exception));
}
- (void) CopyMagickString(blob_info->magick,images->magick,MaxTextExtent);
+ (void) CopyMagickString(blob_info->magick,images->magick,MagickPathExtent);
if (GetMagickBlobSupport(magick_info) != MagickFalse)
{
/*
@@ -1840,8 +1840,8 @@
else
{
char
- filename[MaxTextExtent],
- unique[MaxTextExtent];
+ filename[MagickPathExtent],
+ unique[MagickPathExtent];
int
file;
@@ -1860,7 +1860,7 @@
blob_info->file=fdopen(file,"wb");
if (blob_info->file != (FILE *) NULL)
{
- (void) FormatLocaleString(filename,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s:%s",
images->magick,unique);
status=WriteImages(blob_info,images,filename,exception);
(void) CloseBlob(images);
@@ -1911,7 +1911,7 @@
Image *image,Image *inject_image,const char *format,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
FILE
*unique_file;
@@ -1961,7 +1961,7 @@
unique_file=fdopen(file,"wb");
if ((file == -1) || (unique_file == (FILE *) NULL))
{
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
image->filename);
return(MagickFalse);
@@ -1973,7 +1973,7 @@
(void) RelinquishUniqueFileResource(filename);
return(MagickFalse);
}
- (void) FormatLocaleString(byte_image->filename,MaxTextExtent,"%s:%s",format,
+ (void) FormatLocaleString(byte_image->filename,MagickPathExtent,"%s:%s",format,
filename);
DestroyBlob(byte_image);
byte_image->blob=CloneBlobInfo((BlobInfo *) NULL);
@@ -2384,8 +2384,8 @@
Image *image,const BlobMode mode,ExceptionInfo *exception)
{
char
- extension[MaxTextExtent],
- filename[MaxTextExtent];
+ extension[MagickPathExtent],
+ filename[MagickPathExtent];
const char
*type;
@@ -2436,7 +2436,7 @@
Open image file.
*/
*filename='\0';
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
rights=ReadPolicyRights;
if (*type == 'w')
rights=WritePolicyRights;
@@ -2462,7 +2462,7 @@
if (LocaleNCompare(filename,"fd:",3) == 0)
{
char
- mode[MaxTextExtent];
+ mode[MagickPathExtent];
*mode=(*type);
mode[1]='\0';
@@ -2479,7 +2479,7 @@
if (*filename == '|')
{
char
- mode[MaxTextExtent];
+ mode[MagickPathExtent];
/*
Pipe image to or from a system command.
@@ -2519,7 +2519,7 @@
GetPathComponent(image->filename,ExtensionPath,extension);
if (*type == 'w')
{
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
if ((image_info->adjoin == MagickFalse) ||
(strchr(filename,'%') != (char *) NULL))
{
@@ -2533,17 +2533,17 @@
(GetNextImageInList(image) != (Image *) NULL)))
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
GetPathComponent(image->filename,RootPath,path);
if (*extension == '\0')
- (void) FormatLocaleString(filename,MaxTextExtent,"%s-%.20g",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s-%.20g",
path,(double) image->scene);
else
- (void) FormatLocaleString(filename,MaxTextExtent,"%s-%.20g.%s",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s-%.20g.%s",
path,(double) image->scene,extension);
}
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
#if defined(macintosh)
SetApplicationType(filename,image_info->magick,'8BIM');
#endif
@@ -3609,7 +3609,7 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- for (i=0; i < (MaxTextExtent-1L); i++)
+ for (i=0; i < (MagickPathExtent-1L); i++)
{
p=ReadBlobStream(image,1,buffer,&count);
if (count != 1)
diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index f7ff139..cf3b772 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -188,8 +188,8 @@
file;
char
- filename[MaxTextExtent],
- cache_filename[MaxTextExtent];
+ filename[MagickPathExtent],
+ cache_filename[MagickPathExtent];
CacheMethods
methods;
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 29dd17d..423ca9b 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -672,9 +672,9 @@
if (cache_info->debug != MagickFalse)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"%s => %s",
+ (void) FormatLocaleString(message,MagickPathExtent,"%s => %s",
CommandOptionToMnemonic(MagickCacheOptions,(ssize_t) cache_info->type),
CommandOptionToMnemonic(MagickCacheOptions,(ssize_t) clone_info->type));
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
@@ -868,9 +868,9 @@
if (cache_info->debug != MagickFalse)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"destroy %s",
+ (void) FormatLocaleString(message,MagickPathExtent,"destroy %s",
cache_info->filename);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
}
@@ -3229,11 +3229,11 @@
if (image->debug != MagickFalse)
{
char
- format[MaxTextExtent],
- message[MaxTextExtent];
+ format[MagickPathExtent],
+ message[MagickPathExtent];
- (void) FormatMagickSize(length,MagickFalse,"B",MaxTextExtent,format);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatMagickSize(length,MagickFalse,"B",MagickPathExtent,format);
+ (void) FormatLocaleString(message,MagickPathExtent,
"extend %s (%s[%d], disk, %s)",cache_info->filename,
cache_info->cache_filename,cache_info->file,format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
@@ -3265,8 +3265,8 @@
source_info;
char
- format[MaxTextExtent],
- message[MaxTextExtent];
+ format[MagickPathExtent],
+ message[MagickPathExtent];
const char
*type;
@@ -3297,7 +3297,7 @@
assert(cache_info->signature == MagickSignature);
source_info=(*cache_info);
source_info.file=(-1);
- (void) FormatLocaleString(cache_info->filename,MaxTextExtent,"%s[%.20g]",
+ (void) FormatLocaleString(cache_info->filename,MagickPathExtent,"%s[%.20g]",
image->filename,(double) GetImageIndexInList(image));
cache_info->storage_class=image->storage_class;
cache_info->colorspace=image->colorspace;
@@ -3364,10 +3364,10 @@
if (image->debug != MagickFalse)
{
(void) FormatMagickSize(cache_info->length,MagickTrue,"B",
- MaxTextExtent,format);
+ MagickPathExtent,format);
type=CommandOptionToMnemonic(MagickCacheOptions,(ssize_t)
cache_info->type);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"open %s (%s %s, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->mapped != MagickFalse ?
"Anonymous" : "Heap",type,(double) cache_info->columns,
@@ -3410,7 +3410,7 @@
cache_info->type=DistributedCache;
cache_info->server_info=server_info;
(void) FormatLocaleString(cache_info->cache_filename,
- MaxTextExtent,"%s:%d",GetDistributeCacheHostname(
+ MagickPathExtent,"%s:%d",GetDistributeCacheHostname(
(DistributeCacheInfo *) cache_info->server_info),
GetDistributeCachePort((DistributeCacheInfo *)
cache_info->server_info));
@@ -3424,10 +3424,10 @@
if (image->debug != MagickFalse)
{
(void) FormatMagickSize(cache_info->length,MagickFalse,"B",
- MaxTextExtent,format);
+ MagickPathExtent,format);
type=CommandOptionToMnemonic(MagickCacheOptions,(ssize_t)
cache_info->type);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"open %s (%s[%d], %s, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->cache_filename,
GetDistributeCacheFile((DistributeCacheInfo *)
@@ -3507,10 +3507,10 @@
if (image->debug != MagickFalse)
{
(void) FormatMagickSize(cache_info->length,MagickTrue,"B",
- MaxTextExtent,format);
+ MagickPathExtent,format);
type=CommandOptionToMnemonic(MagickCacheOptions,(ssize_t)
cache_info->type);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"open %s (%s[%d], %s, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->cache_filename,
cache_info->file,type,(double) cache_info->columns,(double)
@@ -3532,11 +3532,11 @@
}
if (image->debug != MagickFalse)
{
- (void) FormatMagickSize(cache_info->length,MagickFalse,"B",MaxTextExtent,
+ (void) FormatMagickSize(cache_info->length,MagickFalse,"B",MagickPathExtent,
format);
type=CommandOptionToMnemonic(MagickCacheOptions,(ssize_t)
cache_info->type);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"open %s (%s[%d], %s, %.20gx%.20gx%.20g %s)",cache_info->filename,
cache_info->cache_filename,cache_info->file,type,(double)
cache_info->columns,(double) cache_info->rows,(double)
@@ -3619,7 +3619,7 @@
(void) LogMagickEvent(CacheEvent,GetMagickModule(),
"attach persistent cache");
(void) CopyMagickString(cache_info->cache_filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
cache_info->type=DiskCache;
cache_info->offset=(*offset);
if (OpenPixelCache(image,ReadMode,exception) == MagickFalse)
@@ -3646,7 +3646,7 @@
if (status == 0)
{
(void) CopyMagickString(cache_info->cache_filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
*offset+=cache_info->length+page_size-(cache_info->length %
page_size);
UnlockSemaphoreInfo(cache_info->semaphore);
@@ -3666,7 +3666,7 @@
clone_info=(CacheInfo *) clone_image.cache;
image->cache=ClonePixelCache(cache_info);
cache_info=(CacheInfo *) ReferencePixelCache(image->cache);
- (void) CopyMagickString(cache_info->cache_filename,filename,MaxTextExtent);
+ (void) CopyMagickString(cache_info->cache_filename,filename,MagickPathExtent);
cache_info->type=DiskCache;
cache_info->offset=(*offset);
cache_info=(CacheInfo *) image->cache;
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index c64b356..559e3ad 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -203,7 +203,7 @@
channel_mask;
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
diff --git a/MagickCore/client.c b/MagickCore/client.c
index 51aff65..4563bcc 100644
--- a/MagickCore/client.c
+++ b/MagickCore/client.c
@@ -114,10 +114,10 @@
MagickExport const char *SetClientName(const char *name)
{
static char
- client_name[MaxTextExtent] = "Magick";
+ client_name[MagickPathExtent] = "Magick";
if ((name != (char *) NULL) && (*name != '\0'))
- (void) CopyMagickString(client_name,name,MaxTextExtent);
+ (void) CopyMagickString(client_name,name,MagickPathExtent);
return(client_name);
}
@@ -148,9 +148,9 @@
MagickExport const char *SetClientPath(const char *path)
{
static char
- client_path[MaxTextExtent] = "";
+ client_path[MagickPathExtent] = "";
if ((path != (char *) NULL) && (*path != '\0'))
- (void) CopyMagickString(client_path,path,MaxTextExtent);
+ (void) CopyMagickString(client_path,path,MagickPathExtent);
return(client_path);
}
diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index c674c56..46a40d1 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -787,7 +787,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -817,7 +817,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -843,7 +843,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -856,17 +856,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
diff --git a/MagickCore/color.c b/MagickCore/color.c
index 19d94d1..300bb0e 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -999,7 +999,7 @@
const ComplianceType compliance,ExceptionInfo *exception)
{
char
- colorname[MaxTextExtent];
+ colorname[MagickPathExtent];
register const ColorInfo
*p;
@@ -1015,12 +1015,12 @@
*/
*colorname='\0';
if (name != (const char *) NULL)
- (void) CopyMagickString(colorname,name,MaxTextExtent);
+ (void) CopyMagickString(colorname,name,MagickPathExtent);
for (q=colorname; *q != '\0'; q++)
{
if (isspace((int) ((unsigned char) *q)) == 0)
continue;
- (void) CopyMagickString(q,q+1,MaxTextExtent);
+ (void) CopyMagickString(q,q+1,MagickPathExtent);
q--;
}
/*
@@ -1120,7 +1120,7 @@
const PixelChannel component,const ComplianceType compliance,char *tuple)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
double
color;
@@ -1158,37 +1158,37 @@
}
if (compliance == NoCompliance)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%.*g",GetMagickPrecision(),
+ (void) FormatLocaleString(text,MagickPathExtent,"%.*g",GetMagickPrecision(),
color);
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
if (compliance != SVGCompliance)
{
if (pixel->depth > 16)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%10lu",(unsigned long)
+ (void) FormatLocaleString(text,MagickPathExtent,"%10lu",(unsigned long)
ScaleQuantumToLong(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
if (pixel->depth > 8)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%5d",
+ (void) FormatLocaleString(text,MagickPathExtent,"%5d",
ScaleQuantumToShort(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
- (void) FormatLocaleString(text,MaxTextExtent,"%3d",
+ (void) FormatLocaleString(text,MagickPathExtent,"%3d",
ScaleQuantumToChar(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
if (component == AlphaPixelChannel)
{
- (void) FormatLocaleString(text,MaxTextExtent,"%.*g",GetMagickPrecision(),
+ (void) FormatLocaleString(text,MagickPathExtent,"%.*g",GetMagickPrecision(),
(QuantumScale*color));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
if ((pixel->colorspace == HCLColorspace) ||
@@ -1199,21 +1199,21 @@
(pixel->colorspace == HSVColorspace) ||
(pixel->colorspace == HWBColorspace))
{
- (void) FormatLocaleString(text,MaxTextExtent,"%.*g%%",
+ (void) FormatLocaleString(text,MagickPathExtent,"%.*g%%",
GetMagickPrecision(),(100.0*QuantumScale*color));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
if ((pixel->colorspace == LabColorspace) || (pixel->depth > 8))
{
- (void) FormatLocaleString(text,MaxTextExtent,"%.*g%%",
+ (void) FormatLocaleString(text,MagickPathExtent,"%.*g%%",
GetMagickPrecision(),(100.0*QuantumScale*color));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
return;
}
- (void) FormatLocaleString(text,MaxTextExtent,"%d",ScaleQuantumToChar(
+ (void) FormatLocaleString(text,MagickPathExtent,"%d",ScaleQuantumToChar(
ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MagickPathExtent);
}
/*
@@ -1441,7 +1441,7 @@
const PixelChannel channel,char *tuple)
{
char
- component[MaxTextExtent];
+ component[MagickPathExtent];
double
color;
@@ -1479,29 +1479,29 @@
}
if (pixel->depth > 32)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%08lX%08lX",
+ (void) FormatLocaleString(component,MagickPathExtent,"%08lX%08lX",
(unsigned long) ScaleQuantumToLong(ClampToQuantum(color)),
(unsigned long) ScaleQuantumToLong(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,component,MagickPathExtent);
return;
}
if (pixel->depth > 16)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%08X",
+ (void) FormatLocaleString(component,MagickPathExtent,"%08X",
(unsigned int) ScaleQuantumToLong(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,component,MagickPathExtent);
return;
}
if (pixel->depth > 8)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%04X",
+ (void) FormatLocaleString(component,MagickPathExtent,"%04X",
ScaleQuantumToShort(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,component,MagickPathExtent);
return;
}
- (void) FormatLocaleString(component,MaxTextExtent,"%02X",
+ (void) FormatLocaleString(component,MagickPathExtent,"%02X",
ScaleQuantumToChar(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,component,MagickPathExtent);
return;
}
@@ -1520,7 +1520,7 @@
/*
Convert pixel to hex color.
*/
- (void) ConcatenateMagickString(tuple,"#",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,"#",MagickPathExtent);
ConcatentateHexColorComponent(pixel,RedPixelChannel,tuple);
ConcatentateHexColorComponent(pixel,GreenPixelChannel,tuple);
ConcatentateHexColorComponent(pixel,BluePixelChannel,tuple);
@@ -1562,31 +1562,31 @@
color.depth=8;
}
(void) ConcatenateMagickString(tuple,CommandOptionToMnemonic(
- MagickColorspaceOptions,(ssize_t) color.colorspace),MaxTextExtent);
+ MagickColorspaceOptions,(ssize_t) color.colorspace),MagickPathExtent);
if (color.alpha_trait != UndefinedPixelTrait)
- (void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
- (void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,"a",MagickPathExtent);
+ (void) ConcatenateMagickString(tuple,"(",MagickPathExtent);
if (color.colorspace == GRAYColorspace)
ConcatenateColorComponent(&color,GrayPixelChannel,SVGCompliance,tuple);
else
{
ConcatenateColorComponent(&color,RedPixelChannel,SVGCompliance,tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&color,GreenPixelChannel,SVGCompliance,tuple);
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&color,BluePixelChannel,SVGCompliance,tuple);
}
if (color.colorspace == CMYKColorspace)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&color,BlackPixelChannel,SVGCompliance,tuple);
}
if (color.alpha_trait != UndefinedPixelTrait)
{
- (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,",",MagickPathExtent);
ConcatenateColorComponent(&color,AlphaPixelChannel,SVGCompliance,tuple);
}
- (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,")",MagickPathExtent);
LocaleLower(tuple);
return;
}
@@ -1885,7 +1885,7 @@
ExceptionInfo *exception)
{
char
- tuple[MaxTextExtent];
+ tuple[MagickPathExtent];
const char
*path;
@@ -1977,7 +1977,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
ColorInfo
@@ -2007,7 +2007,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -2033,7 +2033,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -2046,17 +2046,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
@@ -2320,7 +2320,7 @@
if (strchr(name,'(') != (char *) NULL)
{
char
- colorspace[MaxTextExtent];
+ colorspace[MagickPathExtent];
MagickBooleanType
icc_color;
@@ -2328,7 +2328,7 @@
/*
Parse color of the form rgb(100,255,0).
*/
- (void) CopyMagickString(colorspace,name,MaxTextExtent);
+ (void) CopyMagickString(colorspace,name,MagickPathExtent);
for (i=0; colorspace[i] != '\0'; i++)
if (colorspace[i] == '(')
break;
@@ -2337,7 +2337,7 @@
icc_color=MagickFalse;
if (LocaleNCompare(colorspace,"device-",7) == 0)
{
- (void) CopyMagickString(colorspace,colorspace+7,MaxTextExtent);
+ (void) CopyMagickString(colorspace,colorspace+7,MagickPathExtent);
scale=(double) QuantumRange;
icc_color=MagickTrue;
}
@@ -2346,7 +2346,7 @@
register ssize_t
j;
- (void) CopyMagickString(colorspace,name+i+2,MaxTextExtent);
+ (void) CopyMagickString(colorspace,name+i+2,MagickPathExtent);
for (j=0; colorspace[j] != '\0'; j++)
if (colorspace[j] == ',')
break;
@@ -2586,7 +2586,7 @@
(fabs((double) (p->color.blue-color->blue)) < MagickEpsilon) &&
(fabs((double) (p->color.alpha-alpha)) < MagickEpsilon))
{
- (void) CopyMagickString(name,p->name,MaxTextExtent);
+ (void) CopyMagickString(name,p->name,MagickPathExtent);
break;
}
p=(const ColorInfo *) GetNextValueInLinkedList(color_cache);
diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 8fc15d6..5357553 100644
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -650,7 +650,7 @@
ExceptionInfo *exception)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
const char
*element;
@@ -665,7 +665,7 @@
assert(filename != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
assert(exception != (ExceptionInfo *) NULL);
- (void) CopyMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,filename,MagickPathExtent);
/*
Load XML from configuration files to linked-list.
*/
@@ -677,7 +677,7 @@
element=(const char *) GetNextValueInLinkedList(paths);
while (element != (const char *) NULL)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",element,filename);
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",element,filename);
(void) LogMagickEvent(ConfigureEvent,GetMagickModule(),
"Searching for configure file: \"%s\"",path);
xml=ConfigureFileToStringInfo(path);
@@ -745,7 +745,7 @@
#define MagickCoreDebugDLL "CORE_DB_MagickCore_.dll"
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
LinkedListInfo
*paths;
@@ -753,7 +753,7 @@
assert(filename != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
assert(exception != (ExceptionInfo *) NULL);
- (void) CopyMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,filename,MagickPathExtent);
paths=NewLinkedList(0);
{
char
@@ -771,14 +771,14 @@
for (p=configure_path-1; p != (char *) NULL; )
{
- (void) CopyMagickString(path,p+1,MaxTextExtent);
+ (void) CopyMagickString(path,p+1,MagickPathExtent);
q=strchr(path,DirectoryListSeparator);
if (q != (char *) NULL)
*q='\0';
q=path+strlen(path)-1;
if ((q >= path) && (*q != *DirectorySeparator))
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
(void) AppendValueToLinkedList(paths,ConstantString(path));
p=strchr(p+1,DirectoryListSeparator);
}
@@ -812,7 +812,7 @@
key_value=NTRegistryKeyLookup(RegistryKey);
if (key_value != (unsigned char *) NULL)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",(char *) key_value,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",(char *) key_value,
DirectorySeparator);
(void) AppendValueToLinkedList(paths,ConstantString(path));
key_value=(unsigned char *) RelinquishMagickMemory(key_value);
@@ -831,17 +831,17 @@
if (home != (char *) NULL)
{
#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",home,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",home,
DirectorySeparator);
(void) AppendValueToLinkedList(paths,ConstantString(path));
#else
- (void) FormatLocaleString(path,MaxTextExtent,"%s/etc/%s/",home,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/etc/%s/",home,
MAGICKCORE_CONFIGURE_RELATIVE_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
- (void) FormatLocaleString(path,MaxTextExtent,"%s/share/%s/",home,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/share/%s/",home,
MAGICKCORE_SHARE_RELATIVE_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
- (void) FormatLocaleString(path,MaxTextExtent,"%s",
+ (void) FormatLocaleString(path,MagickPathExtent,"%s",
MAGICKCORE_SHAREARCH_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
#endif
@@ -851,25 +851,25 @@
if (*GetClientPath() != '\0')
{
#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",GetClientPath(),
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",GetClientPath(),
DirectorySeparator);
(void) AppendValueToLinkedList(paths,ConstantString(path));
#else
char
- prefix[MaxTextExtent];
+ prefix[MagickPathExtent];
/*
Search based on executable directory if directory is known.
*/
- (void) CopyMagickString(prefix,GetClientPath(),MaxTextExtent);
+ (void) CopyMagickString(prefix,GetClientPath(),MagickPathExtent);
ChopPathComponents(prefix,1);
- (void) FormatLocaleString(path,MaxTextExtent,"%s/etc/%s/",prefix,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/etc/%s/",prefix,
MAGICKCORE_CONFIGURE_RELATIVE_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
- (void) FormatLocaleString(path,MaxTextExtent,"%s/share/%s/",prefix,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/share/%s/",prefix,
MAGICKCORE_SHARE_RELATIVE_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
- (void) FormatLocaleString(path,MaxTextExtent,"%s",
+ (void) FormatLocaleString(path,MagickPathExtent,"%s",
MAGICKCORE_SHAREARCH_PATH);
(void) AppendValueToLinkedList(paths,ConstantString(path));
#endif
@@ -891,7 +891,7 @@
/*
Search $HOME/.config/ImageMagick.
*/
- (void) FormatLocaleString(path,MaxTextExtent,
+ (void) FormatLocaleString(path,MagickPathExtent,
"%s%s.config%sImageMagick%s",home,DirectorySeparator,
DirectorySeparator,DirectorySeparator);
(void) AppendValueToLinkedList(paths,ConstantString(path));
@@ -901,7 +901,7 @@
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
{
char
- module_path[MaxTextExtent];
+ module_path[MagickPathExtent];
if ((NTGetModulePath(MagickCoreDLL,module_path) != MagickFalse) ||
(NTGetModulePath(MagickCoreDebugDLL,module_path) != MagickFalse))
@@ -912,7 +912,7 @@
/*
Search module path.
*/
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",module_path,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",module_path,
DirectorySeparator);
key_value=NTRegistryKeyLookup(RegistryKey);
if (key_value == (unsigned char *) NULL)
@@ -925,10 +925,10 @@
/*
Search PerlMagick module path.
*/
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",module_path,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",module_path,
DirectorySeparator);
(void) AppendValueToLinkedList(paths,ConstantString(path));
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",module_path,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",module_path,
"\\inc\\lib\\auto\\Image\\Magick\\");
(void) AppendValueToLinkedList(paths,ConstantString(path));
}
@@ -1125,7 +1125,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
ConfigureInfo
@@ -1153,7 +1153,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -1179,7 +1179,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1192,17 +1192,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 0f3be0c..0526f17 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -263,7 +263,7 @@
ExceptionInfo *exception)
{
char
- ping_filename[MaxTextExtent];
+ ping_filename[MagickPathExtent];
Image
*image,
@@ -282,7 +282,7 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
(void) SetImageOption(image_info,"filename",filename);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
(void) InterpretImageFilename(image_info,(Image *) NULL,image_info->filename,
(int) image_info->scene,ping_filename,exception);
if (LocaleCompare(ping_filename,image_info->filename) != 0)
@@ -306,7 +306,7 @@
read_info=DestroyImageInfo(read_info);
return(PingImage(image_info,exception));
}
- (void) CopyMagickString(ping_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(ping_filename,read_info->filename,MagickPathExtent);
images=NewImageList();
extent=(ssize_t) (read_info->scene+read_info->number_scenes);
for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++)
@@ -356,9 +356,9 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- magick[MaxTextExtent],
- magick_filename[MaxTextExtent];
+ filename[MagickPathExtent],
+ magick[MagickPathExtent],
+ magick_filename[MagickPathExtent];
const char
*value;
@@ -402,10 +402,10 @@
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
read_info=CloneImageInfo(image_info);
- (void) CopyMagickString(magick_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(magick_filename,read_info->filename,MagickPathExtent);
(void) SetImageInfo(read_info,0,exception);
- (void) CopyMagickString(filename,read_info->filename,MaxTextExtent);
- (void) CopyMagickString(magick,read_info->magick,MaxTextExtent);
+ (void) CopyMagickString(filename,read_info->filename,MagickPathExtent);
+ (void) CopyMagickString(magick,read_info->magick,MagickPathExtent);
domain=CoderPolicyDomain;
rights=ReadPolicyRights;
if (IsRightsAuthorized(domain,rights,read_info->magick) == MagickFalse)
@@ -446,7 +446,7 @@
image=AcquireImage(read_info,exception);
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
@@ -481,7 +481,7 @@
if (delegate_info == (const DelegateInfo *) NULL)
{
(void) SetImageInfo(read_info,0,exception);
- (void) CopyMagickString(read_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(read_info->filename,filename,MagickPathExtent);
magick_info=GetMagickInfo(read_info->magick,exception);
}
}
@@ -517,7 +517,7 @@
return((Image *) NULL);
}
(void) CopyMagickString(image->filename,read_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
*read_info->filename='\0';
if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
LockSemaphoreInfo(delegate_info->semaphore);
@@ -553,7 +553,7 @@
(void) RelinquishUniqueFileResource(read_info->filename);
read_info->temporary=MagickFalse;
if (image != (Image *) NULL)
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
if (image == (Image *) NULL)
{
@@ -585,9 +585,9 @@
for (next=image; next != (Image *) NULL; next=GetNextImageInList(next))
{
char
- magick_path[MaxTextExtent],
+ magick_path[MagickPathExtent],
*property,
- timestamp[MaxTextExtent];
+ timestamp[MagickPathExtent];
const char
*option;
@@ -598,11 +598,11 @@
next->taint=MagickFalse;
GetPathComponent(magick_filename,MagickPath,magick_path);
if (*magick_path == '\0' && *next->magick == '\0')
- (void) CopyMagickString(next->magick,magick,MaxTextExtent);
+ (void) CopyMagickString(next->magick,magick,MagickPathExtent);
(void) CopyMagickString(next->magick_filename,magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
if (IsBlobTemporary(image) != MagickFalse)
- (void) CopyMagickString(next->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(next->filename,filename,MagickPathExtent);
if (next->magick_columns == 0)
next->magick_columns=next->columns;
if (next->magick_rows == 0)
@@ -712,10 +712,10 @@
profile=GetImageProfile(next,"iptc");
if (profile == (const StringInfo *) NULL)
profile=GetImageProfile(next,"8bim");
- (void) FormatMagickTime(GetBlobProperties(next)->st_mtime,MaxTextExtent,
+ (void) FormatMagickTime(GetBlobProperties(next)->st_mtime,MagickPathExtent,
timestamp);
(void) SetImageProperty(next,"date:modify",timestamp,exception);
- (void) FormatMagickTime(GetBlobProperties(next)->st_ctime,MaxTextExtent,
+ (void) FormatMagickTime(GetBlobProperties(next)->st_ctime,MagickPathExtent,
timestamp);
(void) SetImageProperty(next,"date:create",timestamp,exception);
option=GetImageOption(image_info,"delay");
@@ -784,7 +784,7 @@
ExceptionInfo *exception)
{
char
- read_filename[MaxTextExtent];
+ read_filename[MagickPathExtent];
Image
*image,
@@ -805,7 +805,7 @@
read_info=CloneImageInfo(image_info);
*read_info->magick='\0';
(void) SetImageOption(read_info,"filename",filename);
- (void) CopyMagickString(read_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(read_info->filename,filename,MagickPathExtent);
(void) InterpretImageFilename(read_info,(Image *) NULL,filename,
(int) read_info->scene,read_filename,exception);
if (LocaleCompare(read_filename,read_info->filename) != 0)
@@ -828,7 +828,7 @@
read_info=DestroyImageInfo(read_info);
return(ReadImage(image_info,exception));
}
- (void) CopyMagickString(read_filename,read_info->filename,MaxTextExtent);
+ (void) CopyMagickString(read_filename,read_info->filename,MagickPathExtent);
images=NewImageList();
extent=(ssize_t) (read_info->scene+read_info->number_scenes);
for (scene=(ssize_t) read_info->scene; scene < (ssize_t) extent; scene++)
@@ -954,7 +954,7 @@
Image *image,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
const char
*option;
@@ -994,12 +994,12 @@
assert(exception != (ExceptionInfo *) NULL);
sans_exception=AcquireExceptionInfo();
write_info=CloneImageInfo(image_info);
- (void) CopyMagickString(write_info->filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(write_info->filename,image->filename,MagickPathExtent);
(void) SetImageInfo(write_info,1,sans_exception);
if (*write_info->magick == '\0')
- (void) CopyMagickString(write_info->magick,image->magick,MaxTextExtent);
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
- (void) CopyMagickString(image->filename,write_info->filename,MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,image->magick,MagickPathExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
+ (void) CopyMagickString(image->filename,write_info->filename,MagickPathExtent);
domain=CoderPolicyDomain;
rights=WritePolicyRights;
if (IsRightsAuthorized(domain,rights,write_info->magick) == MagickFalse)
@@ -1047,11 +1047,11 @@
Process image with bi-modal delegate.
*/
(void) CopyMagickString(image->filename,image->magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
status=InvokeDelegate(write_info,image,image->magick,
write_info->magick,exception);
write_info=DestroyImageInfo(write_info);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
return(status);
}
}
@@ -1061,11 +1061,11 @@
(GetMagickSeekableStream(magick_info) != MagickFalse))
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
if (status != MagickFalse)
{
if (IsBlobSeekable(image) == MagickFalse)
@@ -1075,7 +1075,7 @@
*/
write_info->adjoin=MagickTrue;
(void) CopyMagickString(write_info->filename,image->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) AcquireUniqueFilename(image->filename);
temporary=MagickTrue;
}
@@ -1109,7 +1109,7 @@
write_info->magick,exception);
if (GetDelegateThreadSupport(delegate_info) == MagickFalse)
UnlockSemaphoreInfo(delegate_info->semaphore);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
else
{
@@ -1120,21 +1120,21 @@
(magick_info == (const MagickInfo *) NULL))
{
(void) CopyMagickString(write_info->magick,image->magick,
- MaxTextExtent);
+ MagickPathExtent);
magick_info=GetMagickInfo(write_info->magick,exception);
}
if ((magick_info == (const MagickInfo *) NULL) ||
(GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
{
char
- extension[MaxTextExtent];
+ extension[MagickPathExtent];
GetPathComponent(image->filename,ExtensionPath,extension);
if (*extension != '\0')
magick_info=GetMagickInfo(extension,exception);
else
magick_info=GetMagickInfo(image->magick,exception);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
}
if ((magick_info == (const MagickInfo *) NULL) ||
(GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL))
@@ -1178,7 +1178,7 @@
(void) CloseBlob(image);
(void) RelinquishUniqueFileResource(image->filename);
(void) CopyMagickString(image->filename,write_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
}
if ((LocaleCompare(write_info->magick,"info") != 0) &&
(write_info->verbose != MagickFalse))
@@ -1264,14 +1264,14 @@
images=GetFirstImageInList(images);
if (filename != (const char *) NULL)
for (p=images; p != (Image *) NULL; p=GetNextImageInList(p))
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
- (void) CopyMagickString(write_info->filename,images->filename,MaxTextExtent);
+ (void) CopyMagickString(p->filename,filename,MagickPathExtent);
+ (void) CopyMagickString(write_info->filename,images->filename,MagickPathExtent);
sans_exception=AcquireExceptionInfo();
(void) SetImageInfo(write_info,(unsigned int) GetImageListLength(images),
sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
if (*write_info->magick == '\0')
- (void) CopyMagickString(write_info->magick,images->magick,MaxTextExtent);
+ (void) CopyMagickString(write_info->magick,images->magick,MagickPathExtent);
p=images;
for ( ; GetNextImageInList(p) != (Image *) NULL; p=GetNextImageInList(p))
if (p->scene >= GetNextImageInList(p)->scene)
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index b780edf..d0fd230 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -395,7 +395,7 @@
}
sanitize_command=SanitizeDelegateCommand(command);
if (asynchronous != MagickFalse)
- (void) ConcatenateMagickString(sanitize_command,"&",MaxTextExtent);
+ (void) ConcatenateMagickString(sanitize_command,"&",MagickPathExtent);
if (message != (char *) NULL)
*message='\0';
#if defined(MAGICKCORE_POSIX_SUPPORT)
@@ -1105,8 +1105,8 @@
char
*command,
**commands,
- input_filename[MaxTextExtent],
- output_filename[MaxTextExtent];
+ input_filename[MagickPathExtent],
+ output_filename[MagickPathExtent];
const DelegateInfo
*delegate_info;
@@ -1220,21 +1220,21 @@
LocaleUpper(magick);
clone_info=CloneImageInfo(image_info);
(void) CopyMagickString((char *) clone_info->magick,magick,
- MaxTextExtent);
+ MagickPathExtent);
if (LocaleCompare(magick,"NULL") != 0)
- (void) CopyMagickString(image->magick,magick,MaxTextExtent);
+ (void) CopyMagickString(image->magick,magick,MagickPathExtent);
magick=DestroyString(magick);
- (void) FormatLocaleString(clone_info->filename,MaxTextExtent,"%s:",
+ (void) FormatLocaleString(clone_info->filename,MagickPathExtent,"%s:",
delegate_info->decode);
(void) SetImageInfo(clone_info,(unsigned int) GetImageListLength(image),
exception);
(void) CopyMagickString(clone_info->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(image_info->filename,image->filename,
- MaxTextExtent);
+ MagickPathExtent);
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
{
- (void) FormatLocaleString(p->filename,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(p->filename,MagickPathExtent,"%s:%s",
delegate_info->decode,clone_info->filename);
status=WriteImage(clone_info,p,exception);
if( IfMagickFalse(status) )
@@ -1270,8 +1270,8 @@
}
command=(char *) NULL;
status=MagickFalse;
- (void) CopyMagickString(output_filename,image_info->filename,MaxTextExtent);
- (void) CopyMagickString(input_filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(output_filename,image_info->filename,MagickPathExtent);
+ (void) CopyMagickString(input_filename,image->filename,MagickPathExtent);
for (i=0; commands[i] != (char *) NULL; i++)
{
status=AcquireUniqueSymbolicLink(output_filename,image_info->filename);
@@ -1342,8 +1342,8 @@
}
commands[i]=DestroyString(commands[i]);
}
- (void) CopyMagickString(image_info->filename,output_filename,MaxTextExtent);
- (void) CopyMagickString(image->filename,input_filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,output_filename,MagickPathExtent);
+ (void) CopyMagickString(image->filename,input_filename,MagickPathExtent);
/*
Relinquish resources.
*/
@@ -1387,7 +1387,7 @@
char
**commands,
- delegate[MaxTextExtent];
+ delegate[MagickPathExtent];
const char
*path;
@@ -1424,8 +1424,8 @@
path=delegate_info[i]->path;
*delegate='\0';
if (delegate_info[i]->encode != (char *) NULL)
- (void) CopyMagickString(delegate,delegate_info[i]->encode,MaxTextExtent);
- (void) ConcatenateMagickString(delegate," ",MaxTextExtent);
+ (void) CopyMagickString(delegate,delegate_info[i]->encode,MagickPathExtent);
+ (void) ConcatenateMagickString(delegate," ",MagickPathExtent);
delegate[8]='\0';
commands=StringToList(delegate_info[i]->commands);
if (commands == (char **) NULL)
@@ -1486,7 +1486,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -1516,7 +1516,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -1542,7 +1542,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1555,17 +1555,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
@@ -1625,9 +1625,9 @@
if (strchr(commands,'@') != (char *) NULL)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
- NTGhostscriptEXE(path,MaxTextExtent);
+ NTGhostscriptEXE(path,MagickPathExtent);
(void) SubstituteString((char **) &commands,"@PSDelegate@",
path);
(void) SubstituteString((char **) &commands,"\\","/");
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 18ca4ae..851f69e 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -1853,8 +1853,8 @@
pen_id = 0;
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
const char
*ColorMenu[MaxNumberPens+1];
@@ -1927,7 +1927,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
x+windows->image.x,y+windows->image.y);
XInfoWidget(display,windows,text);
}
@@ -1971,7 +1971,7 @@
if (font_number == (MaxNumberFonts-2))
{
static char
- font_name[MaxTextExtent] = "fixed";
+ font_name[MagickPathExtent] = "fixed";
/*
Select a font name from a browser.
@@ -2020,7 +2020,7 @@
if (pen_number == (MaxNumberPens-1))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -2065,7 +2065,7 @@
if (pen_number == (MaxNumberPens-1))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -2092,7 +2092,7 @@
entry;
static char
- angle[MaxTextExtent] = "30.0";
+ angle[MagickPathExtent] = "30.0";
static const char
*RotateMenu[] =
@@ -2591,7 +2591,7 @@
if (event.xselection.property == (Atom) None)
break;
status=XGetWindowProperty(display,event.xselection.requestor,
- event.xselection.property,0L,(long) MaxTextExtent,True,XA_STRING,
+ event.xselection.property,0L,(long) MagickPathExtent,True,XA_STRING,
&type,&format,&length,&after,&data);
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
@@ -2715,7 +2715,7 @@
width*(annotate_info->x+windows->image.x)/windows->image.ximage->width;
annotate_info->y=(int) height*(annotate_info->y-font_info->ascent+
windows->image.y)/windows->image.ximage->height;
- (void) FormatLocaleString(annotate_info->geometry,MaxTextExtent,
+ (void) FormatLocaleString(annotate_info->geometry,MagickPathExtent,
"%ux%u%+d%+d",width*annotate_info->width/windows->image.ximage->width,
height*annotate_info->height/windows->image.ximage->height,
annotate_info->x+x,annotate_info->y+y);
@@ -2792,7 +2792,7 @@
status;
static char
- window_id[MaxTextExtent] = "root";
+ window_id[MagickPathExtent] = "root";
XResourceInfo
background_resources;
@@ -2885,7 +2885,7 @@
};
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
Image
*chop_image;
@@ -2938,7 +2938,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
x+windows->image.x,y+windows->image.y);
XInfoWidget(display,windows,text);
}
@@ -2959,7 +2959,7 @@
case ChopDirectionCommand:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static const char
*Directions[] =
@@ -3022,7 +3022,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -3110,7 +3110,7 @@
*/
if (IfMagickFalse(windows->info.mapped) )
(void) XMapWindow(display,windows->info.id);
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) chop_info.width,(double)
chop_info.height,(double) chop_info.x,(double) chop_info.y);
XInfoWidget(display,windows,text);
@@ -3318,8 +3318,8 @@
border_color = { 0, 0, 0, 0, 0, 0 };
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
Cursor
cursor;
@@ -3380,7 +3380,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
x+windows->image.x,y+windows->image.y);
XInfoWidget(display,windows,text);
}
@@ -3445,7 +3445,7 @@
if (pen_number == (MaxNumberPens-2))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -3491,7 +3491,7 @@
if (pen_number == (MaxNumberPens-2))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -3511,7 +3511,7 @@
case ColorEditFuzzCommand:
{
static char
- fuzz[MaxTextExtent];
+ fuzz[MagickPathExtent];
static const char
*FuzzMenu[] =
@@ -3538,12 +3538,12 @@
QuantumRange+1.0);
break;
}
- (void) (void) CopyMagickString(fuzz,"20%",MaxTextExtent);
+ (void) (void) CopyMagickString(fuzz,"20%",MagickPathExtent);
(void) XDialogWidget(display,windows,"Ok",
"Enter fuzz factor (0.0 - 99.9%):",fuzz);
if (*fuzz == '\0')
break;
- (void) ConcatenateMagickString(fuzz,"%",MaxTextExtent);
+ (void) ConcatenateMagickString(fuzz,"%",MagickPathExtent);
(*image)->fuzz=StringToDoubleInterval(fuzz,(double) QuantumRange+
1.0);
break;
@@ -3907,8 +3907,8 @@
ExceptionInfo *exception)
{
static char
- displacement_geometry[MaxTextExtent] = "30x30",
- filename[MaxTextExtent] = "\0";
+ displacement_geometry[MagickPathExtent] = "30x30",
+ filename[MagickPathExtent] = "\0";
static const char
*CompositeMenu[] =
@@ -3935,7 +3935,7 @@
};
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
Cursor
cursor;
@@ -3979,7 +3979,7 @@
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
(void) CopyMagickString(resource_info->image_info->filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
composite_image=ReadImage(resource_info->image_info,exception);
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
@@ -4015,7 +4015,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+ld%+ld ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+ld%+ld ",
(long) composite_info.x,(long) composite_info.y);
XInfoWidget(display,windows,text);
}
@@ -4043,7 +4043,7 @@
case CompositeOperatorsCommand:
{
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
**operators;
/*
@@ -4063,7 +4063,7 @@
case CompositeDissolveCommand:
{
static char
- factor[MaxTextExtent] = "20.0";
+ factor[MagickPathExtent] = "20.0";
/*
Dissolve the two images a given percent.
@@ -4168,7 +4168,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -4397,7 +4397,7 @@
ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
MagickStatusType
status;
@@ -4454,10 +4454,10 @@
Notify window manager of the new configuration.
*/
if (resource_info->image_geometry != (char *) NULL)
- (void) FormatLocaleString(geometry,MaxTextExtent,"%s>!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%s>!",
resource_info->image_geometry);
else
- (void) FormatLocaleString(geometry,MaxTextExtent,"%ux%u+0+0>!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%ux%u+0+0>!",
XDisplayWidth(display,windows->image.screen),
XDisplayHeight(display,windows->image.screen));
(void) ParseMetaGeometry(geometry,&x,&y,&width,&height);
@@ -4603,8 +4603,8 @@
*image_view;
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
Cursor
cursor;
@@ -4686,7 +4686,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+ld%+ld ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+ld%+ld ",
(long) crop_info.x,(long) crop_info.y);
XInfoWidget(display,windows,text);
}
@@ -4881,7 +4881,7 @@
*/
if (IfMagickFalse(windows->info.mapped) )
(void) XMapWindow(display,windows->info.id);
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
crop_info.height,(double) crop_info.x,(double) crop_info.y);
XInfoWidget(display,windows,text);
@@ -4974,7 +4974,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
crop_info.height,(double) crop_info.x,(double) crop_info.y);
XInfoWidget(display,windows,text);
@@ -5260,7 +5260,7 @@
/*
Set primary selection.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) crop_info.width,(double)
crop_info.height,(double) crop_info.x,(double) crop_info.y);
request=(&(event.xselectionrequest));
@@ -5443,8 +5443,8 @@
line_width = 1;
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
Cursor
cursor;
@@ -5534,7 +5534,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
x+windows->image.x,y+windows->image.y);
XInfoWidget(display,windows,text);
}
@@ -5616,7 +5616,7 @@
if (pen_number == (MaxNumberPens-1))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -5650,7 +5650,7 @@
status;
static char
- filename[MaxTextExtent] = "\0";
+ filename[MagickPathExtent] = "\0";
static const char
*StipplesMenu[] =
@@ -5738,14 +5738,14 @@
XCheckRefreshWindows(display,windows);
image_info=AcquireImageInfo();
(void) CopyMagickString(image_info->filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
stipple_image=ReadImage(image_info,exception);
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
if (stipple_image == (Image *) NULL)
break;
(void) AcquireUniqueFileResource(filename);
- (void) FormatLocaleString(stipple_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(stipple_image->filename,MagickPathExtent,
"xbm:%s",filename);
(void) WriteImage(image_info,stipple_image,exception);
stipple_image=DestroyImage(stipple_image);
@@ -5761,7 +5761,7 @@
case DrawWidthCommand:
{
static char
- width[MaxTextExtent] = "0";
+ width[MagickPathExtent] = "0";
static const char
*WidthsMenu[] =
@@ -5939,7 +5939,7 @@
(void) XDrawLines(display,windows->image.id,
windows->image.highlight_context,coordinate_info,
number_coordinates,CoordModeOrigin);
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d",
coordinate_info[number_coordinates-1].x,
coordinate_info[number_coordinates-1].y);
XInfoWidget(display,windows,text);
@@ -5955,7 +5955,7 @@
*/
degrees=RadiansToDegrees(-atan2((double) (line_info.y2-
line_info.y1),(double) (line_info.x2-line_info.x1)));
- (void) FormatLocaleString(text,MaxTextExtent," %g",
+ (void) FormatLocaleString(text,MagickPathExtent," %g",
(double) degrees);
XInfoWidget(display,windows,text);
XHighlightLine(display,windows->image.id,
@@ -5975,7 +5975,7 @@
/*
Display info and draw drawing rectangle.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) rectangle_info.width,
(double) rectangle_info.height,(double) rectangle_info.x,
(double) rectangle_info.y);
@@ -5999,7 +5999,7 @@
/*
Display info and draw drawing rectangle.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) rectangle_info.width,
(double) rectangle_info.height,(double) rectangle_info.x,
(double) rectangle_info.y);
@@ -6027,7 +6027,7 @@
*/
degrees=RadiansToDegrees(-atan2((double) (line_info.y2-
line_info.y1),(double) (line_info.x2-line_info.x1)));
- (void) FormatLocaleString(text,MaxTextExtent," %g",
+ (void) FormatLocaleString(text,MagickPathExtent," %g",
(double) degrees);
XInfoWidget(display,windows,text);
XHighlightLine(display,windows->image.id,
@@ -6271,7 +6271,7 @@
draw_info.height=(unsigned int) rectangle_info.height+(line_width << 1);
if (draw_info.height > (unsigned int) (*image)->rows)
draw_info.height=(unsigned int) (*image)->rows;
- (void) FormatLocaleString(draw_info.geometry,MaxTextExtent,"%ux%u%+d%+d",
+ (void) FormatLocaleString(draw_info.geometry,MagickPathExtent,"%ux%u%+d%+d",
width*draw_info.width/windows->image.ximage->width,
height*draw_info.height/windows->image.ximage->height,
draw_info.x+x,draw_info.y+y);
@@ -6454,7 +6454,7 @@
case UndoCommand:
{
char
- image_geometry[MaxTextExtent];
+ image_geometry[MagickPathExtent];
/*
Undo the last image transformation.
@@ -6468,7 +6468,7 @@
undo_image=GetPreviousImageInList(undo_image);
windows->image.window_changes.width=(int) cache_image->columns;
windows->image.window_changes.height=(int) cache_image->rows;
- (void) FormatLocaleString(image_geometry,MaxTextExtent,"%dx%d!",
+ (void) FormatLocaleString(image_geometry,MagickPathExtent,"%dx%d!",
windows->image.ximage->width,windows->image.ximage->height);
(void) TransformImage(image,windows->image.crop_geometry,image_geometry,
exception);
@@ -6613,7 +6613,7 @@
{
cache_image->geometry=AcquireString((char *) NULL);
(void) CopyMagickString(cache_image->geometry,
- windows->image.crop_geometry,MaxTextExtent);
+ windows->image.crop_geometry,MagickPathExtent);
}
if (undo_image == (Image *) NULL)
{
@@ -6713,7 +6713,7 @@
KeySym key_symbol,Image **image,ExceptionInfo *exception)
{
static char
- delta[MaxTextExtent] = "";
+ delta[MagickPathExtent] = "";
static const char
Digits[] = "01234567890";
@@ -7103,9 +7103,9 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- geometry[MaxTextExtent],
- modulate_factors[MaxTextExtent];
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent],
+ modulate_factors[MagickPathExtent];
GeometryInfo
geometry_info;
@@ -7134,7 +7134,7 @@
i;
static char
- color[MaxTextExtent] = "gray";
+ color[MagickPathExtent] = "gray";
unsigned int
height,
@@ -7191,7 +7191,7 @@
*/
if (*resource_info->home_directory == '\0')
(void) CopyMagickString(resource_info->home_directory,".",
- MaxTextExtent);
+ MagickPathExtent);
status=chdir(resource_info->home_directory);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
@@ -7208,9 +7208,9 @@
if (IfMagickFalse(status) )
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(message,MagickPathExtent,"%s:%s",
exception->reason != (char *) NULL ? exception->reason : "",
exception->description != (char *) NULL ? exception->description :
"");
@@ -7228,9 +7228,9 @@
if (IfMagickFalse(status) )
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+ (void) FormatLocaleString(message,MagickPathExtent,"%s:%s",
exception->reason != (char *) NULL ? exception->reason : "",
exception->description != (char *) NULL ? exception->description :
"");
@@ -7242,7 +7242,7 @@
case DeleteCommand:
{
static char
- filename[MaxTextExtent] = "\0";
+ filename[MagickPathExtent] = "\0";
/*
Delete image file.
@@ -7261,8 +7261,8 @@
status;
static char
- color[MaxTextExtent] = "gray",
- geometry[MaxTextExtent] = "640x480";
+ color[MagickPathExtent] = "gray",
+ geometry[MagickPathExtent] = "640x480";
static const char
*format = "gradient";
@@ -7282,7 +7282,7 @@
/*
Create canvas.
*/
- (void) FormatLocaleString(image_info->filename,MaxTextExtent,
+ (void) FormatLocaleString(image_info->filename,MagickPathExtent,
"%s:%s",format,color);
(void) CloneString(&image_info->size,geometry);
nexus=ReadImage(image_info,exception);
@@ -7404,14 +7404,14 @@
height=(size_t) windows->image.ximage->height;
x=0;
y=0;
- (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g+0+0",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g+0+0",
(double) width,(double) height);
status=XDialogWidget(display,windows,"Resize",
"Enter resize geometry (e.g. 640x480, 200%):",geometry);
if (*geometry == '\0')
break;
if (status == 0)
- (void) ConcatenateMagickString(geometry,"!",MaxTextExtent);
+ (void) ConcatenateMagickString(geometry,"!",MagickPathExtent);
(void) ParseMetaGeometry(geometry,&x,&y,&width,&height);
windows->image.window_changes.width=(int) width;
windows->image.window_changes.height=(int) height;
@@ -7421,7 +7421,7 @@
case ApplyCommand:
{
char
- image_geometry[MaxTextExtent];
+ image_geometry[MagickPathExtent];
if ((windows->image.crop_geometry == (char *) NULL) &&
((int) (*image)->columns == windows->image.ximage->width) &&
@@ -7435,7 +7435,7 @@
/*
Crop and/or scale displayed image.
*/
- (void) FormatLocaleString(image_geometry,MaxTextExtent,"%dx%d!",
+ (void) FormatLocaleString(image_geometry,MagickPathExtent,"%dx%d!",
windows->image.ximage->width,windows->image.ximage->height);
(void) TransformImage(image,windows->image.crop_geometry,image_geometry,
exception);
@@ -7529,7 +7529,7 @@
height=(unsigned int) (*image)->rows;
(void) XParseGeometry(windows->image.crop_geometry,&x,&y,
&width,&height);
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,(int) (*image)->columns-(int) width-x,y);
}
if (IfMagickTrue(windows->image.orphan) )
@@ -7564,7 +7564,7 @@
height=(unsigned int) (*image)->rows;
(void) XParseGeometry(windows->image.crop_geometry,&x,&y,
&width,&height);
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,x,(int) (*image)->rows-(int) height-y);
}
if (IfMagickTrue(windows->image.orphan) )
@@ -7620,7 +7620,7 @@
*shear_image;
static char
- geometry[MaxTextExtent] = "45.0x45.0";
+ geometry[MagickPathExtent] = "45.0x45.0";
/*
Query user for shear color and geometry.
@@ -7667,7 +7667,7 @@
*roll_image;
static char
- geometry[MaxTextExtent] = "+2+2";
+ geometry[MagickPathExtent] = "+2+2";
/*
Query user for the roll geometry.
@@ -7705,12 +7705,12 @@
case TrimCommand:
{
static char
- fuzz[MaxTextExtent];
+ fuzz[MagickPathExtent];
/*
Query user for the fuzz factor.
*/
- (void) FormatLocaleString(fuzz,MaxTextExtent,"%g%%",100.0*
+ (void) FormatLocaleString(fuzz,MagickPathExtent,"%g%%",100.0*
(*image)->fuzz/(QuantumRange+1.0));
(void) XDialogWidget(display,windows,"Trim","Enter fuzz factor:",fuzz);
if (*fuzz == '\0')
@@ -7731,7 +7731,7 @@
case HueCommand:
{
static char
- hue_percent[MaxTextExtent] = "110";
+ hue_percent[MagickPathExtent] = "110";
/*
Query user for percent hue change.
@@ -7745,9 +7745,9 @@
*/
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(modulate_factors,"100.0/100.0/",MaxTextExtent);
+ (void) CopyMagickString(modulate_factors,"100.0/100.0/",MagickPathExtent);
(void) ConcatenateMagickString(modulate_factors,hue_percent,
- MaxTextExtent);
+ MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
if (IfMagickTrue(windows->image.orphan) )
@@ -7759,7 +7759,7 @@
case SaturationCommand:
{
static char
- saturation_percent[MaxTextExtent] = "110";
+ saturation_percent[MagickPathExtent] = "110";
/*
Query user for percent saturation change.
@@ -7773,9 +7773,9 @@
*/
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(modulate_factors,"100.0/",MaxTextExtent);
+ (void) CopyMagickString(modulate_factors,"100.0/",MagickPathExtent);
(void) ConcatenateMagickString(modulate_factors,saturation_percent,
- MaxTextExtent);
+ MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
if (IfMagickTrue(windows->image.orphan) )
@@ -7787,7 +7787,7 @@
case BrightnessCommand:
{
static char
- brightness_percent[MaxTextExtent] = "110";
+ brightness_percent[MagickPathExtent] = "110";
/*
Query user for percent brightness change.
@@ -7802,7 +7802,7 @@
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
(void) CopyMagickString(modulate_factors,brightness_percent,
- MaxTextExtent);
+ MagickPathExtent);
(void) ModulateImage(*image,modulate_factors,exception);
XSetCursorState(display,windows,MagickFalse);
if (IfMagickTrue(windows->image.orphan) )
@@ -7814,7 +7814,7 @@
case GammaCommand:
{
static char
- factor[MaxTextExtent] = "1.6";
+ factor[MagickPathExtent] = "1.6";
/*
Query user for gamma value.
@@ -7873,7 +7873,7 @@
white_point;
static char
- levels[MaxTextExtent] = "1%";
+ levels[MagickPathExtent] = "1%";
/*
Query user for gamma value.
@@ -7914,7 +7914,7 @@
flags;
static char
- levels[MaxTextExtent] = "3x50%";
+ levels[MagickPathExtent] = "3x50%";
/*
Query user for gamma value.
@@ -8009,7 +8009,7 @@
*affinity_image;
static char
- filename[MaxTextExtent] = "\0";
+ filename[MagickPathExtent] = "\0";
/*
Request image file name from user.
@@ -8022,7 +8022,7 @@
*/
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
affinity_image=ReadImage(image_info,exception);
if (affinity_image != (Image *) NULL)
{
@@ -8043,7 +8043,7 @@
status;
static char
- colors[MaxTextExtent] = "256";
+ colors[MagickPathExtent] = "256";
/*
Query user for maximum number of colors.
@@ -8098,7 +8098,7 @@
*emboss_image;
static char
- radius[MaxTextExtent] = "0.0x1.0";
+ radius[MagickPathExtent] = "0.0x1.0";
/*
Query user for emboss radius.
@@ -8136,7 +8136,7 @@
*noise_image;
static char
- radius[MaxTextExtent] = "0";
+ radius[MagickPathExtent] = "0";
/*
Query user for noise radius.
@@ -8175,7 +8175,7 @@
*noise_image;
static char
- noise_type[MaxTextExtent] = "Gaussian";
+ noise_type[MagickPathExtent] = "Gaussian";
/*
Add noise to the image.
@@ -8212,7 +8212,7 @@
*sharp_image;
static char
- radius[MaxTextExtent] = "0.0x1.0";
+ radius[MagickPathExtent] = "0.0x1.0";
/*
Query user for sharpen radius.
@@ -8248,7 +8248,7 @@
*blur_image;
static char
- radius[MaxTextExtent] = "0.0x1.0";
+ radius[MagickPathExtent] = "0.0x1.0";
/*
Query user for blur radius.
@@ -8284,7 +8284,7 @@
threshold;
static char
- factor[MaxTextExtent] = "128";
+ factor[MagickPathExtent] = "128";
/*
Query user for threshold value.
@@ -8313,7 +8313,7 @@
*edge_image;
static char
- radius[MaxTextExtent] = "0";
+ radius[MagickPathExtent] = "0";
/*
Query user for edge factor.
@@ -8348,7 +8348,7 @@
*spread_image;
static char
- amount[MaxTextExtent] = "2";
+ amount[MagickPathExtent] = "2";
/*
Query user for spread amount.
@@ -8386,7 +8386,7 @@
status;
static char
- geometry[MaxTextExtent] = "30x30";
+ geometry[MagickPathExtent] = "30x30";
/*
Query user for the shade geometry.
@@ -8421,7 +8421,7 @@
case RaiseCommand:
{
static char
- bevel_width[MaxTextExtent] = "10";
+ bevel_width[MagickPathExtent] = "10";
/*
Query user for bevel width.
@@ -8449,7 +8449,7 @@
case SegmentCommand:
{
static char
- threshold[MaxTextExtent] = "1.0x1.5";
+ threshold[MagickPathExtent] = "1.0x1.5";
/*
Query user for smoothing threshold.
@@ -8484,7 +8484,7 @@
*sepia_image;
static char
- factor[MaxTextExtent] = "80%";
+ factor[MagickPathExtent] = "80%";
/*
Query user for sepia-tone factor.
@@ -8519,7 +8519,7 @@
threshold;
static char
- factor[MaxTextExtent] = "60%";
+ factor[MagickPathExtent] = "60%";
/*
Query user for solarize factor.
@@ -8548,7 +8548,7 @@
*swirl_image;
static char
- degrees[MaxTextExtent] = "60";
+ degrees[MagickPathExtent] = "60";
/*
Query user for swirl angle.
@@ -8584,7 +8584,7 @@
*implode_image;
static char
- factor[MaxTextExtent] = "0.3";
+ factor[MagickPathExtent] = "0.3";
/*
Query user for implode factor.
@@ -8620,7 +8620,7 @@
*vignette_image;
static char
- geometry[MaxTextExtent] = "0x20";
+ geometry[MagickPathExtent] = "0x20";
/*
Query user for the vignette geometry.
@@ -8663,7 +8663,7 @@
*wave_image;
static char
- geometry[MaxTextExtent] = "25x150";
+ geometry[MagickPathExtent] = "25x150";
/*
Query user for the wave geometry.
@@ -8701,7 +8701,7 @@
*paint_image;
static char
- radius[MaxTextExtent] = "0";
+ radius[MagickPathExtent] = "0";
/*
Query user for circular neighborhood radius.
@@ -8737,7 +8737,7 @@
*charcoal_image;
static char
- radius[MaxTextExtent] = "0x1";
+ radius[MagickPathExtent] = "0x1";
/*
Query user for charcoal radius.
@@ -8848,7 +8848,7 @@
*border_image;
static char
- geometry[MaxTextExtent] = "6x6";
+ geometry[MagickPathExtent] = "6x6";
/*
Query user for border color and geometry.
@@ -8897,7 +8897,7 @@
*frame_image;
static char
- geometry[MaxTextExtent] = "6x6";
+ geometry[MagickPathExtent] = "6x6";
/*
Query user for frame color and geometry.
@@ -9013,7 +9013,7 @@
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
(void) AcquireUniqueFilename(filename);
- (void) FormatLocaleString((*image)->filename,MaxTextExtent,"launch:%s",
+ (void) FormatLocaleString((*image)->filename,MagickPathExtent,"launch:%s",
filename);
status=WriteImage(image_info,*image,exception);
if (IfMagickFalse(status) )
@@ -9067,7 +9067,7 @@
*preview_image;
static char
- preview_type[MaxTextExtent] = "Gamma";
+ preview_type[MagickPathExtent] = "Gamma";
/*
Select preview type from menu.
@@ -9092,15 +9092,15 @@
(void) DeleteImageProperty(*image,"label");
(void) SetImageProperty(*image,"label","Preview",exception);
(void) AcquireUniqueFilename(filename);
- (void) FormatLocaleString((*image)->filename,MaxTextExtent,"preview:%s",
+ (void) FormatLocaleString((*image)->filename,MagickPathExtent,"preview:%s",
filename);
status=WriteImage(image_info,*image,exception);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
preview_image=ReadImage(image_info,exception);
(void) RelinquishUniqueFileResource(filename);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(preview_image->filename,MaxTextExtent,"show:%s",
+ (void) FormatLocaleString(preview_image->filename,MagickPathExtent,"show:%s",
filename);
status=WriteImage(image_info,preview_image,exception);
preview_image=DestroyImage(preview_image);
@@ -9125,15 +9125,15 @@
(void) DeleteImageProperty(*image,"label");
(void) SetImageProperty(*image,"label","Histogram",exception);
(void) AcquireUniqueFilename(filename);
- (void) FormatLocaleString((*image)->filename,MaxTextExtent,"histogram:%s",
+ (void) FormatLocaleString((*image)->filename,MagickPathExtent,"histogram:%s",
filename);
status=WriteImage(image_info,*image,exception);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
histogram_image=ReadImage(image_info,exception);
(void) RelinquishUniqueFileResource(filename);
if (histogram_image == (Image *) NULL)
break;
- (void) FormatLocaleString(histogram_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,
"show:%s",filename);
status=WriteImage(image_info,histogram_image,exception);
histogram_image=DestroyImage(histogram_image);
@@ -9164,15 +9164,15 @@
(void) DeleteImageProperty(*image,"label");
(void) SetImageProperty(*image,"label","Matte",exception);
(void) AcquireUniqueFilename(filename);
- (void) FormatLocaleString((*image)->filename,MaxTextExtent,"matte:%s",
+ (void) FormatLocaleString((*image)->filename,MagickPathExtent,"matte:%s",
filename);
status=WriteImage(image_info,*image,exception);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
matte_image=ReadImage(image_info,exception);
(void) RelinquishUniqueFileResource(filename);
if (matte_image == (Image *) NULL)
break;
- (void) FormatLocaleString(matte_image->filename,MaxTextExtent,"show:%s",
+ (void) FormatLocaleString(matte_image->filename,MagickPathExtent,"show:%s",
filename);
status=WriteImage(image_info,matte_image,exception);
matte_image=DestroyImage(matte_image);
@@ -9200,7 +9200,7 @@
case SlideShowCommand:
{
static char
- delay[MaxTextExtent] = "5";
+ delay[MagickPathExtent] = "5";
/*
Display next image after pausing.
@@ -9255,14 +9255,14 @@
if (mozilla_window != (Window) NULL)
{
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*url;
/*
Display documentation using Netscape remote control.
*/
url=GetMagickHomeURL();
- (void) FormatLocaleString(command,MaxTextExtent,
+ (void) FormatLocaleString(command,MagickPathExtent,
"openurl(%s,new-tab)",url);
url=DestroyString(url);
mozilla_atom=XInternAtom(display,"_MOZILLA_COMMAND",MagickFalse);
@@ -9336,7 +9336,7 @@
ExceptionInfo *exception)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
register int
x,
@@ -9374,7 +9374,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
windows->magnify.x,windows->magnify.y);
XInfoWidget(display,windows,text);
}
@@ -9649,7 +9649,7 @@
ExceptionInfo *exception)
{
static char
- matte[MaxTextExtent] = "0";
+ matte[MagickPathExtent] = "0";
static const char
*MatteEditMenu[] =
@@ -9683,8 +9683,8 @@
border_color = { 0, 0, 0, 0, 0, 0 };
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
Cursor
cursor;
@@ -9742,7 +9742,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+d%+d ",
x+windows->image.x,y+windows->image.y);
XInfoWidget(display,windows,text);
}
@@ -9807,7 +9807,7 @@
if (pen_number == (MaxNumberPens-2))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -9827,7 +9827,7 @@
case MatteEditFuzzCommand:
{
static char
- fuzz[MaxTextExtent];
+ fuzz[MagickPathExtent];
static const char
*FuzzMenu[] =
@@ -9854,12 +9854,12 @@
QuantumRange+1.0);
break;
}
- (void) CopyMagickString(fuzz,"20%",MaxTextExtent);
+ (void) CopyMagickString(fuzz,"20%",MagickPathExtent);
(void) XDialogWidget(display,windows,"Ok",
"Enter fuzz factor (0.0 - 99.9%):",fuzz);
if (*fuzz == '\0')
break;
- (void) ConcatenateMagickString(fuzz,"%",MaxTextExtent);
+ (void) ConcatenateMagickString(fuzz,"%",MagickPathExtent);
(*image)->fuzz=StringToDoubleInterval(fuzz,(double) QuantumRange+
1.0);
break;
@@ -9867,7 +9867,7 @@
case MatteEditValueCommand:
{
static char
- message[MaxTextExtent];
+ message[MagickPathExtent];
static const char
*MatteMenu[] =
@@ -9887,14 +9887,14 @@
break;
if (entry != 2)
{
- (void) FormatLocaleString(matte,MaxTextExtent,QuantumFormat,
+ (void) FormatLocaleString(matte,MagickPathExtent,QuantumFormat,
OpaqueAlpha);
if (LocaleCompare(MatteMenu[entry],"Transparent") == 0)
- (void) FormatLocaleString(matte,MaxTextExtent,QuantumFormat,
+ (void) FormatLocaleString(matte,MagickPathExtent,QuantumFormat,
(Quantum) TransparentAlpha);
break;
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"Enter matte value (0 - " QuantumFormat "):",(Quantum)
QuantumRange);
(void) XDialogWidget(display,windows,"Matte",message,matte);
@@ -9972,7 +9972,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -10253,7 +10253,7 @@
*image_info;
static char
- filename[MaxTextExtent] = "\0";
+ filename[MagickPathExtent] = "\0";
/*
Request file name from user.
@@ -10306,18 +10306,18 @@
image_info=CloneImageInfo(resource_info->image_info);
(void) SetImageInfoProgressMonitor(image_info,(MagickProgressMonitor) NULL,
(void *) NULL);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
exception=AcquireExceptionInfo();
(void) SetImageInfo(image_info,0,exception);
if (LocaleCompare(image_info->magick,"X") == 0)
{
char
- seconds[MaxTextExtent];
+ seconds[MagickPathExtent];
/*
User may want to delay the X server screen grab.
*/
- (void) CopyMagickString(seconds,"0",MaxTextExtent);
+ (void) CopyMagickString(seconds,"0",MagickPathExtent);
(void) XDialogWidget(display,windows,"Grab","Enter any delay in seconds:",
seconds);
if (*seconds == '\0')
@@ -10329,14 +10329,14 @@
GetMagickRawSupport(magick_info) == MagickTrue)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
/*
Request image size from the user.
*/
- (void) CopyMagickString(geometry,"512x512",MaxTextExtent);
+ (void) CopyMagickString(geometry,"512x512",MagickPathExtent);
if (image_info->size != (char *) NULL)
- (void) CopyMagickString(geometry,image_info->size,MaxTextExtent);
+ (void) CopyMagickString(geometry,image_info->size,MagickPathExtent);
(void) XDialogWidget(display,windows,"Load","Enter the image geometry:",
geometry);
(void) CloneString(&image_info->size,geometry);
@@ -10346,7 +10346,7 @@
*/
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
nexus=ReadImage(image_info,exception);
CatchException(exception);
XSetCursorState(display,windows,MagickFalse);
@@ -10369,12 +10369,12 @@
if (textlist != (char **) NULL)
{
char
- title[MaxTextExtent];
+ title[MagickPathExtent];
register int
i;
- (void) FormatLocaleString(title,MaxTextExtent,
+ (void) FormatLocaleString(title,MagickPathExtent,
"Unknown format: %s",filename);
XTextViewWidget(display,resource_info,windows,MagickTrue,title,
(const char **) textlist);
@@ -10424,7 +10424,7 @@
ExceptionInfo *exception)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
Cursor
cursor;
@@ -10534,7 +10534,7 @@
*/
windows->image.x=(int) pan_info.x;
windows->image.y=(int) pan_info.y;
- (void) FormatLocaleString(text,MaxTextExtent," %ux%u%+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %ux%u%+d%+d ",
windows->image.width,windows->image.height,windows->image.x,
windows->image.y);
XInfoWidget(display,windows,text);
@@ -10619,7 +10619,7 @@
compose = CopyCompositeOp;
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
Cursor
cursor;
@@ -10686,7 +10686,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+ld%+ld ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+ld%+ld ",
(long) paste_info.x,(long) paste_info.y);
XInfoWidget(display,windows,text);
}
@@ -10714,7 +10714,7 @@
case PasteOperatorsCommand:
{
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
**operators;
/*
@@ -10808,7 +10808,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -10969,8 +10969,8 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- geometry[MaxTextExtent];
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent];
Image
*print_image;
@@ -10985,9 +10985,9 @@
Request Postscript page geometry from user.
*/
image_info=CloneImageInfo(resource_info->image_info);
- (void) FormatLocaleString(geometry,MaxTextExtent,"Letter");
+ (void) FormatLocaleString(geometry,MagickPathExtent,"Letter");
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(geometry,image_info->page,MagickPathExtent);
XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select",
"Select Postscript Page Geometry:",geometry);
if (*geometry == '\0')
@@ -11001,7 +11001,7 @@
print_image=CloneImage(image,0,0,MagickTrue,exception);
if (print_image == (Image *) NULL)
return(MagickFalse);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%dx%d!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%dx%d!",
windows->image.ximage->width,windows->image.ximage->height);
(void) TransformImage(&print_image,windows->image.crop_geometry,geometry,
exception);
@@ -11009,7 +11009,7 @@
Print image.
*/
(void) AcquireUniqueFilename(filename);
- (void) FormatLocaleString(print_image->filename,MaxTextExtent,"print:%s",
+ (void) FormatLocaleString(print_image->filename,MagickPathExtent,"print:%s",
filename);
status=WriteImage(image_info,print_image,exception);
(void) RelinquishUniqueFileResource(filename);
@@ -11265,8 +11265,8 @@
};
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
CommandType
command_type;
@@ -11332,7 +11332,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %+ld%+ld ",
+ (void) FormatLocaleString(text,MagickPathExtent," %+ld%+ld ",
(long) roi_info.x,(long) roi_info.y);
XInfoWidget(display,windows,text);
}
@@ -11490,7 +11490,7 @@
*/
if (IfMagickFalse(windows->info.mapped) )
(void) XMapWindow(display,windows->info.id);
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
roi_info.height,(double) roi_info.x,(double) roi_info.y);
XInfoWidget(display,windows,text);
@@ -11588,7 +11588,7 @@
/*
Display pointer position.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
" %.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
roi_info.height,(double) roi_info.x,(double) roi_info.y);
XInfoWidget(display,windows,text);
@@ -11689,7 +11689,7 @@
id=XCommandWidget(display,windows,ApplyMenu,&event);
if (id >= 0)
{
- (void) CopyMagickString(command,ApplyMenu[id],MaxTextExtent);
+ (void) CopyMagickString(command,ApplyMenu[id],MagickPathExtent);
command_type=ApplyCommands[id];
if (id < ApplyMenus)
{
@@ -11701,7 +11701,7 @@
if (entry >= 0)
{
(void) CopyMagickString(command,Menus[id][entry],
- MaxTextExtent);
+ MagickPathExtent);
command_type=Commands[id][entry];
}
}
@@ -11931,7 +11931,7 @@
/*
Set primary selection.
*/
- (void) FormatLocaleString(text,MaxTextExtent,
+ (void) FormatLocaleString(text,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) roi_info.width,(double)
roi_info.height,(double) roi_info.x,(double) roi_info.y);
request=(&(event.xselectionrequest));
@@ -12040,8 +12040,8 @@
pen_id = 0;
char
- command[MaxTextExtent],
- text[MaxTextExtent];
+ command[MagickPathExtent],
+ text[MagickPathExtent];
Image
*rotate_image;
@@ -12145,7 +12145,7 @@
if (pen_number == (MaxNumberPens-2))
{
static char
- color_name[MaxTextExtent] = "gray";
+ color_name[MagickPathExtent] = "gray";
/*
Select a pen color from a dialog.
@@ -12232,7 +12232,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -12307,7 +12307,7 @@
*/
if (IfMagickFalse(windows->info.mapped) )
(void) XMapWindow(display,windows->info.id);
- (void) FormatLocaleString(text,MaxTextExtent," %g",
+ (void) FormatLocaleString(text,MagickPathExtent," %g",
direction == VerticalRotateCommand ? degrees-90.0 : degrees);
XInfoWidget(display,windows,text);
XHighlightLine(display,windows->image.id,
@@ -12424,7 +12424,7 @@
/*
Rotate 90 degrees.
*/
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",height,width,(int) (*image)->columns-
(int) height-y,x);
break;
@@ -12434,7 +12434,7 @@
/*
Rotate 180 degrees.
*/
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,(int) width-x,(int) height-y);
break;
}
@@ -12443,7 +12443,7 @@
/*
Rotate 270 degrees.
*/
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",height,width,y,(int) (*image)->rows-(int) width-x);
break;
}
@@ -12521,8 +12521,8 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- geometry[MaxTextExtent];
+ filename[MagickPathExtent],
+ geometry[MagickPathExtent];
Image
*save_image;
@@ -12538,11 +12538,11 @@
*/
if (resource_info->write_filename != (char *) NULL)
(void) CopyMagickString(filename,resource_info->write_filename,
- MaxTextExtent);
+ MagickPathExtent);
else
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
int
status;
@@ -12573,13 +12573,13 @@
return(MagickTrue);
}
image_info=CloneImageInfo(resource_info->image_info);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
(void) SetImageInfo(image_info,1,exception);
if ((LocaleCompare(image_info->magick,"JPEG") == 0) ||
(LocaleCompare(image_info->magick,"JPG") == 0))
{
char
- quality[MaxTextExtent];
+ quality[MagickPathExtent];
int
status;
@@ -12587,7 +12587,7 @@
/*
Request JPEG quality from user.
*/
- (void) FormatLocaleString(quality,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(quality,MagickPathExtent,"%.20g",(double)
image->quality);
status=XDialogWidget(display,windows,"Save","Enter JPEG quality:",
quality);
@@ -12602,16 +12602,16 @@
(LocaleCompare(image_info->magick,"PS2") == 0))
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
/*
Request page geometry from user.
*/
- (void) CopyMagickString(geometry,PSPageGeometry,MaxTextExtent);
+ (void) CopyMagickString(geometry,PSPageGeometry,MagickPathExtent);
if (LocaleCompare(image_info->magick,"PDF") == 0)
- (void) CopyMagickString(geometry,PSPageGeometry,MaxTextExtent);
+ (void) CopyMagickString(geometry,PSPageGeometry,MagickPathExtent);
if (image_info->page != (char *) NULL)
- (void) CopyMagickString(geometry,image_info->page,MaxTextExtent);
+ (void) CopyMagickString(geometry,image_info->page,MagickPathExtent);
XListBrowserWidget(display,windows,&windows->widget,PageSizes,"Select",
"Select page geometry:",geometry);
if (*geometry != '\0')
@@ -12625,14 +12625,14 @@
save_image=CloneImage(image,0,0,MagickTrue,exception);
if (save_image == (Image *) NULL)
return(MagickFalse);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%dx%d!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%dx%d!",
windows->image.ximage->width,windows->image.ximage->height);
(void) TransformImage(&save_image,windows->image.crop_geometry,geometry,
exception);
/*
Write image.
*/
- (void) CopyMagickString(save_image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(save_image->filename,filename,MagickPathExtent);
status=WriteImage(image_info,save_image,exception);
if (IfMagickTrue(status) )
image->taint=MagickFalse;
@@ -12838,7 +12838,7 @@
case KeyPress:
{
char
- command[MaxTextExtent];
+ command[MagickPathExtent];
KeySym
key_symbol;
@@ -12951,7 +12951,7 @@
RectangleInfo *crop_info,Image *image)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
int
x,
@@ -12969,7 +12969,7 @@
/*
Display info on cropping rectangle.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %.20gx%.20g%+.20g%+.20g",
+ (void) FormatLocaleString(text,MagickPathExtent," %.20gx%.20g%+.20g%+.20g",
(double) crop_info->width,(double) crop_info->height,(double)
crop_info->x,(double) crop_info->y);
XInfoWidget(display,windows,text);
@@ -13000,7 +13000,7 @@
height=(unsigned int) (scale_factor*crop_info->height+0.5);
if (height == 0)
height=1;
- (void) FormatLocaleString(windows->image.crop_geometry,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.crop_geometry,MagickPathExtent,
"%ux%u%+d%+d",width,height,x,y);
}
@@ -13068,8 +13068,8 @@
};
char
- command[MaxTextExtent],
- filename[MaxTextExtent];
+ command[MagickPathExtent],
+ filename[MagickPathExtent];
Image
*tile_image;
@@ -13171,9 +13171,9 @@
*/
XCheckRefreshWindows(display,windows);
(void) CopyMagickString(resource_info->image_info->magick,"MIFF",
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(resource_info->image_info->filename,filename,
- MaxTextExtent);
+ MagickPathExtent);
tile_image=ReadImage(resource_info->image_info,exception);
CatchException(exception);
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
@@ -13327,7 +13327,7 @@
Image *image,const KeySym key_symbol)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
int
x,
@@ -13400,7 +13400,7 @@
/*
Refresh Image window.
*/
- (void) FormatLocaleString(text,MaxTextExtent," %ux%u%+d%+d ",
+ (void) FormatLocaleString(text,MagickPathExtent," %ux%u%+d%+d ",
windows->image.width,windows->image.height,windows->image.x,
windows->image.y);
XInfoWidget(display,windows,text);
@@ -13617,8 +13617,8 @@
i;
static char
- filename[MaxTextExtent] = "\0",
- filenames[MaxTextExtent] = "*";
+ filename[MagickPathExtent] = "\0",
+ filenames[MagickPathExtent] = "*";
XResourceInfo
background_resources;
@@ -13656,7 +13656,7 @@
*/
background_resources=(*resource_info);
background_resources.window_id=AcquireString("");
- (void) FormatLocaleString(background_resources.window_id,MaxTextExtent,
+ (void) FormatLocaleString(background_resources.window_id,MagickPathExtent,
"0x%lx",windows->image.id);
background_resources.backdrop=MagickTrue;
/*
@@ -13674,7 +13674,7 @@
XCheckRefreshWindows(display,windows);
for (i=0; i < (int) number_files; 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);
@@ -13727,7 +13727,7 @@
montage_info->pointsize=10;
if (resource_info->font != (char *) NULL)
(void) CloneString(&montage_info->font,resource_info->font);
- (void) CopyMagickString(montage_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(montage_info->filename,filename,MagickPathExtent);
montage_image=MontageImageList(read_info,montage_info,GetFirstImageInList(
images),exception);
images=DestroyImageList(images);
@@ -13775,8 +13775,8 @@
XResourceInfo *resource_info,Image *image,ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent],
- visual_type[MaxTextExtent];
+ geometry[MagickPathExtent],
+ visual_type[MagickPathExtent];
int
height,
@@ -13844,10 +13844,10 @@
*/
window_attributes.width=XDisplayWidth(display,XDefaultScreen(display));
window_attributes.height=XDisplayHeight(display,XDefaultScreen(display));
- (void) CopyMagickString(visual_type,"default",MaxTextExtent);
+ (void) CopyMagickString(visual_type,"default",MagickPathExtent);
status=XGetWindowAttributes(display,window_info.id,&window_attributes);
if (status != 0)
- (void) FormatLocaleString(visual_type,MaxTextExtent,"0x%lx",
+ (void) FormatLocaleString(visual_type,MagickPathExtent,"0x%lx",
XVisualIDFromVisual(window_attributes.visual));
if (visual_info == (XVisualInfo *) NULL)
{
@@ -13914,7 +13914,7 @@
(image->rows != window_info.height))
ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage",
image->filename);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%ux%u+0+0>",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%ux%u+0+0>",
window_attributes.width,window_attributes.height);
geometry_info.width=window_info.width;
geometry_info.height=window_info.height;
@@ -13964,7 +13964,7 @@
(*resources.image_geometry != '\0'))
{
char
- default_geometry[MaxTextExtent];
+ default_geometry[MagickPathExtent];
int
flags,
@@ -13981,7 +13981,7 @@
ThrowXWindowFatalException(ResourceLimitFatalError,
"MemoryAllocationFailed",image->filename);
size_hints->flags=0L;
- (void) FormatLocaleString(default_geometry,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(default_geometry,MagickPathExtent,"%dx%d",
width,height);
flags=XWMGeometry(display,visual_info->screen,resources.image_geometry,
default_geometry,window_info.border_width,size_hints,&window_info.x,
@@ -14413,10 +14413,10 @@
};
char
- command[MaxTextExtent],
+ command[MagickPathExtent],
*directory,
- geometry[MaxTextExtent],
- resource_name[MaxTextExtent];
+ geometry[MagickPathExtent],
+ resource_name[MagickPathExtent];
CommandType
command_type;
@@ -14443,7 +14443,7 @@
i;
static char
- working_directory[MaxTextExtent];
+ working_directory[MagickPathExtent];
static XPoint
vid_info;
@@ -14524,7 +14524,7 @@
status;
if (*working_directory == '\0')
- (void) CopyMagickString(working_directory,".",MaxTextExtent);
+ (void) CopyMagickString(working_directory,".",MagickPathExtent);
status=chdir(working_directory);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
@@ -14697,34 +14697,34 @@
title=InterpretImageProperties(resource_info->image_info,display_image,
resource_info->title,exception);
- (void) CopyMagickString(windows->image.name,title,MaxTextExtent);
- (void) CopyMagickString(windows->image.icon_name,title,MaxTextExtent);
+ (void) CopyMagickString(windows->image.name,title,MagickPathExtent);
+ (void) CopyMagickString(windows->image.icon_name,title,MagickPathExtent);
title=DestroyString(title);
}
else
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
/*
Window name is the base of the filename.
*/
GetPathComponent(display_image->magick_filename,TailPath,filename);
if (display_image->scene == 0)
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s",MagickPackageName,filename);
else
- (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->image.name,MagickPathExtent,
"%s: %s[scene: %.20g frames: %.20g]",MagickPackageName,filename,
(double) display_image->scene,(double) GetImageListLength(
display_image));
- (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent);
+ (void) CopyMagickString(windows->image.icon_name,filename,MagickPathExtent);
}
if (resource_info->immutable)
windows->image.immutable=MagickTrue;
windows->image.use_pixmap=resource_info->use_pixmap;
windows->image.geometry=resource_info->image_geometry;
- (void) FormatLocaleString(geometry,MaxTextExtent,"%ux%u+0+0>!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%ux%u+0+0>!",
XDisplayWidth(display,visual_info->screen),
XDisplayHeight(display,visual_info->screen));
geometry_info.width=display_image->columns;
@@ -14851,7 +14851,7 @@
resource_info,&windows->command);
windows->command.data=MagickMenus;
(void) XCommandWidget(display,windows,CommandMenu,(XEvent *) NULL);
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.command",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.command",
resource_info->client_name);
windows->command.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
@@ -14883,7 +14883,7 @@
*/
XGetWindowInfo(display,visual_info,map_info,pixel,font_info,
resource_info,&windows->widget);
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.widget",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.widget",
resource_info->client_name);
windows->widget.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
@@ -14938,11 +14938,11 @@
resource_info,&windows->magnify);
if (IfMagickFalse(resource_info->use_shared_memory) )
windows->magnify.shared_memory=MagickFalse;
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.magnify",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.magnify",
resource_info->client_name);
windows->magnify.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
- (void) FormatLocaleString(windows->magnify.name,MaxTextExtent,"Magnify %uX",
+ (void) FormatLocaleString(windows->magnify.name,MagickPathExtent,"Magnify %uX",
resource_info->magnify);
if (windows->magnify.cursor != (Cursor) NULL)
(void) XFreeCursor(display,windows->magnify.cursor);
@@ -14982,7 +14982,7 @@
(void) CloneString(&windows->pan.name,"Pan Icon");
windows->pan.width=windows->icon.width;
windows->pan.height=windows->icon.height;
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.pan",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.pan",
resource_info->client_name);
windows->pan.geometry=XGetResourceClass(resource_info->resource_database,
resource_name,"geometry",(char *) NULL);
@@ -15097,7 +15097,7 @@
Redisplay image.
*/
(void) FormatLocaleString(
- resource_info->image_info->filename,MaxTextExtent,
+ resource_info->image_info->filename,MagickPathExtent,
"%s:%s",display_image->magick,
display_image->filename);
nexus=ReadImage(resource_info->image_info,exception);
@@ -15135,7 +15135,7 @@
id=XCommandWidget(display,windows,CommandMenu,&event);
if (id < 0)
continue;
- (void) CopyMagickString(command,CommandMenu[id],MaxTextExtent);
+ (void) CopyMagickString(command,CommandMenu[id],MagickPathExtent);
command_type=CommandMenus[id];
if (id < MagickMenus)
{
@@ -15146,7 +15146,7 @@
command);
if (entry < 0)
continue;
- (void) CopyMagickString(command,Menus[id][entry],MaxTextExtent);
+ (void) CopyMagickString(command,Menus[id][entry],MagickPathExtent);
command_type=Commands[id][entry];
}
if (command_type != NullCommand)
@@ -15464,7 +15464,7 @@
break;
selection=XInternAtom(display,"DndSelection",MagickFalse);
status=XGetWindowProperty(display,root_window,selection,0L,(long)
- MaxTextExtent,MagickFalse,(Atom) AnyPropertyType,&type,&format,
+ MagickPathExtent,MagickFalse,(Atom) AnyPropertyType,&type,&format,
&length,&after,&data);
if ((status != Success) || (length == 0))
break;
@@ -15474,7 +15474,7 @@
Offix DND.
*/
(void) CopyMagickString(resource_info->image_info->filename,
- (char *) data,MaxTextExtent);
+ (char *) data,MagickPathExtent);
}
else
{
@@ -15487,7 +15487,7 @@
break;
}
(void) CopyMagickString(resource_info->image_info->filename,
- ((char *) data)+5,MaxTextExtent);
+ ((char *) data)+5,MagickPathExtent);
}
nexus=ReadImage(resource_info->image_info,exception);
CatchException(exception);
@@ -15946,7 +15946,7 @@
Display image named by the remote command protocol.
*/
status=XGetWindowProperty(display,event.xproperty.window,
- event.xproperty.atom,0L,(long) MaxTextExtent,MagickFalse,(Atom)
+ event.xproperty.atom,0L,(long) MagickPathExtent,MagickFalse,(Atom)
AnyPropertyType,&type,&format,&length,&after,&data);
if ((status != Success) || (length == 0))
break;
@@ -15958,7 +15958,7 @@
break;
}
(void) CopyMagickString(resource_info->image_info->filename,
- (char *) data,MaxTextExtent);
+ (char *) data,MagickPathExtent);
(void) XFree((void *) data);
nexus=ReadImage(resource_info->image_info,exception);
CatchException(exception);
@@ -16132,14 +16132,14 @@
/*
Change to home directory.
*/
- directory=getcwd(working_directory,MaxTextExtent);
+ directory=getcwd(working_directory,MagickPathExtent);
(void) directory;
{
int
status;
if (*resource_info->home_directory == '\0')
- (void) CopyMagickString(resource_info->home_directory,".",MaxTextExtent);
+ (void) CopyMagickString(resource_info->home_directory,".",MagickPathExtent);
status=chdir(resource_info->home_directory);
if (status == -1)
(void) ThrowMagickException(exception,GetMagickModule(),FileOpenError,
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index f49fa5e..f9a65b5 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1959,12 +1959,12 @@
if ( IfStringTrue(GetImageArtifact(image,"verbose")) ) {
register ssize_t
i;
- char image_gen[MaxTextExtent];
+ char image_gen[MagickPathExtent];
const char *lookup;
/* Set destination image size and virtual offset */
if ( bestfit || viewport_given ) {
- (void) FormatLocaleString(image_gen, MaxTextExtent," -size %.20gx%.20g "
+ (void) FormatLocaleString(image_gen, MagickPathExtent," -size %.20gx%.20g "
"-page %+.20g%+.20g xc: +insert \\\n",(double) geometry.width,
(double) geometry.height,(double) geometry.x,(double) geometry.y);
lookup="v.p{ xx-v.page.x-.5, yy-v.page.y-.5 }";
diff --git a/MagickCore/distribute-cache-private.h b/MagickCore/distribute-cache-private.h
index 36eaf2a..33827e8 100644
--- a/MagickCore/distribute-cache-private.h
+++ b/MagickCore/distribute-cache-private.h
@@ -34,7 +34,7 @@
session_key;
char
- hostname[MaxTextExtent];
+ hostname[MagickPathExtent];
int
port;
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 93cf26f..adf1507 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -174,7 +174,7 @@
{
#if defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE)
char
- service[MaxTextExtent];
+ service[MagickPathExtent];
const char
*shared_secret;
@@ -193,7 +193,7 @@
*result;
unsigned char
- secret[MaxTextExtent];
+ secret[MagickPathExtent];
/*
Connect to distributed pixel cache and get session key.
@@ -213,7 +213,7 @@
hint.ai_family=AF_INET;
hint.ai_socktype=SOCK_STREAM;
hint.ai_flags=AI_PASSIVE;
- (void) FormatLocaleString(service,MaxTextExtent,"%d",port);
+ (void) FormatLocaleString(service,MagickPathExtent,"%d",port);
status=getaddrinfo(hostname,service,&hint,&result);
if (status != 0)
{
@@ -239,7 +239,7 @@
"DistributedPixelCache","'%s'",hostname);
return(-1);
}
- count=recv(client_socket,CHAR_TYPE_CAST secret,MaxTextExtent,0);
+ count=recv(client_socket,CHAR_TYPE_CAST secret,MagickPathExtent,0);
if (count != -1)
{
StringInfo
@@ -349,7 +349,7 @@
else
{
server_info->session_key=session_key;
- (void) CopyMagickString(server_info->hostname,hostname,MaxTextExtent);
+ (void) CopyMagickString(server_info->hostname,hostname,MagickPathExtent);
server_info->debug=IsEventLogging();
}
hostname=DestroyString(hostname);
@@ -478,7 +478,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Open distributed pixel cache.
@@ -550,7 +550,7 @@
*q;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Read distributed pixel cache metacontent.
@@ -607,7 +607,7 @@
*q;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Read distributed pixel cache pixels.
@@ -669,7 +669,7 @@
*p;
unsigned char
- message[MaxTextExtent],
+ message[MagickPathExtent],
*metacontent;
/*
@@ -727,7 +727,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Write distributed pixel cache pixels.
@@ -796,7 +796,7 @@
unsigned char
command,
- session[2*MaxTextExtent];
+ session[2*MagickPathExtent];
/*
Distributed pixel cache client.
@@ -805,7 +805,7 @@
if (shared_secret == (const char *) NULL)
ThrowFatalException(CacheFatalError,"shared secret expected");
p=session;
- (void) CopyMagickString((char *) p,shared_secret,MaxTextExtent);
+ (void) CopyMagickString((char *) p,shared_secret,MagickPathExtent);
p+=strlen(shared_secret);
random_info=AcquireRandomInfo();
secret=GetRandomKey(random_info,DPCSessionKeyLength);
@@ -885,7 +885,7 @@
{
#if defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE)
char
- service[MaxTextExtent];
+ service[MagickPathExtent];
int
status;
@@ -928,7 +928,7 @@
hint.ai_family=AF_INET;
hint.ai_socktype=SOCK_STREAM;
hint.ai_flags=AI_PASSIVE;
- (void) FormatLocaleString(service,MaxTextExtent,"%d",port);
+ (void) FormatLocaleString(service,MagickPathExtent,"%d",port);
status=getaddrinfo((const char *) NULL,service,&hint,&result);
if (status != 0)
ThrowFatalException(CacheFatalError,"UnableToListen");
@@ -1128,7 +1128,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Open distributed pixel cache.
@@ -1219,7 +1219,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Read distributed pixel cache metacontent.
@@ -1294,7 +1294,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Read distributed pixel cache pixels.
@@ -1362,7 +1362,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Delete distributed pixel cache.
@@ -1426,7 +1426,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Write distributed pixel cache metacontent.
@@ -1501,7 +1501,7 @@
*p;
unsigned char
- message[MaxTextExtent];
+ message[MagickPathExtent];
/*
Write distributed pixel cache pixels.
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index dbc082e..6dc242f 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1379,7 +1379,7 @@
const DrawInfo *draw_info,const char *name,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
Image
*clip_mask;
@@ -1398,7 +1398,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (const DrawInfo *) NULL);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s",name);
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s",name);
value=GetImageArtifact(image,filename);
if (value == (const char *) NULL)
return(MagickFalse);
@@ -1661,11 +1661,11 @@
current;
char
- key[2*MaxTextExtent],
- keyword[MaxTextExtent],
- geometry[MaxTextExtent],
- name[MaxTextExtent],
- pattern[MaxTextExtent],
+ key[2*MagickPathExtent],
+ keyword[MagickPathExtent],
+ geometry[MagickPathExtent],
+ name[MagickPathExtent],
+ pattern[MagickPathExtent],
*primitive,
*token;
@@ -1986,7 +1986,7 @@
if (LocaleCompare("fill",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(pattern,MaxTextExtent,"%s",token);
+ (void) FormatLocaleString(pattern,MagickPathExtent,"%s",token);
if (GetImageArtifact(image,pattern) != (const char *) NULL)
(void) DrawPatternPath(image,draw_info,token,
&graphic_context[n]->fill_pattern,exception);
@@ -2001,7 +2001,7 @@
pattern_info=AcquireImageInfo();
(void) CopyMagickString(pattern_info->filename,token,
- MaxTextExtent);
+ MagickPathExtent);
graphic_context[n]->fill_pattern=ReadImage(pattern_info,
exception);
CatchException(exception);
@@ -2261,10 +2261,10 @@
if (LocaleCompare("clip-path",token) == 0)
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(name,MaxTextExtent,"%s",token);
+ (void) FormatLocaleString(name,MagickPathExtent,"%s",token);
for (p=q; *q != '\0'; )
{
GetMagickToken(q,&q,token);
@@ -2283,17 +2283,17 @@
if (LocaleCompare("gradient",token) == 0)
{
char
- key[2*MaxTextExtent],
- name[MaxTextExtent],
- type[MaxTextExtent];
+ key[2*MagickPathExtent],
+ name[MagickPathExtent],
+ type[MagickPathExtent];
SegmentInfo
segment;
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);
segment.x1=StringToDouble(token,(char **) NULL);
GetMagickToken(q,&q,token);
@@ -2337,10 +2337,10 @@
bounds.y2=graphic_context[n]->affine.rx*segment.x2+
graphic_context[n]->affine.sy*segment.y2+
graphic_context[n]->affine.ty;
- (void) FormatLocaleString(key,MaxTextExtent,"%s",name);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s",name);
(void) SetImageArtifact(image,key,token);
- (void) FormatLocaleString(key,MaxTextExtent,"%s-geometry",name);
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name);
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"%gx%g%+.15g%+.15g",
MagickMax(fabs(bounds.x2-bounds.x1+1.0),1.0),
MagickMax(fabs(bounds.y2-bounds.y1+1.0),1.0),
@@ -2355,7 +2355,7 @@
bounds;
GetMagickToken(q,&q,token);
- (void) CopyMagickString(name,token,MaxTextExtent);
+ (void) CopyMagickString(name,token,MagickPathExtent);
GetMagickToken(q,&q,token);
bounds.x=(ssize_t) ceil(StringToDouble(token,(char **) NULL)-
0.5);
@@ -2385,10 +2385,10 @@
break;
}
(void) CopyMagickString(token,p,(size_t) (q-p-4+1));
- (void) FormatLocaleString(key,MaxTextExtent,"%s",name);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s",name);
(void) SetImageArtifact(image,key,token);
- (void) FormatLocaleString(key,MaxTextExtent,"%s-geometry",name);
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name);
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) bounds.width,(double)
bounds.height,(double) bounds.x,(double) bounds.y);
(void) SetImageArtifact(image,key,geometry);
@@ -2489,7 +2489,7 @@
if (LocaleCompare("stroke",keyword) == 0)
{
GetMagickToken(q,&q,token);
- (void) FormatLocaleString(pattern,MaxTextExtent,"%s",token);
+ (void) FormatLocaleString(pattern,MagickPathExtent,"%s",token);
if (GetImageArtifact(image,pattern) != (const char *) NULL)
(void) DrawPatternPath(image,draw_info,token,
&graphic_context[n]->stroke_pattern,exception);
@@ -2504,7 +2504,7 @@
pattern_info=AcquireImageInfo();
(void) CopyMagickString(pattern_info->filename,token,
- MaxTextExtent);
+ MagickPathExtent);
graphic_context[n]->stroke_pattern=ReadImage(pattern_info,
exception);
CatchException(exception);
@@ -3472,7 +3472,7 @@
ExceptionInfo *exception)
{
char
- property[MaxTextExtent];
+ property[MagickPathExtent];
const char
*geometry,
@@ -3493,11 +3493,11 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(draw_info != (const DrawInfo *) NULL);
assert(name != (const char *) NULL);
- (void) FormatLocaleString(property,MaxTextExtent,"%s",name);
+ (void) FormatLocaleString(property,MagickPathExtent,"%s",name);
path=GetImageArtifact(image,property);
if (path == (const char *) NULL)
return(MagickFalse);
- (void) FormatLocaleString(property,MaxTextExtent,"%s-geometry",name);
+ (void) FormatLocaleString(property,MagickPathExtent,"%s-geometry",name);
geometry=GetImageArtifact(image,property);
if (geometry == (const char *) NULL)
return(MagickFalse);
@@ -4408,7 +4408,7 @@
affine;
char
- composite_geometry[MaxTextExtent];
+ composite_geometry[MagickPathExtent];
Image
*composite_image;
@@ -4432,7 +4432,7 @@
else
{
(void) CopyMagickString(clone_info->filename,primitive_info->text,
- MaxTextExtent);
+ MagickPathExtent);
composite_image=ReadImage(clone_info,exception);
}
clone_info=DestroyImageInfo(clone_info);
@@ -4446,12 +4446,12 @@
((y1 != 0L) && (y1 != (ssize_t) composite_image->rows)))
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
/*
Resize image.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,"%gx%g!",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g!",
primitive_info[1].point.x,primitive_info[1].point.y);
composite_image->filter=image->filter;
(void) TransformImage(&composite_image,(char *) NULL,geometry,
@@ -4466,7 +4466,7 @@
image->gravity=draw_info->gravity;
geometry.x=x;
geometry.y=y;
- (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);
(void) ParseGravityGeometry(image,composite_geometry,&geometry,exception);
@@ -4506,7 +4506,7 @@
case TextPrimitive:
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
DrawInfo
*clone_info;
@@ -4515,7 +4515,7 @@
break;
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
(void) CloneString(&clone_info->text,primitive_info->text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%+f%+f",
primitive_info->point.x,primitive_info->point.y);
(void) CloneString(&clone_info->geometry,geometry);
status&=AnnotateImage(image,clone_info,exception);
@@ -5240,7 +5240,7 @@
static size_t TracePath(PrimitiveInfo *primitive_info,const char *path)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 88345b7..c5831fe 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -775,7 +775,7 @@
const double sigma,ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
KernelInfo
*kernel_info;
@@ -789,7 +789,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel_info=AcquireKernelInfo(geometry,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -1365,7 +1365,7 @@
const double sigma,ExceptionInfo *exception)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
KernelInfo
*kernel_info;
@@ -1379,7 +1379,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- (void) FormatLocaleString(geometry,MaxTextExtent,"gaussian:%.20gx%.20g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"gaussian:%.20gx%.20g",
radius,sigma);
kernel_info=AcquireKernelInfo(geometry,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -1952,8 +1952,8 @@
#define DefaultPreviewGeometry "204x204+10+10"
char
- factor[MaxTextExtent],
- label[MaxTextExtent];
+ factor[MagickPathExtent],
+ label[MagickPathExtent];
double
degrees,
@@ -2040,14 +2040,14 @@
{
degrees+=45.0;
preview_image=RotateImage(thumbnail,degrees,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"rotate %g",degrees);
+ (void) FormatLocaleString(label,MagickPathExtent,"rotate %g",degrees);
break;
}
case ShearPreview:
{
degrees+=5.0;
preview_image=ShearImage(thumbnail,degrees,degrees,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"shear %gx%g",degrees,
+ (void) FormatLocaleString(label,MagickPathExtent,"shear %gx%g",degrees,
2.0*degrees);
break;
}
@@ -2056,7 +2056,7 @@
x=(ssize_t) ((i+1)*thumbnail->columns)/NumberTiles;
y=(ssize_t) ((i+1)*thumbnail->rows)/NumberTiles;
preview_image=RollImage(thumbnail,x,y,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"roll %+.20gx%+.20g",
+ (void) FormatLocaleString(label,MagickPathExtent,"roll %+.20gx%+.20g",
(double) x,(double) y);
break;
}
@@ -2065,10 +2065,10 @@
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(factor,MaxTextExtent,"100,100,%g",2.0*
+ (void) FormatLocaleString(factor,MagickPathExtent,"100,100,%g",2.0*
percentage);
(void) ModulateImage(preview_image,factor,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
+ (void) FormatLocaleString(label,MagickPathExtent,"modulate %s",factor);
break;
}
case SaturationPreview:
@@ -2076,9 +2076,9 @@
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(factor,MaxTextExtent,"100,%g",2.0*percentage);
+ (void) FormatLocaleString(factor,MagickPathExtent,"100,%g",2.0*percentage);
(void) ModulateImage(preview_image,factor,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
+ (void) FormatLocaleString(label,MagickPathExtent,"modulate %s",factor);
break;
}
case BrightnessPreview:
@@ -2086,9 +2086,9 @@
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(factor,MaxTextExtent,"%g",2.0*percentage);
+ (void) FormatLocaleString(factor,MagickPathExtent,"%g",2.0*percentage);
(void) ModulateImage(preview_image,factor,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
+ (void) FormatLocaleString(label,MagickPathExtent,"modulate %s",factor);
break;
}
case GammaPreview:
@@ -2099,7 +2099,7 @@
break;
gamma+=0.4f;
(void) GammaImage(preview_image,gamma,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"gamma %g",gamma);
+ (void) FormatLocaleString(label,MagickPathExtent,"gamma %g",gamma);
break;
}
case SpiffPreview:
@@ -2108,7 +2108,7 @@
if (preview_image != (Image *) NULL)
for (x=0; x < i; x++)
(void) ContrastImage(preview_image,MagickTrue,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"contrast (%.20g)",
+ (void) FormatLocaleString(label,MagickPathExtent,"contrast (%.20g)",
(double) i+1);
break;
}
@@ -2119,7 +2119,7 @@
break;
for (x=0; x < i; x++)
(void) ContrastImage(preview_image,MagickFalse,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"+contrast (%.20g)",
+ (void) FormatLocaleString(label,MagickPathExtent,"+contrast (%.20g)",
(double) i+1);
break;
}
@@ -2132,7 +2132,7 @@
quantize_info.number_colors=colors;
quantize_info.colorspace=GRAYColorspace;
(void) QuantizeImage(&quantize_info,preview_image,exception);
- (void) FormatLocaleString(label,MaxTextExtent,
+ (void) FormatLocaleString(label,MagickPathExtent,
"-colorspace gray -colors %.20g",(double) colors);
break;
}
@@ -2144,7 +2144,7 @@
colors<<=1;
quantize_info.number_colors=colors;
(void) QuantizeImage(&quantize_info,preview_image,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"colors %.20g",(double)
+ (void) FormatLocaleString(label,MagickPathExtent,"colors %.20g",(double)
colors);
break;
}
@@ -2161,7 +2161,7 @@
preview_image=DespeckleImage(thumbnail,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(label,MaxTextExtent,"despeckle (%.20g)",
+ (void) FormatLocaleString(label,MagickPathExtent,"despeckle (%.20g)",
(double) i+1);
break;
}
@@ -2169,7 +2169,7 @@
{
preview_image=StatisticImage(thumbnail,NonpeakStatistic,(size_t) radius,
(size_t) radius,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"noise %g",radius);
+ (void) FormatLocaleString(label,MagickPathExtent,"noise %g",radius);
break;
}
case AddNoisePreview:
@@ -2178,56 +2178,56 @@
{
case 0:
{
- (void) CopyMagickString(factor,"uniform",MaxTextExtent);
+ (void) CopyMagickString(factor,"uniform",MagickPathExtent);
break;
}
case 1:
{
- (void) CopyMagickString(factor,"gaussian",MaxTextExtent);
+ (void) CopyMagickString(factor,"gaussian",MagickPathExtent);
break;
}
case 2:
{
- (void) CopyMagickString(factor,"multiplicative",MaxTextExtent);
+ (void) CopyMagickString(factor,"multiplicative",MagickPathExtent);
break;
}
case 3:
{
- (void) CopyMagickString(factor,"impulse",MaxTextExtent);
+ (void) CopyMagickString(factor,"impulse",MagickPathExtent);
break;
}
case 5:
{
- (void) CopyMagickString(factor,"laplacian",MaxTextExtent);
+ (void) CopyMagickString(factor,"laplacian",MagickPathExtent);
break;
}
case 6:
{
- (void) CopyMagickString(factor,"Poisson",MaxTextExtent);
+ (void) CopyMagickString(factor,"Poisson",MagickPathExtent);
break;
}
default:
{
- (void) CopyMagickString(thumbnail->magick,"NULL",MaxTextExtent);
+ (void) CopyMagickString(thumbnail->magick,"NULL",MagickPathExtent);
break;
}
}
preview_image=StatisticImage(thumbnail,NonpeakStatistic,(size_t) i,
(size_t) i,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"+noise %s",factor);
+ (void) FormatLocaleString(label,MagickPathExtent,"+noise %s",factor);
break;
}
case SharpenPreview:
{
preview_image=SharpenImage(thumbnail,radius,sigma,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g",radius,
+ (void) FormatLocaleString(label,MagickPathExtent,"sharpen %gx%g",radius,
sigma);
break;
}
case BlurPreview:
{
preview_image=BlurImage(thumbnail,radius,sigma,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"blur %gx%g",radius,
+ (void) FormatLocaleString(label,MagickPathExtent,"blur %gx%g",radius,
sigma);
break;
}
@@ -2238,21 +2238,21 @@
break;
(void) BilevelImage(thumbnail,(double) (percentage*((double)
QuantumRange+1.0))/100.0,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"threshold %g",(double)
+ (void) FormatLocaleString(label,MagickPathExtent,"threshold %g",(double)
(percentage*((double) QuantumRange+1.0))/100.0);
break;
}
case EdgeDetectPreview:
{
preview_image=EdgeImage(thumbnail,radius,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"edge %g",radius);
+ (void) FormatLocaleString(label,MagickPathExtent,"edge %g",radius);
break;
}
case SpreadPreview:
{
preview_image=SpreadImage(thumbnail,radius,thumbnail->interpolate,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"spread %g",radius+0.5);
+ (void) FormatLocaleString(label,MagickPathExtent,"spread %g",radius+0.5);
break;
}
case SolarizePreview:
@@ -2262,7 +2262,7 @@
break;
(void) SolarizeImage(preview_image,(double) QuantumRange*percentage/
100.0,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"solarize %g",
+ (void) FormatLocaleString(label,MagickPathExtent,"solarize %g",
(QuantumRange*percentage)/100.0);
break;
}
@@ -2271,7 +2271,7 @@
degrees+=10.0;
preview_image=ShadeImage(thumbnail,MagickTrue,degrees,degrees,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"shade %gx%g",degrees,
+ (void) FormatLocaleString(label,MagickPathExtent,"shade %gx%g",degrees,
degrees);
break;
}
@@ -2285,7 +2285,7 @@
geometry.x=(i-1)/2;
geometry.y=(i-1)/2;
(void) RaiseImage(preview_image,&geometry,MagickTrue,exception);
- (void) FormatLocaleString(label,MaxTextExtent,
+ (void) FormatLocaleString(label,MagickPathExtent,
"raise %.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
geometry.height,(double) geometry.x,(double) geometry.y);
break;
@@ -2298,7 +2298,7 @@
threshold+=0.4f;
(void) SegmentImage(preview_image,sRGBColorspace,MagickFalse,threshold,
threshold,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"segment %gx%g",
+ (void) FormatLocaleString(label,MagickPathExtent,"segment %gx%g",
threshold,threshold);
break;
}
@@ -2306,7 +2306,7 @@
{
preview_image=SwirlImage(thumbnail,degrees,image->interpolate,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"swirl %g",degrees);
+ (void) FormatLocaleString(label,MagickPathExtent,"swirl %g",degrees);
degrees+=45.0;
break;
}
@@ -2315,7 +2315,7 @@
degrees+=0.1f;
preview_image=ImplodeImage(thumbnail,degrees,image->interpolate,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"implode %g",degrees);
+ (void) FormatLocaleString(label,MagickPathExtent,"implode %g",degrees);
break;
}
case WavePreview:
@@ -2323,7 +2323,7 @@
degrees+=5.0f;
preview_image=WaveImage(thumbnail,0.5*degrees,2.0*degrees,
image->interpolate,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"wave %gx%g",0.5*degrees,
+ (void) FormatLocaleString(label,MagickPathExtent,"wave %gx%g",0.5*degrees,
2.0*degrees);
break;
}
@@ -2331,7 +2331,7 @@
{
preview_image=OilPaintImage(thumbnail,(double) radius,(double) sigma,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+ (void) FormatLocaleString(label,MagickPathExtent,"charcoal %gx%g",radius,
sigma);
break;
}
@@ -2339,14 +2339,14 @@
{
preview_image=CharcoalImage(thumbnail,(double) radius,(double) sigma,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+ (void) FormatLocaleString(label,MagickPathExtent,"charcoal %gx%g",radius,
sigma);
break;
}
case JPEGPreview:
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
int
file;
@@ -2358,12 +2358,12 @@
if (preview_image == (Image *) NULL)
break;
preview_info->quality=(size_t) percentage;
- (void) FormatLocaleString(factor,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(factor,MagickPathExtent,"%.20g",(double)
preview_info->quality);
file=AcquireUniqueFileResource(filename);
if (file != -1)
file=close(file)-1;
- (void) FormatLocaleString(preview_image->filename,MaxTextExtent,
+ (void) FormatLocaleString(preview_image->filename,MagickPathExtent,
"jpeg:%s",filename);
status=WriteImage(preview_info,preview_image,exception);
if (status != MagickFalse)
@@ -2372,7 +2372,7 @@
*quality_image;
(void) CopyMagickString(preview_info->filename,
- preview_image->filename,MaxTextExtent);
+ preview_image->filename,MagickPathExtent);
quality_image=ReadImage(preview_info,exception);
if (quality_image != (Image *) NULL)
{
@@ -2382,16 +2382,16 @@
}
(void) RelinquishUniqueFileResource(preview_image->filename);
if ((GetBlobSize(preview_image)/1024) >= 1024)
- (void) FormatLocaleString(label,MaxTextExtent,"quality %s\n%gmb ",
+ (void) FormatLocaleString(label,MagickPathExtent,"quality %s\n%gmb ",
factor,(double) ((MagickOffsetType) GetBlobSize(preview_image))/
1024.0/1024.0);
else
if (GetBlobSize(preview_image) >= 1024)
- (void) FormatLocaleString(label,MaxTextExtent,
+ (void) FormatLocaleString(label,MagickPathExtent,
"quality %s\n%gkb ",factor,(double) ((MagickOffsetType)
GetBlobSize(preview_image))/1024.0);
else
- (void) FormatLocaleString(label,MaxTextExtent,"quality %s\n%.20gb ",
+ (void) FormatLocaleString(label,MagickPathExtent,"quality %s\n%.20gb ",
factor,(double) ((MagickOffsetType) GetBlobSize(thumbnail)));
break;
}
@@ -2419,7 +2419,7 @@
Create the montage.
*/
montage_info=CloneMontageInfo(preview_info,(MontageInfo *) NULL);
- (void) CopyMagickString(montage_info->filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(montage_info->filename,image->filename,MagickPathExtent);
montage_info->shadow=MagickTrue;
(void) CloneString(&montage_info->tile,"3x3");
(void) CloneString(&montage_info->geometry,DefaultPreviewGeometry);
@@ -2804,7 +2804,7 @@
if (image->debug != MagickFalse)
{
char
- format[MaxTextExtent],
+ format[MagickPathExtent],
*message;
register const MagickRealType
@@ -2822,11 +2822,11 @@
for (v=0; v < (ssize_t) width; v++)
{
*message='\0';
- (void) FormatLocaleString(format,MaxTextExtent,"%.20g: ",(double) v);
+ (void) FormatLocaleString(format,MagickPathExtent,"%.20g: ",(double) v);
(void) ConcatenateString(&message,format);
for (u=0; u < (ssize_t) width; u++)
{
- (void) FormatLocaleString(format,MaxTextExtent,"%+f ",(double) *k++);
+ (void) FormatLocaleString(format,MagickPathExtent,"%+f ",(double) *k++);
(void) ConcatenateString(&message,format);
}
(void) LogMagickEvent(TransformEvent,GetMagickModule(),"%s",message);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 85c38fc..2f46a44 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -503,7 +503,7 @@
*image_view;
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
ColorCorrection
color_correction;
diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 2da2b85..c9a4cf4 100644
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -454,7 +454,7 @@
MagickExport char *GetExceptionMessage(const int error)
{
char
- exception[MaxTextExtent];
+ exception[MagickPathExtent];
*exception='\0';
#if defined(MAGICKCORE_HAVE_STRERROR_R)
@@ -573,13 +573,13 @@
const char *tag)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
const char
*locale_message;
assert(tag != (const char *) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,"Exception/%s%s",
+ (void) FormatLocaleString(message,MagickPathExtent,"Exception/%s%s",
ExceptionSeverityToTag(severity),tag);
locale_message=GetLocaleMessage(message);
if (locale_message == (const char *) NULL)
@@ -993,9 +993,9 @@
const char *format,va_list operands)
{
char
- message[MaxTextExtent],
- path[MaxTextExtent],
- reason[MaxTextExtent];
+ message[MagickPathExtent],
+ path[MagickPathExtent],
+ reason[MagickPathExtent];
const char
*locale,
@@ -1013,16 +1013,16 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
locale=GetLocaleExceptionMessage(severity,tag);
- (void) CopyMagickString(reason,locale,MaxTextExtent);
- (void) ConcatenateMagickString(reason," ",MaxTextExtent);
+ (void) CopyMagickString(reason,locale,MagickPathExtent);
+ (void) ConcatenateMagickString(reason," ",MagickPathExtent);
length=strlen(reason);
#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- n=vsnprintf(reason+length,MaxTextExtent-length,format,operands);
+ n=vsnprintf(reason+length,MagickPathExtent-length,format,operands);
#else
n=vsprintf(reason+length,format,operands);
#endif
if (n < 0)
- reason[MaxTextExtent-1]='\0';
+ reason[MagickPathExtent-1]='\0';
status=LogMagickEvent(ExceptionEvent,module,function,line,"%s",reason);
GetPathComponent(module,TailPath,path);
type="undefined";
@@ -1032,7 +1032,7 @@
type="error";
if (severity >= FatalErrorException)
type="fatal";
- (void) FormatLocaleString(message,MaxTextExtent,"%s @ %s/%s/%s/%.20g",reason,
+ (void) FormatLocaleString(message,MagickPathExtent,"%s @ %s/%s/%s/%.20g",reason,
type,path,function,(double) line);
(void) ThrowException(exception,severity,message,(char *) NULL);
return(status);
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 217dd6e..f234bd8 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -246,7 +246,7 @@
pixel;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
double
lower_threshold,
@@ -281,7 +281,7 @@
/*
Filter out noise.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
kernel_info=AcquireKernelInfo(geometry,exception);
if (kernel_info == (KernelInfo *) NULL)
@@ -1771,8 +1771,8 @@
*image_view;
char
- message[MaxTextExtent],
- path[MaxTextExtent];
+ message[MagickPathExtent],
+ path[MagickPathExtent];
const char
*artifact;
@@ -1908,12 +1908,12 @@
accumulator=DestroyMatrixInfo(accumulator);
return((Image *) NULL);
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"# Hough line transform: %.20gx%.20g%+.20g\n",(double) width,
(double) height,(double) threshold);
if (write(file,message,strlen(message)) != (ssize_t) strlen(message))
status=MagickFalse;
- (void) FormatLocaleString(message,MaxTextExtent,"viewbox 0 0 %.20g %.20g\n",
+ (void) FormatLocaleString(message,MagickPathExtent,"viewbox 0 0 %.20g %.20g\n",
(double) image->columns,(double) image->rows);
if (write(file,message,strlen(message)) != (ssize_t) strlen(message))
status=MagickFalse;
@@ -1997,7 +1997,7 @@
(image->rows/2.0))*sin(DegreesToRadians((double) x))))/
cos(DegreesToRadians((double) x))+(image->columns/2.0);
}
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"line %g,%g %g,%g # %g\n",line.x1,line.y1,line.x2,line.y2,maxima);
if (write(file,message,strlen(message)) != (ssize_t) strlen(message))
status=MagickFalse;
@@ -2010,7 +2010,7 @@
*/
image_info=AcquireImageInfo();
image_info->background_color=image->background_color;
- (void) FormatLocaleString(image_info->filename,MaxTextExtent,"mvg:%s",path);
+ (void) FormatLocaleString(image_info->filename,MagickPathExtent,"mvg:%s",path);
artifact=GetImageArtifact(image,"background");
if (artifact != (const char *) NULL)
(void) SetImageOption(image_info,"background",artifact);
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index b4302a6..05dd10d 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -902,7 +902,7 @@
if (image->debug != MagickFalse)
{
char
- format[MaxTextExtent],
+ format[MagickPathExtent],
*message;
(void) LogMagickEvent(TransformEvent,GetMagickModule(),
@@ -911,11 +911,11 @@
for (v=0; v < 6; v++)
{
*message='\0';
- (void) FormatLocaleString(format,MaxTextExtent,"%.20g: ",(double) v);
+ (void) FormatLocaleString(format,MagickPathExtent,"%.20g: ",(double) v);
(void) ConcatenateString(&message,format);
for (u=0; u < 6; u++)
{
- (void) FormatLocaleString(format,MaxTextExtent,"%+f ",
+ (void) FormatLocaleString(format,MagickPathExtent,"%+f ",
ColorMatrix[v][u]);
(void) ConcatenateString(&message,format);
}
@@ -1100,8 +1100,8 @@
channel_mask;
char
- key[MaxTextExtent],
- statistic[MaxTextExtent];
+ key[MagickPathExtent],
+ statistic[MagickPathExtent];
const char
*value;
@@ -1124,7 +1124,7 @@
SetPixelChannelMask(image,channel_mask);
}
}
- (void) FormatLocaleString(key,MaxTextExtent,"%p.%.20g.%s",(void *) image,
+ (void) FormatLocaleString(key,MagickPathExtent,"%p.%.20g.%s",(void *) image,
(double) channel,symbol);
value=(const char *) GetValueFromSplayTree(fx_info->symbols,key);
if (value != (const char *) NULL)
@@ -1140,7 +1140,7 @@
depth;
depth=GetImageDepth(image,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%.20g",(double) depth);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%.20g",(double) depth);
}
if (LocaleNCompare(symbol,"kurtosis",8) == 0)
{
@@ -1149,7 +1149,7 @@
skewness;
(void) GetImageKurtosis(image,&kurtosis,&skewness,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",kurtosis);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",kurtosis);
}
if (LocaleNCompare(symbol,"maxima",6) == 0)
{
@@ -1158,7 +1158,7 @@
minima;
(void) GetImageRange(image,&minima,&maxima,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",maxima);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",maxima);
}
if (LocaleNCompare(symbol,"mean",4) == 0)
{
@@ -1167,7 +1167,7 @@
standard_deviation;
(void) GetImageMean(image,&mean,&standard_deviation,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",mean);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",mean);
}
if (LocaleNCompare(symbol,"minima",6) == 0)
{
@@ -1176,7 +1176,7 @@
minima;
(void) GetImageRange(image,&minima,&maxima,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",minima);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",minima);
}
if (LocaleNCompare(symbol,"skewness",8) == 0)
{
@@ -1185,7 +1185,7 @@
skewness;
(void) GetImageKurtosis(image,&kurtosis,&skewness,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",skewness);
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",skewness);
}
if (LocaleNCompare(symbol,"standard_deviation",18) == 0)
{
@@ -1194,7 +1194,7 @@
standard_deviation;
(void) GetImageMean(image,&mean,&standard_deviation,exception);
- (void) FormatLocaleString(statistic,MaxTextExtent,"%g",
+ (void) FormatLocaleString(statistic,MagickPathExtent,"%g",
standard_deviation);
}
if (channel_mask != UndefinedChannel)
@@ -1248,8 +1248,8 @@
{
char
*q,
- subexpression[MaxTextExtent],
- symbol[MaxTextExtent];
+ subexpression[MagickPathExtent],
+ symbol[MagickPathExtent];
const char
*p,
@@ -1399,9 +1399,9 @@
(LocaleCompare(p,"lightness") != 0))
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
- (void) CopyMagickString(name,p,MaxTextExtent);
+ (void) CopyMagickString(name,p,MagickPathExtent);
for (q=name+(strlen(name)-1); q > name; q--)
{
if (*q == ')')
@@ -1440,7 +1440,7 @@
}
}
}
- (void) CopyMagickString(symbol,p,MaxTextExtent);
+ (void) CopyMagickString(symbol,p,MagickPathExtent);
StripString(symbol);
if (*symbol == '\0')
{
@@ -2086,7 +2086,7 @@
{
char
*q,
- subexpression[MaxTextExtent];
+ subexpression[MagickPathExtent];
double
alpha,
@@ -2239,7 +2239,7 @@
double
gamma;
- (void) CopyMagickString(subexpression,++p,MaxTextExtent);
+ (void) CopyMagickString(subexpression,++p,MagickPathExtent);
q=subexpression;
p=StringToken(":",&q);
if (q == (char *) NULL)
@@ -2257,7 +2257,7 @@
case '=':
{
char
- numeric[MaxTextExtent];
+ numeric[MagickPathExtent];
q=subexpression;
while (isalpha((int) ((unsigned char) *q)) != 0)
@@ -2270,7 +2270,7 @@
}
ClearMagickException(exception);
*beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
- (void) FormatLocaleString(numeric,MaxTextExtent,"%g",(double)
+ (void) FormatLocaleString(numeric,MagickPathExtent,"%g",(double)
*beta);
(void) DeleteNodeFromSplayTree(fx_info->symbols,subexpression);
(void) AddValueToSplayTree(fx_info->symbols,ConstantString(
@@ -2297,7 +2297,7 @@
}
if (strchr("(",(int) *expression) != (char *) NULL)
{
- (void) CopyMagickString(subexpression,expression+1,MaxTextExtent);
+ (void) CopyMagickString(subexpression,expression+1,MagickPathExtent);
subexpression[strlen(subexpression)-1]='\0';
gamma=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,beta,
exception);
@@ -2472,7 +2472,7 @@
case AlphaPixelChannel: type="opacity"; break;
default: type="unknown"; break;
}
- (void) CopyMagickString(subexpression,expression+6,MaxTextExtent);
+ (void) CopyMagickString(subexpression,expression+6,MagickPathExtent);
if (strlen(subexpression) > 1)
subexpression[strlen(subexpression)-1]='\0';
if (fx_info->file != (FILE *) NULL)
@@ -3936,7 +3936,7 @@
if (caption != (const char *) NULL)
{
char
- geometry[MaxTextExtent],
+ geometry[MagickPathExtent],
*text;
DrawInfo
@@ -3977,7 +3977,7 @@
caption_image->background_color=image->border_color;
(void) SetImageBackgroundColor(caption_image,exception);
(void) CloneString(&annotate_info->text,text);
- (void) FormatLocaleString(geometry,MaxTextExtent,"+0+%g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"+0+%g",
metrics.ascent);
if (annotate_info->gravity == UndefinedGravity)
(void) CloneString(&annotate_info->geometry,AcquireString(
@@ -5424,7 +5424,7 @@
const double sigma,const ssize_t x,const ssize_t y,ExceptionInfo *exception)
{
char
- ellipse[MaxTextExtent];
+ ellipse[MagickPathExtent];
DrawInfo
*draw_info;
@@ -5465,7 +5465,7 @@
exception);
(void) QueryColorCompliance("#ffffff",AllCompliance,&draw_info->stroke,
exception);
- (void) FormatLocaleString(ellipse,MaxTextExtent,"ellipse %g,%g,%g,%g,"
+ (void) FormatLocaleString(ellipse,MagickPathExtent,"ellipse %g,%g,%g,%g,"
"0.0,360.0",image->columns/2.0,image->rows/2.0,image->columns/2.0-x,
image->rows/2.0-y);
draw_info->primitive=AcquireString(ellipse);
diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index 493998d..761718f 100644
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -98,7 +98,7 @@
{
char
*p,
- pedantic_geometry[MaxTextExtent],
+ pedantic_geometry[MagickPathExtent],
*q;
double
@@ -116,14 +116,14 @@
flags=NoValue;
if ((geometry == (char *) NULL) || (*geometry == '\0'))
return(flags);
- if (strlen(geometry) >= (MaxTextExtent-1))
+ if (strlen(geometry) >= (MagickPathExtent-1))
return(flags);
- (void) CopyMagickString(pedantic_geometry,geometry,MaxTextExtent);
+ (void) CopyMagickString(pedantic_geometry,geometry,MagickPathExtent);
for (p=pedantic_geometry; *p != '\0'; )
{
if (isspace((int) ((unsigned char) *p)) != 0)
{
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
continue;
}
c=(int)*p;
@@ -132,43 +132,43 @@
case '%':
{
flags|=PercentValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '!':
{
flags|=AspectValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '<':
{
flags|=LessValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '>':
{
flags|=GreaterValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '^':
{
flags|=MinimumValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '@':
{
flags|=AreaValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '(':
case ')':
{
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case 'x':
@@ -442,13 +442,13 @@
/*
Replace mneumonic with the equivalent size in dots-per-inch.
*/
- (void) CopyMagickString(page,PageSizes[i][1],MaxTextExtent);
+ (void) CopyMagickString(page,PageSizes[i][1],MagickPathExtent);
(void) ConcatenateMagickString(page,page_geometry+
- strlen(PageSizes[i][0]),MaxTextExtent);
+ strlen(PageSizes[i][0]),MagickPathExtent);
flags=GetGeometry(page,&geometry.x,&geometry.y,&geometry.width,
&geometry.height);
if ((flags & GreaterValue) == 0)
- (void) ConcatenateMagickString(page,">",MaxTextExtent);
+ (void) ConcatenateMagickString(page,">",MagickPathExtent);
break;
}
return(page);
@@ -701,7 +701,7 @@
AffineMatrix *affine_matrix,ExceptionInfo *exception)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
@@ -811,7 +811,7 @@
{
char
*p,
- pedantic_geometry[MaxTextExtent],
+ pedantic_geometry[MagickPathExtent],
*q;
double
@@ -830,14 +830,14 @@
flags=NoValue;
if ((geometry == (char *) NULL) || (*geometry == '\0'))
return(flags);
- if (strlen(geometry) >= (MaxTextExtent-1))
+ if (strlen(geometry) >= (MagickPathExtent-1))
return(flags);
- (void) CopyMagickString(pedantic_geometry,geometry,MaxTextExtent);
+ (void) CopyMagickString(pedantic_geometry,geometry,MagickPathExtent);
for (p=pedantic_geometry; *p != '\0'; )
{
if (isspace((int) ((unsigned char) *p)) != 0)
{
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
continue;
}
c=(int) ((unsigned char) *p);
@@ -846,43 +846,43 @@
case '%':
{
flags|=PercentValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '!':
{
flags|=AspectValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '<':
{
flags|=LessValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '>':
{
flags|=GreaterValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '^':
{
flags|=MinimumValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '@':
{
flags|=AreaValue;
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case '(':
case ')':
{
- (void) CopyMagickString(p,p+1,MaxTextExtent);
+ (void) CopyMagickString(p,p+1,MagickPathExtent);
break;
}
case 'x':
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index ddac0e8..5cf3ba4 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -1085,9 +1085,9 @@
#define HistogramImageTag "Histogram/Image"
char
- color[MaxTextExtent],
- hex[MaxTextExtent],
- tuple[MaxTextExtent];
+ color[MagickPathExtent],
+ hex[MagickPathExtent],
+ tuple[MagickPathExtent];
PixelInfo
*histogram;
@@ -1130,25 +1130,25 @@
for (i=0; i < (ssize_t) number_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);
(void) FormatLocaleFile(file,"%10.20g",(double) ((MagickOffsetType)
diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 4cb815c..98b2201 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -429,9 +429,9 @@
const MagickBooleanType verbose,ExceptionInfo *exception)
{
char
- color[MaxTextExtent],
- format[MaxTextExtent],
- key[MaxTextExtent];
+ color[MagickPathExtent],
+ format[MagickPathExtent],
+ key[MagickPathExtent];
ChannelFeatures
*channel_features;
@@ -600,7 +600,7 @@
if (image->total_colors != 0)
{
(void) FormatMagickSize(image->total_colors,MagickFalse,"B",
- MaxTextExtent,format);
+ MagickPathExtent,format);
(void) FormatLocaleFile(file,"%s ",format);
}
}
@@ -619,7 +619,7 @@
if (GetBlobSize(image) != 0)
{
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",
- MaxTextExtent,format);
+ MagickPathExtent,format);
(void) FormatLocaleFile(file,"%s ",format);
}
(void) FormatLocaleFile(file,"%0.3fu %lu:%02lu.%03lu",user_time,
@@ -642,7 +642,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);
@@ -950,7 +950,7 @@
if ((x < (ssize_t) image->columns) || (y < (ssize_t) image->rows))
{
char
- tuple[MaxTextExtent];
+ tuple[MagickPathExtent];
PixelInfo
pixel;
@@ -987,9 +987,9 @@
if (image->colors <= 1024)
{
char
- color[MaxTextExtent],
- hex[MaxTextExtent],
- tuple[MaxTextExtent];
+ color[MagickPathExtent],
+ hex[MagickPathExtent],
+ tuple[MagickPathExtent];
PixelInfo
pixel;
@@ -1002,28 +1002,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);
@@ -1196,7 +1196,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)
{
@@ -1317,8 +1317,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)
{
@@ -1383,16 +1383,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",
diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c
index 0beb5e2..ce2a024 100644
--- a/MagickCore/image-view.c
+++ b/MagickCore/image-view.c
@@ -405,7 +405,7 @@
assert(image_view->signature == MagickSignature);
assert(severity != (ExceptionType *) NULL);
*severity=image_view->exception->severity;
- description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent,
+ description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent,
sizeof(*description));
if (description == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -413,14 +413,14 @@
if (image_view->exception->reason != (char *) NULL)
(void) CopyMagickString(description,GetLocaleExceptionMessage(
image_view->exception->severity,image_view->exception->reason),
- MaxTextExtent);
+ MagickPathExtent);
if (image_view->exception->description != (char *) NULL)
{
- (void) ConcatenateMagickString(description," (",MaxTextExtent);
+ (void) ConcatenateMagickString(description," (",MagickPathExtent);
(void) ConcatenateMagickString(description,GetLocaleExceptionMessage(
image_view->exception->severity,image_view->exception->description),
- MaxTextExtent);
- (void) ConcatenateMagickString(description,")",MaxTextExtent);
+ MagickPathExtent);
+ (void) ConcatenateMagickString(description,")",MagickPathExtent);
}
return(description);
}
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 8e1ad6a..3e21b92 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -171,7 +171,7 @@
/*
Initialize Image structure.
*/
- (void) CopyMagickString(image->magick,"MIFF",MaxTextExtent);
+ (void) CopyMagickString(image->magick,"MIFF",MagickPathExtent);
image->storage_class=DirectClass;
image->depth=MAGICKCORE_QUANTUM_DEPTH;
image->colorspace=sRGBColorspace;
@@ -217,10 +217,10 @@
*/
SetBlobExempt(image,image_info->file != (FILE *) NULL ? MagickTrue :
MagickFalse);
- (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent);
(void) CopyMagickString(image->magick_filename,image_info->filename,
- MaxTextExtent);
- (void) CopyMagickString(image->magick,image_info->magick,MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(image->magick,image_info->magick,MagickPathExtent);
if (image_info->size != (char *) NULL)
{
(void) ParseAbsoluteGeometry(image_info->size,&image->extract_info);
@@ -394,10 +394,10 @@
if (GetNextImageInList(image) == (Image *) NULL)
return;
(void) CopyMagickString(GetNextImageInList(image)->filename,image->filename,
- MaxTextExtent);
+ MagickPathExtent);
if (image_info != (ImageInfo *) NULL)
(void) CopyMagickString(GetNextImageInList(image)->filename,
- image_info->filename,MaxTextExtent);
+ image_info->filename,MagickPathExtent);
DestroyBlob(GetNextImageInList(image));
image->next->blob=ReferenceBlob(image->blob);
image->next->endian=image->endian;
@@ -720,7 +720,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(pathname != NULL);
property=AcquireString(pathname);
- (void) FormatLocaleString(property,MaxTextExtent,"8BIM:1999,2998:%s",
+ (void) FormatLocaleString(property,MagickPathExtent,"8BIM:1999,2998:%s",
pathname);
value=GetImageProperty(image,property,exception);
property=DestroyString(property);
@@ -731,8 +731,8 @@
return(MagickFalse);
}
image_info=AcquireImageInfo();
- (void) CopyMagickString(image_info->filename,image->filename,MaxTextExtent);
- (void) ConcatenateMagickString(image_info->filename,pathname,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,image->filename,MagickPathExtent);
+ (void) ConcatenateMagickString(image_info->filename,pathname,MagickPathExtent);
clip_mask=BlobToImage(image_info,value,strlen(value),exception);
image_info=DestroyImageInfo(image_info);
if (clip_mask == (Image *) NULL)
@@ -745,7 +745,7 @@
}
if (inside == MagickFalse)
(void) NegateImage(clip_mask,MagickFalse,exception);
- (void) FormatLocaleString(clip_mask->magick_filename,MaxTextExtent,
+ (void) FormatLocaleString(clip_mask->magick_filename,MagickPathExtent,
"8BIM:1999,2998:%s\nPS",pathname);
(void) SetImageMask(image,clip_mask,exception);
clip_mask=DestroyImage(clip_mask);
@@ -860,9 +860,9 @@
clone_image->channel_mask=image->channel_mask;
clone_image->channel_map=ClonePixelChannelMap(image->channel_map);
(void) CopyMagickString(clone_image->magick_filename,image->magick_filename,
- MaxTextExtent);
- (void) CopyMagickString(clone_image->magick,image->magick,MaxTextExtent);
- (void) CopyMagickString(clone_image->filename,image->filename,MaxTextExtent);
+ MagickPathExtent);
+ (void) CopyMagickString(clone_image->magick,image->magick,MagickPathExtent);
+ (void) CopyMagickString(clone_image->filename,image->filename,MagickPathExtent);
clone_image->progress_monitor=image->progress_monitor;
clone_image->client_data=image->client_data;
clone_image->reference_count=1;
@@ -986,11 +986,11 @@
SetImageInfoFile(clone_info,image_info->file);
SetImageInfoBlob(clone_info,image_info->blob,image_info->length);
clone_info->stream=image_info->stream;
- (void) CopyMagickString(clone_info->magick,image_info->magick,MaxTextExtent);
- (void) CopyMagickString(clone_info->unique,image_info->unique,MaxTextExtent);
- (void) CopyMagickString(clone_info->zero,image_info->zero,MaxTextExtent);
+ (void) CopyMagickString(clone_info->magick,image_info->magick,MagickPathExtent);
+ (void) CopyMagickString(clone_info->unique,image_info->unique,MagickPathExtent);
+ (void) CopyMagickString(clone_info->zero,image_info->zero,MagickPathExtent);
(void) CopyMagickString(clone_info->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
clone_info->channel=image_info->channel;
(void) CloneImageOptions(clone_info,image_info);
clone_info->debug=IsEventLogging();
@@ -1467,7 +1467,7 @@
canonical=MagickFalse;
length=0;
- (void) CopyMagickString(filename,format,MaxTextExtent);
+ (void) CopyMagickString(filename,format,MagickPathExtent);
for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%'))
{
q=(char *) p+1;
@@ -1493,10 +1493,10 @@
q++;
c=(*q);
*q='\0';
- (void) FormatLocaleString(filename+(p-format),(size_t) (MaxTextExtent-
+ (void) FormatLocaleString(filename+(p-format),(size_t) (MagickPathExtent-
(p-format)),p,value);
*q=c;
- (void) ConcatenateMagickString(filename,q,MaxTextExtent);
+ (void) ConcatenateMagickString(filename,q,MagickPathExtent);
canonical=MagickTrue;
if (*(q-1) != '%')
break;
@@ -1506,7 +1506,7 @@
case '[':
{
char
- pattern[MaxTextExtent];
+ pattern[MagickPathExtent];
const char
*value;
@@ -1530,7 +1530,7 @@
break;
depth=1;
r=q+1;
- for (i=0; (i < (MaxTextExtent-1L)) && (*r != '\0'); i++)
+ for (i=0; (i < (MagickPathExtent-1L)) && (*r != '\0'); i++)
{
if (*r == '[')
depth++;
@@ -1567,10 +1567,10 @@
c=(*q);
*q='\0';
(void) CopyMagickString(filename+(p-format-length),value,(size_t)
- (MaxTextExtent-(p-format-length)));
+ (MagickPathExtent-(p-format-length)));
length+=strlen(pattern)-1;
*q=c;
- (void) ConcatenateMagickString(filename,r+1,MaxTextExtent);
+ (void) ConcatenateMagickString(filename,r+1,MagickPathExtent);
canonical=MagickTrue;
if (*(q-1) != '%')
break;
@@ -1584,11 +1584,11 @@
for (q=filename; *q != '\0'; q++)
if ((*q == '%') && (*(q+1) == '%'))
{
- (void) CopyMagickString(q,q+1,(size_t) (MaxTextExtent-(q-filename)));
+ (void) CopyMagickString(q,q+1,(size_t) (MagickPathExtent-(q-filename)));
canonical=MagickTrue;
}
if (canonical == MagickFalse)
- (void) CopyMagickString(filename,format,MaxTextExtent);
+ (void) CopyMagickString(filename,format,MagickPathExtent);
return(strlen(filename));
}
@@ -1763,8 +1763,8 @@
MagickExport MagickBooleanType IsTaintImage(const Image *image)
{
char
- magick[MaxTextExtent],
- filename[MaxTextExtent];
+ magick[MagickPathExtent],
+ filename[MagickPathExtent];
register const Image
*p;
@@ -1773,8 +1773,8 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image->signature == MagickSignature);
- (void) CopyMagickString(magick,image->magick,MaxTextExtent);
- (void) CopyMagickString(filename,image->filename,MaxTextExtent);
+ (void) CopyMagickString(magick,image->magick,MagickPathExtent);
+ (void) CopyMagickString(filename,image->filename,MagickPathExtent);
for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
{
if (p->taint != MagickFalse)
@@ -2349,11 +2349,11 @@
const unsigned int frames,ExceptionInfo *exception)
{
char
- extension[MaxTextExtent],
- filename[MaxTextExtent],
- magic[MaxTextExtent],
+ extension[MagickPathExtent],
+ filename[MagickPathExtent],
+ magic[MagickPathExtent],
*q,
- subimage[MaxTextExtent];
+ subimage[MagickPathExtent];
const MagicInfo
*magic_info;
@@ -2377,7 +2377,7 @@
count;
unsigned char
- magick[2*MaxTextExtent];
+ magick[2*MagickPathExtent];
/*
Look for 'image.format' in filename.
@@ -2441,9 +2441,9 @@
(LocaleCompare(extension,"wmz") == 0))
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
- (void) CopyMagickString(path,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(path,image_info->filename,MagickPathExtent);
path[strlen(path)-strlen(extension)-1]='\0';
GetPathComponent(path,ExtensionPath,extension);
}
@@ -2453,9 +2453,9 @@
if (LocaleCompare(extension,"bz2") == 0)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
- (void) CopyMagickString(path,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(path,image_info->filename,MagickPathExtent);
path[strlen(path)-strlen(extension)-1]='\0';
GetPathComponent(path,ExtensionPath,extension);
}
@@ -2496,7 +2496,7 @@
/*
User specified image format.
*/
- (void) CopyMagickString(magic,extension,MaxTextExtent);
+ (void) CopyMagickString(magic,extension,MagickPathExtent);
LocaleUpper(magic);
/*
Look for explicit image formats.
@@ -2516,12 +2516,12 @@
i++;
}
if (format_type == UndefinedFormatType)
- (void) CopyMagickString(image_info->magick,magic,MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,magic,MagickPathExtent);
else
if (format_type == ExplicitFormatType)
{
image_info->affirm=MagickTrue;
- (void) CopyMagickString(image_info->magick,magic,MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,magic,MagickPathExtent);
}
if (LocaleCompare(magic,"RGB") == 0)
image_info->affirm=MagickFalse; /* maybe SGI disguised as RGB */
@@ -2532,7 +2532,7 @@
*magic='\0';
GetPathComponent(image_info->filename,MagickPath,magic);
if (*magic == '\0')
- (void) CopyMagickString(magic,image_info->magick,MaxTextExtent);
+ (void) CopyMagickString(magic,image_info->magick,MagickPathExtent);
else
{
/*
@@ -2541,7 +2541,7 @@
LocaleUpper(magic);
if (IsMagickConflict(magic) == MagickFalse)
{
- (void) CopyMagickString(image_info->magick,magic,MaxTextExtent);
+ (void) CopyMagickString(image_info->magick,magic,MagickPathExtent);
if (LocaleCompare(magic,"EPHEMERAL") != 0)
image_info->affirm=MagickTrue;
else
@@ -2554,7 +2554,7 @@
(GetMagickEndianSupport(magick_info) == MagickFalse))
image_info->endian=UndefinedEndian;
GetPathComponent(image_info->filename,CanonicalPath,filename);
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
if ((image_info->adjoin != MagickFalse) && (frames > 1))
{
/*
@@ -2585,7 +2585,7 @@
*/
image=AcquireImage(image_info,exception);
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
@@ -2607,18 +2607,18 @@
return(MagickFalse);
}
SetImageInfoFile(image_info,(FILE *) NULL);
- (void) CopyMagickString(image->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,filename,MagickPathExtent);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
image=DestroyImage(image);
return(MagickFalse);
}
- (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,filename,MagickPathExtent);
image_info->temporary=MagickTrue;
}
(void) ResetMagickMemory(magick,0,sizeof(magick));
- count=ReadBlob(image,2*MaxTextExtent,magick);
+ count=ReadBlob(image,2*MagickPathExtent,magick);
(void) SeekBlob(image,-((MagickOffsetType) count),SEEK_CUR);
(void) CloseBlob(image);
image=DestroyImage(image);
@@ -2638,11 +2638,11 @@
(LocaleCompare(magick_info->module,GetMagicName(
magic_info)) == 0))
(void) CopyMagickString(image_info->magick,magick_info->name,
- MaxTextExtent);
+ MagickPathExtent);
else
{
(void) CopyMagickString(image_info->magick,GetMagicName(
- magic_info),MaxTextExtent);
+ magic_info),MagickPathExtent);
magick_info=GetMagickInfo(image_info->magick,sans_exception);
}
if ((magick_info == (const MagickInfo *) NULL) ||
@@ -3684,7 +3684,7 @@
* parenthesis, but may not be unset when parenthesis ends.
*/
char
- property[MaxTextExtent];
+ property[MagickPathExtent];
const char
*value;
@@ -3694,7 +3694,7 @@
value=GetImageOption(image_info,option);
if (value != (const char *) NULL)
{
- (void) FormatLocaleString(property,MaxTextExtent,"%s",option);
+ (void) FormatLocaleString(property,MagickPathExtent,"%s",option);
(void) SetImageArtifact(image,property,value);
}
option=GetNextImageOption(image_info);
diff --git a/MagickCore/image.h b/MagickCore/image.h
index e17b44d..a3a580f 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -319,9 +319,9 @@
*artifacts; /* general operational/coder settings, not saved */
char
- filename[MaxTextExtent], /* images input filename */
- magick_filename[MaxTextExtent], /* given image filename (with read mods) */
- magick[MaxTextExtent]; /* images file format (file magic) */
+ filename[MagickPathExtent], /* images input filename */
+ magick_filename[MagickPathExtent], /* given image filename (with read mods) */
+ magick[MagickPathExtent]; /* images file format (file magic) */
size_t
magick_columns, /* size of image when read/created */
@@ -478,10 +478,10 @@
length;
char
- magick[MaxTextExtent], /* image file format (file magick) */
- unique[MaxTextExtent], /* unique tempory filename - delegates */
- zero[MaxTextExtent], /* unique filename ? - delegates */
- filename[MaxTextExtent]; /* filename when reading/writing image */
+ magick[MagickPathExtent], /* image file format (file magick) */
+ unique[MagickPathExtent], /* unique tempory filename - delegates */
+ zero[MagickPathExtent], /* unique filename ? - delegates */
+ filename[MagickPathExtent]; /* filename when reading/writing image */
MagickBooleanType
debug;
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index c2aa14b..b5e8173 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -745,7 +745,7 @@
MagickExport const char *GetLocaleMessage(const char *tag)
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
const LocaleInfo
*locale_info;
@@ -756,7 +756,7 @@
if ((tag == (const char *) NULL) || (*tag == '\0'))
return(tag);
exception=AcquireExceptionInfo();
- (void) FormatLocaleString(name,MaxTextExtent,"%s/",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"%s/",tag);
locale_info=GetLocaleInfo_(name,exception);
exception=DestroyExceptionInfo(exception);
if (locale_info != (const LocaleInfo *) NULL)
@@ -794,7 +794,7 @@
ExceptionInfo *exception)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
const char
*element;
@@ -809,7 +809,7 @@
assert(filename != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
assert(exception != (ExceptionInfo *) NULL);
- (void) CopyMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,filename,MagickPathExtent);
/*
Load XML from configuration files to linked-list.
*/
@@ -821,7 +821,7 @@
element=(const char *) GetNextValueInLinkedList(paths);
while (element != (const char *) NULL)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",element,filename);
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",element,filename);
(void) LogMagickEvent(LocaleEvent,GetMagickModule(),
"Searching for locale file: \"%s\"",path);
xml=ConfigureFileToStringInfo(path);
@@ -1148,9 +1148,9 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
- message[MaxTextExtent],
- tag[MaxTextExtent],
+ keyword[MagickPathExtent],
+ message[MagickPathExtent],
+ tag[MagickPathExtent],
*token;
const char
@@ -1190,7 +1190,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -1224,7 +1224,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1243,18 +1243,18 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
*path='\0';
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
@@ -1274,7 +1274,7 @@
*/
while ((*token != '>') && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1285,7 +1285,7 @@
if (LocaleCompare(keyword,"</locale>") == 0)
{
ChopLocaleComponents(tag,1);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickPathExtent);
continue;
}
if (LocaleCompare(keyword,"<localemap>") == 0)
@@ -1299,15 +1299,15 @@
*/
while ((*token != '>') && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
GetMagickToken(q,&q,token);
if (LocaleCompare(keyword,"name") == 0)
{
- (void) ConcatenateMagickString(tag,token,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,token,MagickPathExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickPathExtent);
}
}
for (p=(char *) q; (*q != '<') && (*q != '\0'); q++) ;
@@ -1317,7 +1317,7 @@
while ((isspace((int) ((unsigned char) *q)) != 0) && (q > p))
q--;
(void) CopyMagickString(message,p,MagickMin((size_t) (q-p+2),
- MaxTextExtent));
+ MagickPathExtent));
locale_info=(LocaleInfo *) AcquireMagickMemory(sizeof(*locale_info));
if (locale_info == (LocaleInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
@@ -1331,15 +1331,15 @@
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
locale_info->tag);
- (void) ConcatenateMagickString(tag,message,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"\n",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,message,MagickPathExtent);
+ (void) ConcatenateMagickString(tag,"\n",MagickPathExtent);
q++;
continue;
}
if (LocaleCompare(keyword,"</message>") == 0)
{
ChopLocaleComponents(tag,2);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickPathExtent);
continue;
}
if (*keyword == '<')
@@ -1353,13 +1353,13 @@
{
ChopLocaleComponents(tag,1);
if (*tag != '\0')
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickPathExtent);
continue;
}
token[strlen(token)-1]='\0';
- (void) CopyMagickString(token,token+1,MaxTextExtent);
- (void) ConcatenateMagickString(tag,token,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) CopyMagickString(token,token+1,MagickPathExtent);
+ (void) ConcatenateMagickString(tag,token,MagickPathExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickPathExtent);
continue;
}
GetMagickToken(q,(const char **) NULL,token);
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 18e47d4..40ed0b8 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -203,7 +203,7 @@
};
static char
- log_name[MaxTextExtent] = "Magick";
+ log_name[MagickPathExtent] = "Magick";
static LinkedListInfo
*log_cache = (LinkedListInfo *) NULL;
@@ -961,11 +961,11 @@
text=AcquireString(event);
if (log_info->format == (char *) NULL)
return(text);
- extent=strlen(event)+MaxTextExtent;
+ extent=strlen(event)+MagickPathExtent;
if (LocaleCompare(log_info->format,"xml") == 0)
{
char
- timestamp[MaxTextExtent];
+ timestamp[MagickPathExtent];
/*
Translate event in "XML" format.
@@ -997,10 +997,10 @@
for (p=log_info->format; *p != '\0'; p++)
{
*q='\0';
- if ((size_t) (q-text+MaxTextExtent) >= extent)
+ if ((size_t) (q-text+MagickPathExtent) >= extent)
{
- extent+=MaxTextExtent;
- text=(char *) ResizeQuantumMemory(text,extent+MaxTextExtent,
+ extent+=MagickPathExtent;
+ text=(char *) ResizeQuantumMemory(text,extent+MagickPathExtent,
sizeof(*text));
if (text == (char *) NULL)
return((char *) NULL);
@@ -1166,15 +1166,15 @@
assert(log_info != (LogInfo *) NULL);
assert(log_info->filename != (char *) NULL);
filename=AcquireString((char *) NULL);
- extent=MaxTextExtent;
+ extent=MagickPathExtent;
q=filename;
for (p=log_info->filename; *p != '\0'; p++)
{
*q='\0';
- if ((size_t) (q-filename+MaxTextExtent) >= extent)
+ if ((size_t) (q-filename+MagickPathExtent) >= extent)
{
- extent+=MaxTextExtent;
- filename=(char *) ResizeQuantumMemory(filename,extent+MaxTextExtent,
+ extent+=MagickPathExtent;
+ filename=(char *) ResizeQuantumMemory(filename,extent+MagickPathExtent,
sizeof(*filename));
if (filename == (char *) NULL)
return((char *) NULL);
@@ -1251,7 +1251,7 @@
const char *function,const size_t line,const char *format,va_list operands)
{
char
- event[MaxTextExtent],
+ event[MagickPathExtent],
*text;
const char
@@ -1281,12 +1281,12 @@
}
domain=CommandOptionToMnemonic(MagickLogEventOptions,type);
#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- n=vsnprintf(event,MaxTextExtent,format,operands);
+ n=vsnprintf(event,MagickPathExtent,format,operands);
#else
n=vsprintf(event,format,operands);
#endif
if (n < 0)
- event[MaxTextExtent-1]='\0';
+ event[MagickPathExtent-1]='\0';
text=TranslateEvent(type,module,function,line,domain,event);
if (text == (char *) NULL)
{
@@ -1425,7 +1425,7 @@
const char *filename,const size_t depth,ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -1452,7 +1452,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -1478,7 +1478,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1491,17 +1491,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
@@ -1844,6 +1844,6 @@
MagickExport const char *SetLogName(const char *name)
{
if ((name != (char *) NULL) && (*name != '\0'))
- (void) CopyMagickString(log_name,name,MaxTextExtent);
+ (void) CopyMagickString(log_name,name,MagickPathExtent);
return(log_name);
}
diff --git a/MagickCore/mac.c b/MagickCore/mac.c
index 9658b46..f76c3f7 100644
--- a/MagickCore/mac.c
+++ b/MagickCore/mac.c
@@ -459,7 +459,7 @@
assert(magick != (char *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",magick);
- (void) CopyMagickString((char *) volume_name,magick,MaxTextExtent);
+ (void) CopyMagickString((char *) volume_name,magick,MagickPathExtent);
c2pstr((char *) volume_name);
if (volume_name[volume_name[0]] != ':')
volume_name[++volume_name[0]]=':';
@@ -500,15 +500,15 @@
const char *description)
{
char
- buffer[3*MaxTextExtent];
+ buffer[3*MagickPathExtent];
if (reason == (char *) NULL)
return;
if (description == (char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s.\n",GetClientName(),
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s.\n",GetClientName(),
reason);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s).\n",
GetClientName(),reason,description);
#if defined(DISABLE_SIOUX)
if(exception.hook != (MACErrorHookPtr) NULL)
@@ -559,15 +559,15 @@
const char *reason,const char *description)
{
char
- buffer[3*MaxTextExtent];
+ buffer[3*MagickPathExtent];
if (reason == (char *) NULL)
return;
if (description == (char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s.\n",GetClientName(),
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s.\n",GetClientName(),
reason);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s).\n",
GetClientName(),reason,description);
if(exception.hook != (MACErrorHookPtr) NULL)
exception.hook(severity, buffer);
@@ -958,10 +958,10 @@
if (reason == (char *) NULL)
return;
if (description == (char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s.\n",GetClientName(),
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s.\n",GetClientName(),
reason);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s).\n",
GetClientName(),reason,description);
#if defined(DISABLE_SIOUX)
if(exception.hook != (MACErrorHookPtr) NULL)
@@ -1120,7 +1120,7 @@
dir_entry;
static unsigned char
- pathname[MaxTextExtent];
+ pathname[MagickPathExtent];
if (entry == (DIR *) NULL)
return((struct dirent *) NULL);
@@ -1561,7 +1561,7 @@
(void) CopyMagickString((char *) &filetype,magick,MagickMin(strlen(magick),
4));
if (LocaleCompare(magick,"JPG") == 0)
- (void) CopyMagickString((char *) &filetype,"JPEG",MaxTextExtent);
+ (void) CopyMagickString((char *) &filetype,"JPEG",MagickPathExtent);
c2pstrcpy(name,filename);
FSMakeFSSpec(0,0,name,&file_specification);
FSpCreate(&file_specification,application,filetype,smSystemScript);
diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 9eeb5af..8482622 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -247,7 +247,7 @@
ExceptionInfo *exception)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
const StringInfo
*option;
@@ -274,7 +274,7 @@
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- (void) CopyMagickString(path,GetStringInfoPath(option),MaxTextExtent);
+ (void) CopyMagickString(path,GetStringInfoPath(option),MagickPathExtent);
status&=LoadMagicCache(magic_cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
@@ -758,7 +758,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -788,7 +788,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -814,7 +814,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -827,17 +827,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 99fb285..965c0ca 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -301,7 +301,7 @@
(p->magick(magick,length) != 0))
{
status=MagickTrue;
- (void) CopyMagickString(format,p->name,MaxTextExtent);
+ (void) CopyMagickString(format,p->name,MagickPathExtent);
break;
}
p=(const MagickInfo *) GetNextValueInSplayTree(magick_list);
@@ -1125,12 +1125,12 @@
#if defined(MAGICKCORE_MODULES_SUPPORT)
{
char
- module[MaxTextExtent];
+ module[MagickPathExtent];
*module='\0';
if (magick_info[i]->module != (char *) NULL)
- (void) CopyMagickString(module,magick_info[i]->module,MaxTextExtent);
- (void) ConcatenateMagickString(module," ",MaxTextExtent);
+ (void) CopyMagickString(module,magick_info[i]->module,MagickPathExtent);
+ (void) ConcatenateMagickString(module," ",MagickPathExtent);
module[9]='\0';
(void) FormatLocaleFile(file,"%9s ",module);
}
@@ -1383,8 +1383,8 @@
{
char
*events,
- execution_path[MaxTextExtent],
- filename[MaxTextExtent];
+ execution_path[MagickPathExtent],
+ filename[MagickPathExtent];
/*
Initialize the Magick environment.
@@ -1418,9 +1418,9 @@
if ((path != (const char *) NULL) && (*path == *DirectorySeparator) &&
(IsPathAccessible(path) != MagickFalse))
#endif
- (void) CopyMagickString(execution_path,path,MaxTextExtent);
+ (void) CopyMagickString(execution_path,path,MagickPathExtent);
else
- (void) GetExecutionPath(execution_path,MaxTextExtent);
+ (void) GetExecutionPath(execution_path,MagickPathExtent);
GetPathComponent(execution_path,TailPath,filename);
(void) SetClientName(filename);
GetPathComponent(execution_path,HeadPath,execution_path);
diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c
index cc65ee8..cd70962 100644
--- a/MagickCore/matrix.c
+++ b/MagickCore/matrix.c
@@ -76,7 +76,7 @@
synchronize;
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
int
file;
diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index b21561f..fa1d44e 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -129,7 +129,7 @@
struct _MemoryInfo
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
VirtualMemoryType
type;
diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
index a009102..7e8edf1 100644
--- a/MagickCore/method-attribute.h
+++ b/MagickCore/method-attribute.h
@@ -102,8 +102,14 @@
#endif
#define MagickSignature 0xabacadabUL
-#if !defined(MaxTextExtent)
-# define MaxTextExtent 8192 /* always >= 4096 */
+#if !defined(MagickFormatExtent)
+# define MagickFormatExtent 64
+#endif
+#if !defined(MagickLocaleExtent)
+# define MagickLocaleExtent 256
+#endif
+#if !defined(MagickPathExtent)
+# define MagickPathExtent 4096 /* always >= 4096 */
#endif
#if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index e46c0a7..6c8e80d 100644
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -834,17 +834,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*attribute == *DirectorySeparator)
- (void) CopyMagickString(path,attribute,MaxTextExtent);
+ (void) CopyMagickString(path,attribute,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,attribute,MaxTextExtent);
+ (void) ConcatenateMagickString(path,attribute,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
@@ -1002,8 +1002,8 @@
MagickExport char *MagickToMime(const char *magick)
{
char
- filename[MaxTextExtent],
- media[MaxTextExtent];
+ filename[MagickPathExtent],
+ media[MagickPathExtent];
const MimeInfo
*mime_info;
@@ -1011,14 +1011,14 @@
ExceptionInfo
*exception;
- (void) FormatLocaleString(filename,MaxTextExtent,"file.%s",magick);
+ (void) FormatLocaleString(filename,MagickPathExtent,"file.%s",magick);
LocaleLower(filename);
exception=AcquireExceptionInfo();
mime_info=GetMimeInfo(filename,(unsigned char *) " ",1,exception);
exception=DestroyExceptionInfo(exception);
if (mime_info != (const MimeInfo *) NULL)
return(ConstantString(GetMimeType(mime_info)));
- (void) FormatLocaleString(media,MaxTextExtent,"image/x-%s",magick);
+ (void) FormatLocaleString(media,MagickPathExtent,"image/x-%s",magick);
LocaleLower(media+8);
return(ConstantString(media));
}
diff --git a/MagickCore/module.c b/MagickCore/module.c
index 1f9a4df..e685f8b 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -401,9 +401,9 @@
{
char
**modules,
- filename[MaxTextExtent],
- module_path[MaxTextExtent],
- path[MaxTextExtent];
+ filename[MagickPathExtent],
+ module_path[MagickPathExtent],
+ path[MagickPathExtent];
DIR
*directory;
@@ -486,7 +486,7 @@
GetPathComponent(entry->d_name,BasePath,modules[i]);
if (LocaleNCompare("IM_MOD_",modules[i],7) == 0)
{
- (void) CopyMagickString(modules[i],modules[i]+10,MaxTextExtent);
+ (void) CopyMagickString(modules[i],modules[i]+10,MagickPathExtent);
modules[i][strlen(modules[i])-1]='\0';
}
i++;
@@ -546,7 +546,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
assert(path != (char *) NULL);
assert(exception != (ExceptionInfo *) NULL);
- (void) CopyMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,filename,MagickPathExtent);
module_path=(char *) NULL;
switch (module_type)
{
@@ -582,14 +582,14 @@
for (p=module_path-1; p != (char *) NULL; )
{
- (void) CopyMagickString(path,p+1,MaxTextExtent);
+ (void) CopyMagickString(path,p+1,MagickPathExtent);
q=strchr(path,DirectoryListSeparator);
if (q != (char *) NULL)
*q='\0';
q=path+strlen(path)-1;
if ((q >= path) && (*q != *DirectorySeparator))
- (void) ConcatenateMagickString(path,DirectorySeparator,MaxTextExtent);
- (void) ConcatenateMagickString(path,filename,MaxTextExtent);
+ (void) ConcatenateMagickString(path,DirectorySeparator,MagickPathExtent);
+ (void) ConcatenateMagickString(path,filename,MagickPathExtent);
if (IsPathAccessible(path) != MagickFalse)
{
module_path=DestroyString(module_path);
@@ -623,7 +623,7 @@
break;
}
}
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",directory,filename);
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",directory,filename);
if (IsPathAccessible(path) == MagickFalse)
{
ThrowFileException(exception,ConfigureWarning,
@@ -665,7 +665,7 @@
"RegistryKeyLookupFailed","`%s'",registery_key);
return(MagickFalse);
}
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",(char *) key_value,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",(char *) key_value,
DirectorySeparator,filename);
key_value=(unsigned char *) RelinquishMagickMemory(key_value);
if (IsPathAccessible(path) == MagickFalse)
@@ -693,7 +693,7 @@
Search MAGICK_HOME.
*/
#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",home,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",home,
DirectorySeparator,filename);
#else
const char
@@ -713,7 +713,7 @@
break;
}
}
- (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s",home,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/lib/%s/%s",home,
directory,filename);
#endif
home=DestroyString(home);
@@ -727,11 +727,11 @@
Search based on executable directory.
*/
#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",GetClientPath(),
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",GetClientPath(),
DirectorySeparator,filename);
#else
char
- prefix[MaxTextExtent];
+ prefix[MagickPathExtent];
const char
*directory;
@@ -750,9 +750,9 @@
break;
}
}
- (void) CopyMagickString(prefix,GetClientPath(),MaxTextExtent);
+ (void) CopyMagickString(prefix,GetClientPath(),MagickPathExtent);
ChopPathComponents(prefix,1);
- (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s/%s",prefix,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s/lib/%s/%s/%s",prefix,
MAGICKCORE_MODULES_RELATIVE_PATH,directory,filename);
#endif
if (IsPathAccessible(path) != MagickFalse)
@@ -766,8 +766,8 @@
if ((NTGetModulePath("CORE_RL_MagickCore_.dll",path) != MagickFalse) ||
(NTGetModulePath("CORE_DB_MagickCore_.dll",path) != MagickFalse))
{
- (void) ConcatenateMagickString(path,DirectorySeparator,MaxTextExtent);
- (void) ConcatenateMagickString(path,filename,MaxTextExtent);
+ (void) ConcatenateMagickString(path,DirectorySeparator,MagickPathExtent);
+ (void) ConcatenateMagickString(path,filename,MagickPathExtent);
if (IsPathAccessible(path) != MagickFalse)
return(MagickTrue);
}
@@ -785,7 +785,7 @@
/*
Search $HOME/.config/ImageMagick.
*/
- (void) FormatLocaleString(path,MaxTextExtent,
+ (void) FormatLocaleString(path,MagickPathExtent,
"%s%s.config%sImageMagick%s%s",home,DirectorySeparator,
DirectorySeparator,DirectorySeparator,filename);
home=DestroyString(home);
@@ -922,8 +922,8 @@
Image **images,const int argc,const char **argv,ExceptionInfo *exception)
{
char
- name[MaxTextExtent],
- path[MaxTextExtent];
+ name[MagickPathExtent],
+ path[MagickPathExtent];
ImageFilterHandler
*image_filter;
@@ -985,9 +985,9 @@
Locate the module.
*/
#if !defined(MAGICKCORE_NAMESPACE_PREFIX)
- (void) FormatLocaleString(name,MaxTextExtent,"%sImage",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"%sImage",tag);
#else
- (void) FormatLocaleString(name,MaxTextExtent,"%s%sImage",
+ (void) FormatLocaleString(name,MagickPathExtent,"%s%sImage",
MAGICKCORE_NAMESPACE_PREFIX,tag);
#endif
/*
@@ -1052,10 +1052,10 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- module_path[MaxTextExtent],
+ filename[MagickPathExtent],
+ module_path[MagickPathExtent],
**modules,
- path[MaxTextExtent];
+ path[MagickPathExtent];
register ssize_t
i;
@@ -1211,10 +1211,10 @@
ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
- module_name[MaxTextExtent],
- name[MaxTextExtent],
- path[MaxTextExtent];
+ filename[MagickPathExtent],
+ module_name[MagickPathExtent],
+ name[MagickPathExtent],
+ path[MagickPathExtent];
MagickBooleanType
status;
@@ -1238,10 +1238,10 @@
module_info=(ModuleInfo *) GetModuleInfo(module,exception);
if (module_info != (ModuleInfo *) NULL)
return(MagickTrue);
- (void) CopyMagickString(module_name,module,MaxTextExtent);
+ (void) CopyMagickString(module_name,module,MagickPathExtent);
p=GetCoderInfo(module,exception);
if (p != (CoderInfo *) NULL)
- (void) CopyMagickString(module_name,p->name,MaxTextExtent);
+ (void) CopyMagickString(module_name,p->name,MagickPathExtent);
if (GetValueFromSplayTree(module_list,module_name) != (void *) NULL)
return(MagickTrue); /* module already opened, return */
/*
@@ -1442,18 +1442,18 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
assert(name != (char *) NULL);
#if defined(MAGICKCORE_LTDL_DELEGATE)
- (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
(void) LocaleLower(name);
#else
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
if (LocaleNCompare("IM_MOD_",tag,7) == 0)
- (void) CopyMagickString(name,tag,MaxTextExtent);
+ (void) CopyMagickString(name,tag,MagickPathExtent);
else
{
#if defined(_DEBUG)
- (void) FormatLocaleString(name,MaxTextExtent,"IM_MOD_DB_%s_.dll",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"IM_MOD_DB_%s_.dll",tag);
#else
- (void) FormatLocaleString(name,MaxTextExtent,"IM_MOD_RL_%s_.dll",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"IM_MOD_RL_%s_.dll",tag);
#endif
}
#endif
@@ -1491,11 +1491,11 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
assert(name != (char *) NULL);
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
- (void) FormatLocaleString(name,MaxTextExtent,"FILTER_%s_.dll",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"FILTER_%s_.dll",tag);
#elif !defined(MAGICKCORE_LTDL_DELEGATE)
- (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag);
#else
- (void) FormatLocaleString(name,MaxTextExtent,"%s.la",tag);
+ (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
#endif
}
@@ -1530,24 +1530,24 @@
static void TagToModuleName(const char *tag,const char *format,char *module)
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
assert(tag != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
assert(format != (const char *) NULL);
assert(module != (char *) NULL);
- (void) CopyMagickString(name,tag,MaxTextExtent);
+ (void) CopyMagickString(name,tag,MagickPathExtent);
LocaleUpper(name);
#if !defined(MAGICKCORE_NAMESPACE_PREFIX)
- (void) FormatLocaleString(module,MaxTextExtent,format,name);
+ (void) FormatLocaleString(module,MagickPathExtent,format,name);
#else
{
char
- prefix_format[MaxTextExtent];
+ prefix_format[MagickPathExtent];
- (void) FormatLocaleString(prefix_format,MaxTextExtent,"%s%s",
+ (void) FormatLocaleString(prefix_format,MagickPathExtent,"%s%s",
MAGICKCORE_NAMESPACE_PREFIX,format);
- (void) FormatLocaleString(module,MaxTextExtent,prefix_format,name);
+ (void) FormatLocaleString(module,MagickPathExtent,prefix_format,name);
}
#endif
}
diff --git a/MagickCore/monitor-private.h b/MagickCore/monitor-private.h
index d678641..e656023 100644
--- a/MagickCore/monitor-private.h
+++ b/MagickCore/monitor-private.h
@@ -28,11 +28,11 @@
const char *tag,const MagickOffsetType offset,const MagickSizeType extent)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
if (image->progress_monitor == (MagickProgressMonitor) NULL)
return(MagickTrue);
- (void) FormatLocaleString(message,MaxTextExtent,"%s/%s",tag,image->filename);
+ (void) FormatLocaleString(message,MagickPathExtent,"%s/%s",tag,image->filename);
return(image->progress_monitor(message,offset,extent,image->client_data));
}
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index c84097d..483008f 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -134,7 +134,7 @@
clone_info->matte_color=montage_info->matte_color;
clone_info->gravity=montage_info->gravity;
(void) CopyMagickString(clone_info->filename,montage_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
clone_info->debug=IsEventLogging();
return(clone_info);
}
@@ -223,7 +223,7 @@
assert(montage_info != (MontageInfo *) NULL);
(void) ResetMagickMemory(montage_info,0,sizeof(*montage_info));
(void) CopyMagickString(montage_info->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
montage_info->geometry=AcquireString(DefaultTileGeometry);
if (image_info->font != (char *) NULL)
montage_info->font=AcquireString(image_info->font);
@@ -326,7 +326,7 @@
#define TileImageTag "Tile/Image"
char
- tile_geometry[MaxTextExtent],
+ tile_geometry[MagickPathExtent],
*title;
const char
@@ -489,11 +489,11 @@
if (montage_info->frame != (char *) NULL)
{
char
- absolute_geometry[MaxTextExtent];
+ absolute_geometry[MagickPathExtent];
frame_info.width=extract_info.width;
frame_info.height=extract_info.height;
- (void) FormatLocaleString(absolute_geometry,MaxTextExtent,"%s!",
+ (void) FormatLocaleString(absolute_geometry,MagickPathExtent,"%s!",
montage_info->frame);
flags=ParseMetaGeometry(absolute_geometry,&frame_info.outer_bevel,
&frame_info.inner_bevel,&frame_info.width,&frame_info.height);
@@ -537,7 +537,7 @@
if (montage_info->texture != (char *) NULL)
{
(void) CopyMagickString(clone_info->filename,montage_info->texture,
- MaxTextExtent);
+ MagickPathExtent);
texture=ReadImage(clone_info,exception);
}
/*
@@ -619,7 +619,7 @@
Initialize montage image.
*/
(void) CopyMagickString(montage->filename,montage_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
montage->columns=(size_t) MagickMax((ssize_t) bounds.width,1);
montage->rows=(size_t) MagickMax((ssize_t) bounds.height,1);
(void) SetImageBackgroundColor(montage,exception);
@@ -645,7 +645,7 @@
GetMontageGeometry(montage_info->tile,number_images,&x_offset,&y_offset,
&sans,&sans);
y_offset+=(ssize_t) title_offset;
- (void) FormatLocaleString(montage->montage,MaxTextExtent,
+ (void) FormatLocaleString(montage->montage,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) (extract_info.width+
(extract_info.x+border_width)*2),(double) (extract_info.height+
(extract_info.y+border_width)*2+(double) ((metrics.ascent-
@@ -667,7 +667,7 @@
if (montage_info->title != (char *) NULL)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
DrawInfo
*clone_info;
@@ -682,7 +682,7 @@
clone_info->gravity=CenterGravity;
clone_info->pointsize*=2.0;
(void) GetTypeMetrics(image_list[0],clone_info,&metrics,exception);
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) montage->columns,(double)
(metrics.ascent-metrics.descent),0.0,(double) extract_info.y+4);
(void) CloneString(&clone_info->geometry,geometry);
@@ -756,7 +756,7 @@
tile_image->gravity=montage_info->gravity;
if (image->gravity != UndefinedGravity)
tile_image->gravity=image->gravity;
- (void) FormatLocaleString(tile_geometry,MaxTextExtent,"%.20gx%.20g+0+0",
+ (void) FormatLocaleString(tile_geometry,MagickPathExtent,"%.20gx%.20g+0+0",
(double) image->columns,(double) image->rows);
flags=ParseGravityGeometry(tile_image,tile_geometry,&geometry,exception);
x=(ssize_t) (geometry.x+border_width);
@@ -818,12 +818,12 @@
if (value != (const char *) NULL)
{
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
/*
Annotate composite tile with label.
*/
- (void) FormatLocaleString(geometry,MaxTextExtent,
+ (void) FormatLocaleString(geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) ((montage_info->frame ?
image->columns : width)-2*border_width),(double)
(metrics.ascent-metrics.descent+4)*MultilineCensus(value),
diff --git a/MagickCore/montage.h b/MagickCore/montage.h
index 9b6a6b4..bbfd5f3 100644
--- a/MagickCore/montage.h
+++ b/MagickCore/montage.h
@@ -60,7 +60,7 @@
gravity;
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
MagickBooleanType
debug;
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index b3c55a6..38f153b 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -217,7 +217,7 @@
*kernel;
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p,
@@ -374,7 +374,7 @@
ExceptionInfo *exception)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p,
@@ -492,7 +492,7 @@
char
*kernel_cache,
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
@@ -3667,7 +3667,7 @@
changed; /* number pixels changed by last primitive operation */
char
- v_info[MaxTextExtent];
+ v_info[MagickPathExtent];
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
@@ -3894,11 +3894,11 @@
/* Extra information for debugging compound operations */
if ( IfMagickTrue(verbose) ) {
if ( stage_limit > 1 )
- (void) FormatLocaleString(v_info,MaxTextExtent,"%s:%.20g.%.20g -> ",
+ (void) FormatLocaleString(v_info,MagickPathExtent,"%s:%.20g.%.20g -> ",
CommandOptionToMnemonic(MagickMorphologyOptions,method),(double)
method_loop,(double) stage_loop);
else if ( primitive != method )
- (void) FormatLocaleString(v_info, MaxTextExtent, "%s:%.20g -> ",
+ (void) FormatLocaleString(v_info, MagickPathExtent, "%s:%.20g -> ",
CommandOptionToMnemonic(MagickMorphologyOptions, method),(double)
method_loop);
else
diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 5902aa0..1c7668a 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -198,11 +198,11 @@
*wide_path;
MagickCoreGenesis((const char *) NULL,MagickFalse);
- wide_path=(wchar_t *) AcquireQuantumMemory(MaxTextExtent,
+ wide_path=(wchar_t *) AcquireQuantumMemory(MagickPathExtent,
sizeof(*wide_path));
if (wide_path == (wchar_t *) NULL)
return(FALSE);
- count=(ssize_t) GetModuleFileNameW(handle,wide_path,MaxTextExtent);
+ count=(ssize_t) GetModuleFileNameW(handle,wide_path,MagickPathExtent);
if (count != 0)
{
char
@@ -215,22 +215,22 @@
module_path[count+1]='\0';
break;
}
- path=(char *) AcquireQuantumMemory(16UL*MaxTextExtent,sizeof(*path));
+ path=(char *) AcquireQuantumMemory(16UL*MagickPathExtent,sizeof(*path));
if (path == (char *) NULL)
{
module_path=DestroyString(module_path);
wide_path=(wchar_t *) RelinquishMagickMemory(wide_path);
return(FALSE);
}
- count=(ssize_t) GetEnvironmentVariable("PATH",path,16*MaxTextExtent);
+ count=(ssize_t) GetEnvironmentVariable("PATH",path,16*MagickPathExtent);
if ((count != 0) && (strstr(path,module_path) == (char *) NULL))
{
- if ((strlen(module_path)+count+1) < (16*MaxTextExtent-1))
+ if ((strlen(module_path)+count+1) < (16*MagickPathExtent-1))
{
char
*variable;
- variable=(char *) AcquireQuantumMemory(16UL*MaxTextExtent,
+ variable=(char *) AcquireQuantumMemory(16UL*MagickPathExtent,
sizeof(*variable));
if (variable == (char *) NULL)
{
@@ -239,7 +239,7 @@
wide_path=(wchar_t *) RelinquishMagickMemory(wide_path);
return(FALSE);
}
- (void) FormatLocaleString(variable,16*MaxTextExtent,
+ (void) FormatLocaleString(variable,16*MagickPathExtent,
"%s;%s",module_path,path);
SetEnvironmentVariable("PATH",variable);
variable=DestroyString(variable);
@@ -606,7 +606,7 @@
const char *reason,const char *description)
{
char
- buffer[3*MaxTextExtent],
+ buffer[3*MagickPathExtent],
*message;
(void) severity;
@@ -617,18 +617,18 @@
}
message=GetExceptionMessage(errno);
if ((description != (char *) NULL) && errno)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s) [%s].\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s) [%s].\n",
GetClientName(),reason,description,message);
else
if (description != (char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s).\n",
GetClientName(),reason,description);
else
if (errno != 0)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s [%s].\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s [%s].\n",
GetClientName(),reason,message);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s.\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s.\n",
GetClientName(),reason);
message=DestroyString(message);
(void) MessageBox(NULL,buffer,"ImageMagick Exception",MB_OK | MB_TASKMODAL |
@@ -747,7 +747,7 @@
const size_t extent)
{
wchar_t
- wide_path[MaxTextExtent];
+ wide_path[MagickPathExtent];
(void) GetModuleFileNameW((HMODULE) NULL,wide_path,(DWORD) extent);
(void) WideCharToMultiByte(CP_UTF8,0,wide_path,-1,path,(int) extent,NULL,
@@ -820,7 +820,7 @@
MagickPrivate const char *NTGetLibraryError(void)
{
static char
- last_error[MaxTextExtent];
+ last_error[MagickPathExtent];
char
*error;
@@ -828,7 +828,7 @@
*last_error='\0';
error=NTGetLastError();
if (error)
- (void) CopyMagickString(last_error,error,MaxTextExtent);
+ (void) CopyMagickString(last_error,error,MagickPathExtent);
error=DestroyString(error);
return(last_error);
}
@@ -896,7 +896,7 @@
MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
{
char
- module_path[MaxTextExtent];
+ module_path[MagickPathExtent];
HMODULE
handle;
@@ -908,7 +908,7 @@
handle=GetModuleHandle(module);
if (handle == (HMODULE) NULL)
return(MagickFalse);
- length=GetModuleFileName(handle,module_path,MaxTextExtent);
+ length=GetModuleFileName(handle,module_path,MagickPathExtent);
if (length != 0)
GetPathComponent(module_path,HeadPath,path);
return(MagickTrue);
@@ -1011,7 +1011,7 @@
for (i=0; i < (ssize_t) (sizeof(products)/sizeof(products[0])); i++)
{
char
- key[MaxTextExtent];
+ key[MagickPathExtent];
HKEY
hkey;
@@ -1022,7 +1022,7 @@
REGSAM
mode;
- (void) FormatLocaleString(key,MaxTextExtent,"SOFTWARE\\%s",products[i]);
+ (void) FormatLocaleString(key,MagickPathExtent,"SOFTWARE\\%s",products[i]);
for (j=0; j < (ssize_t) (sizeof(registry_roots)/sizeof(registry_roots[0]));
j++)
{
@@ -1078,7 +1078,7 @@
char *value,const size_t length)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
*directory;
int
@@ -1106,7 +1106,7 @@
directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_PATH");
if (directory != (char *) NULL)
{
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll32.dll",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s%sgsdll32.dll",
directory,DirectorySeparator);
if (IsPathAccessible(buffer) != MagickFalse)
{
@@ -1115,7 +1115,7 @@
*is_64_bit=FALSE;
return(TRUE);
}
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s%sgsdll64.dll",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s%sgsdll64.dll",
directory,DirectorySeparator);
if (IsPathAccessible(buffer) != MagickFalse)
{
@@ -1160,7 +1160,7 @@
return(FALSE);
if (is_64_bit != NULL)
*is_64_bit=is_64_bit_version;
- (void) FormatLocaleString(buffer,MaxTextExtent,"SOFTWARE\\%s\\%d.%02d",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"SOFTWARE\\%s\\%d.%02d",
product_family,major_version,minor_version);
extent=(int) length;
if (NTGetRegistryValue(registry_roots[root_index].hkey,buffer,flags,name,
@@ -1177,7 +1177,7 @@
MagickPrivate int NTGhostscriptDLL(char *path,int length)
{
static char
- dll[MaxTextExtent] = { "" };
+ dll[MagickPathExtent] = { "" };
static BOOL
is_64_bit_version;
@@ -1258,7 +1258,7 @@
*p;
static char
- program[MaxTextExtent] = { "" };
+ program[MagickPathExtent] = { "" };
static BOOL
is_64_bit_version = FALSE;
@@ -1307,9 +1307,9 @@
MagickPrivate int NTGhostscriptFonts(char *path,int length)
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
*directory,
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
register char
*p,
@@ -1319,12 +1319,12 @@
directory=GetEnvironmentValue("MAGICK_GHOSTSCRIPT_FONT_PATH");
if (directory != (char *) NULL)
{
- (void) CopyMagickString(buffer,directory,MaxTextExtent);
+ (void) CopyMagickString(buffer,directory,MagickPathExtent);
directory=DestroyString(directory);
}
else
{
- if (NTGhostscriptGetString("GS_LIB",NULL,buffer,MaxTextExtent) == FALSE)
+ if (NTGhostscriptGetString("GS_LIB",NULL,buffer,MagickPathExtent) == FALSE)
return(FALSE);
}
for (p=buffer-1; p != (char *) NULL; p=strchr(p+1,DirectoryListSeparator))
@@ -1333,7 +1333,7 @@
q=strchr(path,DirectoryListSeparator);
if (q != (char *) NULL)
*q='\0';
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%sfonts.dir",path,
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%sfonts.dir",path,
DirectorySeparator);
if (IsPathAccessible(filename) != MagickFalse)
return(TRUE);
@@ -1364,7 +1364,7 @@
MagickPrivate int NTGhostscriptLoadDLL(void)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
if (ghost_semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&ghost_semaphore);
@@ -1622,15 +1622,15 @@
length;
wchar_t
- file_specification[MaxTextExtent];
+ file_specification[MagickPathExtent];
assert(path != (const char *) NULL);
length=MultiByteToWideChar(CP_UTF8,0,path,-1,file_specification,
- MaxTextExtent);
+ MagickPathExtent);
if (length == 0)
return((DIR *) NULL);
if(wcsncat(file_specification,(const wchar_t*) DirectorySeparator,
- MaxTextExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
+ MagickPathExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
return((DIR *) NULL);
entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
if (entry != (DIR *) NULL)
@@ -1641,7 +1641,7 @@
if (entry->hSearch == INVALID_HANDLE_VALUE)
{
if(wcsncat(file_specification,L"*.*",
- MaxTextExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
+ MagickPathExtent-wcslen(file_specification)-1) == (wchar_t*) NULL)
{
entry=(DIR *) RelinquishMagickMemory(entry);
return((DIR *) NULL);
@@ -1723,9 +1723,9 @@
length;
wchar_t
- path[MaxTextExtent];
+ path[MagickPathExtent];
- length=MultiByteToWideChar(CP_UTF8,0,filename,-1,path,MaxTextExtent);
+ length=MultiByteToWideChar(CP_UTF8,0,filename,-1,path,MagickPathExtent);
if (length == 0)
return((void *) NULL);
return (void *) LoadLibraryExW(path,NULL,LOAD_WITH_ALTERED_SEARCH_PATH);
@@ -1734,7 +1734,7 @@
MagickPrivate void *NTOpenLibrary(const char *filename)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
register const char
*p,
@@ -1757,9 +1757,9 @@
if (q != (const char*) NULL)
(void) CopyMagickString(path,p,q-p+1);
else
- (void) CopyMagickString(path,p,MaxTextExtent);
- (void) ConcatenateMagickString(path,DirectorySeparator,MaxTextExtent);
- (void) ConcatenateMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,p,MagickPathExtent);
+ (void) ConcatenateMagickString(path,DirectorySeparator,MagickPathExtent);
+ (void) ConcatenateMagickString(path,filename,MagickPathExtent);
handle=NTLoadLibrary(path);
if (handle != (void *) NULL || q == (const char*) NULL)
break;
@@ -1854,7 +1854,7 @@
MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey)
{
char
- package_key[MaxTextExtent];
+ package_key[MagickPathExtent];
DWORD
size,
@@ -1872,7 +1872,7 @@
/*
Look-up base key.
*/
- (void) FormatLocaleString(package_key,MaxTextExtent,"SOFTWARE\\%s\\%s\\Q:%d",
+ (void) FormatLocaleString(package_key,MagickPathExtent,"SOFTWARE\\%s\\%s\\Q:%d",
MagickPackageName,MagickLibVersionText,MAGICKCORE_QUANTUM_DEPTH);
(void) LogMagickEvent(ConfigureEvent,GetMagickModule(),"%s",package_key);
registry_key=(HKEY) INVALID_HANDLE_VALUE;
@@ -1990,7 +1990,7 @@
#ifndef MAGICKCORE_LIBRARY_NAME
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
#endif
DWORD
@@ -2014,7 +2014,7 @@
#ifdef MAGICKCORE_LIBRARY_NAME
handle=GetModuleHandle(MAGICKCORE_LIBRARY_NAME);
#else
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",GetClientPath(),
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",GetClientPath(),
DirectorySeparator,GetClientName());
if (IsPathAccessible(path) != MagickFalse)
handle=GetModuleHandle(path);
@@ -2036,7 +2036,7 @@
FreeResource(global);
return((unsigned char *) NULL);
}
- blob=(unsigned char *) AcquireQuantumMemory(length+MaxTextExtent,
+ blob=(unsigned char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*blob));
if (blob != (unsigned char *) NULL)
{
@@ -2194,14 +2194,14 @@
error=NTGetLastError(); \
if (error != (char *) NULL) \
{ \
- CopyMagickString(output,error,MaxTextExtent); \
+ CopyMagickString(output,error,MagickPathExtent); \
error=DestroyString(error); \
} \
}
char
*error,
- local_command[MaxTextExtent];
+ local_command[MagickPathExtent];
DWORD
bytes_read,
@@ -2234,7 +2234,7 @@
GetStartupInfo(&startup_info);
startup_info.dwFlags=STARTF_USESHOWWINDOW;
startup_info.wShowWindow=SW_SHOWMINNOACTIVE;
- (void) CopyMagickString(local_command,command,MaxTextExtent);
+ (void) CopyMagickString(local_command,command,MagickPathExtent);
asynchronous=command[strlen(command)-1] == '&' ? MagickTrue : MagickFalse;
if (asynchronous != MagickFalse)
{
@@ -2300,7 +2300,7 @@
if (read_output != (HANDLE) NULL)
if (PeekNamedPipe(read_output,(LPVOID) NULL,0,(LPDWORD) NULL,&size,
(LPDWORD) NULL))
- if ((size > 0) && (ReadFile(read_output,output,MaxTextExtent-1,
+ if ((size > 0) && (ReadFile(read_output,output,MagickPathExtent-1,
&bytes_read,NULL)))
output[bytes_read]='\0';
CleanupOutputHandles;
@@ -2584,16 +2584,16 @@
const char *reason,const char *description)
{
char
- buffer[2*MaxTextExtent];
+ buffer[2*MagickPathExtent];
(void) severity;
if (reason == (char *) NULL)
return;
if (description == (char *) NULL)
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s.\n",GetClientName(),
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s.\n",GetClientName(),
reason);
else
- (void) FormatLocaleString(buffer,MaxTextExtent,"%s: %s (%s).\n",
+ (void) FormatLocaleString(buffer,MagickPathExtent,"%s: %s (%s).\n",
GetClientName(),reason,description);
(void) MessageBox(NULL,buffer,"ImageMagick Warning",MB_OK | MB_TASKMODAL |
MB_SETFOREGROUND | MB_ICONINFORMATION);
diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index a8f9cc8..60497c4 100644
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -291,9 +291,9 @@
list_entries = 0;
char
- buffer[MaxTextExtent],
- system_root[MaxTextExtent],
- font_root[MaxTextExtent];
+ buffer[MagickPathExtent],
+ system_root[MagickPathExtent],
+ font_root[MagickPathExtent];
DWORD
type,
@@ -327,17 +327,17 @@
if (res != ERROR_SUCCESS)
return(MagickFalse);
*font_root='\0';
- (void) CopyMagickString(buffer,system_root,MaxTextExtent);
- (void) ConcatenateMagickString(buffer,"\\fonts\\arial.ttf",MaxTextExtent);
+ (void) CopyMagickString(buffer,system_root,MagickPathExtent);
+ (void) ConcatenateMagickString(buffer,"\\fonts\\arial.ttf",MagickPathExtent);
if (IsPathAccessible(buffer) != MagickFalse)
{
- (void) CopyMagickString(font_root,system_root,MaxTextExtent);
- (void) ConcatenateMagickString(font_root,"\\fonts\\",MaxTextExtent);
+ (void) CopyMagickString(font_root,system_root,MagickPathExtent);
+ (void) ConcatenateMagickString(font_root,"\\fonts\\",MagickPathExtent);
}
else
{
- (void) CopyMagickString(font_root,system_root,MaxTextExtent);
- (void) ConcatenateMagickString(font_root,"\\",MaxTextExtent);
+ (void) CopyMagickString(font_root,system_root,MagickPathExtent);
+ (void) ConcatenateMagickString(font_root,"\\",MagickPathExtent);
}
{
@@ -351,8 +351,8 @@
value_name_length;
char
- value_data[MaxTextExtent],
- value_name[MaxTextExtent];
+ value_data[MagickPathExtent],
+ value_name[MagickPathExtent];
res = ERROR_SUCCESS;
@@ -360,7 +360,7 @@
{
char
*family_extent,
- token[MaxTextExtent],
+ token[MagickPathExtent],
*pos,
*q;
@@ -384,7 +384,7 @@
type_info->signature=MagickSignature;
/* Name */
- (void) CopyMagickString(buffer,value_name,MaxTextExtent);
+ (void) CopyMagickString(buffer,value_name,MagickPathExtent);
for(pos = buffer; *pos != 0 ; pos++)
if (*pos == ' ')
*pos = '-';
@@ -398,11 +398,11 @@
/* Glyphs */
if (strchr(value_data,'\\') != (char *) NULL)
- (void) CopyMagickString(buffer,value_data,MaxTextExtent);
+ (void) CopyMagickString(buffer,value_data,MagickPathExtent);
else
{
- (void) CopyMagickString(buffer,font_root,MaxTextExtent);
- (void) ConcatenateMagickString(buffer,value_data,MaxTextExtent);
+ (void) CopyMagickString(buffer,font_root,MagickPathExtent);
+ (void) ConcatenateMagickString(buffer,value_data,MagickPathExtent);
}
LocaleLower(buffer);
diff --git a/MagickCore/opencl-private.h b/MagickCore/opencl-private.h
index 7118abf..67adf1e 100644
--- a/MagickCore/opencl-private.h
+++ b/MagickCore/opencl-private.h
@@ -380,9 +380,9 @@
ExceptionInfo* exception) {
#ifdef OPENCLLOG_ENABLED
if (exception->severity!=0) {
- char message[MaxTextExtent];
+ char message[MagickPathExtent];
/* dump the source into a file */
- (void) FormatLocaleString(message,MaxTextExtent,"%s:%d Exception(%d):%s "
+ (void) FormatLocaleString(message,MagickPathExtent,"%s:%d Exception(%d):%s "
,function,line,exception->severity,exception->reason);
OpenCLLog(message);
}
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 3790e48..479efc5 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -632,10 +632,10 @@
{
char* name;
char* ptr;
- char path[MaxTextExtent];
- char deviceName[MaxTextExtent];
+ char path[MagickPathExtent];
+ char deviceName[MagickPathExtent];
const char* prefix = "magick_opencl";
- clEnv->library->clGetDeviceInfo(clEnv->device, CL_DEVICE_NAME, MaxTextExtent, deviceName, NULL);
+ clEnv->library->clGetDeviceInfo(clEnv->device, CL_DEVICE_NAME, MagickPathExtent, deviceName, NULL);
ptr=deviceName;
/* strip out illegal characters for file names */
while (*ptr != '\0')
@@ -647,7 +647,7 @@
}
ptr++;
}
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s_%s_%02d_%08x_%.20g.bin",
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s_%s_%02d_%08x_%.20g.bin",
GetOpenCLCachedFilesDirectory(),DirectorySeparator,prefix,deviceName,
(unsigned int) prog,signature,(double) sizeof(char*)*8);
name = (char*)AcquireMagickMemory(strlen(path)+1);
@@ -837,7 +837,7 @@
/* The index of the program strings in this array has to match the value of the enum MagickOpenCLProgram */
const char* MagickOpenCLProgramStrings[MAGICK_OPENCL_NUM_PROGRAMS];
- char options[MaxTextExtent];
+ char options[MagickPathExtent];
unsigned int optionsSignature;
#ifdef MAGICKCORE_CLPERFMARKER
@@ -845,7 +845,7 @@
#endif
/* Get additional options */
- (void) FormatLocaleString(options, MaxTextExtent, CLOptions, (float)QuantumRange,
+ (void) FormatLocaleString(options, MagickPathExtent, CLOptions, (float)QuantumRange,
(float)QuantumScale, (float)CLCharQuantumScale, (float)MagickEpsilon, (float)MagickPI, (unsigned int)MaxMap, (unsigned int)MAGICKCORE_QUANTUM_DEPTH);
/*
@@ -900,11 +900,11 @@
if (loadSuccessful == MagickFalse)
{
- char path[MaxTextExtent];
+ char path[MagickPathExtent];
FILE* fileHandle;
/* dump the source into a file */
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s"
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s"
,GetOpenCLCachedFilesDirectory()
,DirectorySeparator,"magick_badcl.cl");
fileHandle = fopen(path, "wb");
@@ -922,7 +922,7 @@
log = (char*)AcquireMagickMemory(logSize);
clEnv->library->clGetProgramBuildInfo(clEnv->programs[i], clEnv->device, CL_PROGRAM_BUILD_LOG, logSize, log, &logSize);
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s"
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s"
,GetOpenCLCachedFilesDirectory()
,DirectorySeparator,"magick_badcl_build.log");
fileHandle = fopen(path, "wb");
@@ -1073,9 +1073,9 @@
for (i = 0; i < numPlatforms; i++)
{
- char version[MaxTextExtent];
+ char version[MagickPathExtent];
cl_uint numDevices;
- status = clEnv->library->clGetPlatformInfo(clEnv->platform, CL_PLATFORM_VERSION, MaxTextExtent, version, NULL);
+ status = clEnv->library->clGetPlatformInfo(clEnv->platform, CL_PLATFORM_VERSION, MagickPathExtent, version, NULL);
if (status != CL_SUCCESS)
{
(void) ThrowMagickException(exception, GetMagickModule(), DelegateWarning,
@@ -2169,7 +2169,7 @@
imageInfo=AcquireImageInfo();
CloneString(&imageInfo->size,ACCELERATE_PERF_DIMEN);
- CopyMagickString(imageInfo->filename,"xc:none",MaxTextExtent);
+ CopyMagickString(imageInfo->filename,"xc:none",MagickPathExtent);
inputImage=ReadImage(imageInfo,exception);
initAccelerateTimer(&timer);
@@ -2280,7 +2280,7 @@
unsigned int i;
unsigned int bestDeviceIndex;
AccelerateScoreType bestScore;
- char path[MaxTextExtent];
+ char path[MagickPathExtent];
MagickBooleanType flag;
ds_evaluation_type profileType;
@@ -2305,7 +2305,7 @@
goto cleanup;
}
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s"
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s"
,GetOpenCLCachedFilesDirectory()
,DirectorySeparator,IMAGEMAGICK_PROFILE_FILE);
@@ -2512,8 +2512,8 @@
cl_device_type dType;
clEnv->library->clGetDeviceInfo(clEnv->device,CL_DEVICE_TYPE ,sizeof(cl_device_type),&dType,NULL);
if (dType == CL_DEVICE_TYPE_CPU) {
- char buffer[MaxTextExtent];
- clEnv->library->clGetPlatformInfo(clEnv->platform, CL_PLATFORM_NAME, MaxTextExtent, buffer, NULL);
+ char buffer[MagickPathExtent];
+ clEnv->library->clGetPlatformInfo(clEnv->platform, CL_PLATFORM_NAME, MagickPathExtent, buffer, NULL);
/* Workaround for Intel OpenCL CPU runtime bug */
/* Turn off OpenCL when a problem is detected! */
@@ -2813,7 +2813,7 @@
}
LockSemaphoreInfo(openclCachedFilesDirectoryLock);
if (openclCachedFilesDirectory == NULL) {
- char path[MaxTextExtent];
+ char path[MagickPathExtent];
char *home = NULL;
char *temp = NULL;
struct stat attributes;
@@ -2842,7 +2842,7 @@
*/
/* first check if $HOME/.config exists */
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s.config",
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s.config",
home,DirectorySeparator);
status=GetPathAttributes(path,&attributes);
if (status == MagickFalse)
@@ -2858,7 +2858,7 @@
/* first check if $HOME/.config/ImageMagick exists */
if (mkdirStatus==0)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s.config%sImageMagick",
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s.config%sImageMagick",
home,DirectorySeparator,DirectorySeparator);
status=GetPathAttributes(path,&attributes);
@@ -2943,7 +2943,7 @@
if (getenv("MAGICK_OCL_LOG"))
{
if (message) {
- char path[MaxTextExtent];
+ char path[MagickPathExtent];
unsigned long allocSize;
MagickCLEnv clEnv;
@@ -2951,7 +2951,7 @@
clEnv = GetDefaultOpenCLEnv();
/* dump the source into a file */
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s"
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s"
,GetOpenCLCachedFilesDirectory()
,DirectorySeparator,OPENCL_LOG_FILE);
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 1d49014..01e2a2e 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1809,21 +1809,21 @@
const char *option)
{
char
- key[MaxTextExtent],
- value[MaxTextExtent];
+ key[MagickPathExtent],
+ value[MagickPathExtent];
register char
*p;
assert(image_info != (ImageInfo *) NULL);
assert(option != (const char *) NULL);
- (void) CopyMagickString(key,option,MaxTextExtent);
+ (void) CopyMagickString(key,option,MagickPathExtent);
for (p=key; *p != '\0'; p++)
if (*p == '=')
break;
*value='\0';
if (*p == '=')
- (void) CopyMagickString(value,p+1,MaxTextExtent);
+ (void) CopyMagickString(value,p+1,MagickPathExtent);
*p='\0';
return(SetImageOption(image_info,key,value));
}
@@ -2046,7 +2046,7 @@
const MagickBooleanType list,const char *options)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const OptionInfo
*command_info,
@@ -2089,7 +2089,7 @@
while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != sentinel)) &&
(*p != '\0'))
{
- if ((q-token) >= (MaxTextExtent-1))
+ if ((q-token) >= (MagickPathExtent-1))
break;
*q++=(*p++);
}
@@ -2103,9 +2103,9 @@
(strchr(token+1,'_') != (char *) NULL)))
{
while ((q=strchr(token+1,'-')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
while ((q=strchr(token+1,'_')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
if (LocaleCompare(token,option_info[i].mnemonic) == 0)
break;
@@ -2591,7 +2591,7 @@
const MagickBooleanType list,const char *options)
{
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const OptionInfo
*command_info,
@@ -2634,7 +2634,7 @@
while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != sentinel)) &&
(*p != '\0'))
{
- if ((q-token) >= (MaxTextExtent-1))
+ if ((q-token) >= (MagickPathExtent-1))
break;
*q++=(*p++);
}
@@ -2648,9 +2648,9 @@
(strchr(token+1,'_') != (char *) NULL)))
{
while ((q=strchr(token+1,'-')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
while ((q=strchr(token+1,'_')) != (char *) NULL)
- (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+ (void) CopyMagickString(q,q+1,MagickPathExtent-strlen(q));
for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
if (LocaleCompare(token,option_info[i].mnemonic) == 0)
break;
@@ -2695,7 +2695,7 @@
{
char
*q,
- token[MaxTextExtent];
+ token[MagickPathExtent];
ssize_t
channel;
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index a47971c..a5ccb0b 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4325,7 +4325,7 @@
for (i=0; i < (ssize_t) image->number_channels; i++)
{
char
- traits[MaxTextExtent];
+ traits[MagickPathExtent];
const char
*name;
@@ -4396,13 +4396,13 @@
channel=GetPixelChannelChannel(image,i);
*traits='\0';
if ((GetPixelChannelTraits(image,channel) & UpdatePixelTrait) != 0)
- (void) ConcatenateMagickString(traits,"update,",MaxTextExtent);
+ (void) ConcatenateMagickString(traits,"update,",MagickPathExtent);
if ((GetPixelChannelTraits(image,channel) & BlendPixelTrait) != 0)
- (void) ConcatenateMagickString(traits,"blend,",MaxTextExtent);
+ (void) ConcatenateMagickString(traits,"blend,",MagickPathExtent);
if ((GetPixelChannelTraits(image,channel) & CopyPixelTrait) != 0)
- (void) ConcatenateMagickString(traits,"copy,",MaxTextExtent);
+ (void) ConcatenateMagickString(traits,"copy,",MagickPathExtent);
if (*traits == '\0')
- (void) ConcatenateMagickString(traits,"undefined,",MaxTextExtent);
+ (void) ConcatenateMagickString(traits,"undefined,",MagickPathExtent);
traits[strlen(traits)-1]='\0';
(void) LogMagickEvent(PixelEvent,GetMagickModule()," %.20g: %s (%s)",
(double) i,name,traits);
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 3058ddc..14c3d54 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -256,7 +256,7 @@
static PolicyInfo *GetPolicyInfo(const char *name,ExceptionInfo *exception)
{
char
- policyname[MaxTextExtent];
+ policyname[MagickPathExtent];
register PolicyInfo
*p;
@@ -272,12 +272,12 @@
*/
*policyname='\0';
if (name != (const char *) NULL)
- (void) CopyMagickString(policyname,name,MaxTextExtent);
+ (void) CopyMagickString(policyname,name,MagickPathExtent);
for (q=policyname; *q != '\0'; q++)
{
if (isspace((int) ((unsigned char) *q)) == 0)
continue;
- (void) CopyMagickString(q,q+1,MaxTextExtent);
+ (void) CopyMagickString(q,q+1,MagickPathExtent);
q--;
}
/*
@@ -736,7 +736,7 @@
ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -766,7 +766,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -792,7 +792,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -805,17 +805,17 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 34935c4..dc1d92e 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1677,8 +1677,8 @@
ExceptionInfo *exception)
{
char
- key[MaxTextExtent],
- property[MaxTextExtent];
+ key[MagickPathExtent],
+ property[MagickPathExtent];
MagickBooleanType
status;
@@ -1690,7 +1690,7 @@
if (image->profiles == (SplayTreeInfo *) NULL)
image->profiles=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory,
DestroyProfile);
- (void) CopyMagickString(key,name,MaxTextExtent);
+ (void) CopyMagickString(key,name,MagickPathExtent);
LocaleLower(key);
status=AddValueToSplayTree((SplayTreeInfo *) image->profiles,
ConstantString(key),CloneStringInfo(profile));
@@ -1704,7 +1704,7 @@
/*
Inject profile into image properties.
*/
- (void) FormatLocaleString(property,MaxTextExtent,"%s:*",name);
+ (void) FormatLocaleString(property,MagickPathExtent,"%s:*",name);
(void) GetImageProperty(image,property,exception);
return(status);
}
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 728b13a..259f209 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -142,9 +142,9 @@
if( IfMagickTrue(clone_image->debug) )
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
clone_image->filename);
- (void) CopyMagickString(image->filename,clone_image->filename,MaxTextExtent);
+ (void) CopyMagickString(image->filename,clone_image->filename,MagickPathExtent);
(void) CopyMagickString(image->magick_filename,clone_image->magick_filename,
- MaxTextExtent);
+ MagickPathExtent);
image->compression=clone_image->compression;
image->quality=clone_image->quality;
image->depth=clone_image->depth;
@@ -231,21 +231,21 @@
const char *property,ExceptionInfo *exception)
{
char
- key[MaxTextExtent],
- value[MaxTextExtent];
+ key[MagickPathExtent],
+ value[MagickPathExtent];
register char
*p;
assert(image != (Image *) NULL);
assert(property != (const char *) NULL);
- (void) CopyMagickString(key,property,MaxTextExtent-1);
+ (void) CopyMagickString(key,property,MagickPathExtent-1);
for (p=key; *p != '\0'; p++)
if (*p == '=')
break;
*value='\0';
if (*p == '=')
- (void) CopyMagickString(value,p+1,MaxTextExtent);
+ (void) CopyMagickString(value,p+1,MagickPathExtent);
*p='\0';
return(SetImageProperty(image,key,value,exception));
}
@@ -355,7 +355,7 @@
const char *property,const char *format,...)
{
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
ExceptionInfo
*exception;
@@ -370,7 +370,7 @@
operands;
va_start(operands,format);
- n=FormatLocaleStringList(value,MaxTextExtent,format,operands);
+ n=FormatLocaleStringList(value,MagickPathExtent,format,operands);
(void) n;
va_end(operands);
exception=AcquireExceptionInfo();
@@ -562,8 +562,8 @@
{
char
*attribute,
- format[MaxTextExtent],
- name[MaxTextExtent],
+ format[MagickPathExtent],
+ name[MagickPathExtent],
*resource;
const StringInfo
@@ -601,7 +601,7 @@
if ((count != 2) && (count != 3) && (count != 4))
return(MagickFalse);
if (count < 4)
- (void) CopyMagickString(format,"SVG",MaxTextExtent);
+ (void) CopyMagickString(format,"SVG",MagickPathExtent);
if (count < 3)
*name='\0';
sub_number=1;
@@ -633,8 +633,8 @@
if ((count != 0) && ((size_t) count <= length))
{
resource=(char *) NULL;
- if (~((size_t) count) >= (MaxTextExtent-1))
- resource=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
+ if (~((size_t) count) >= (MagickPathExtent-1))
+ resource=(char *) AcquireQuantumMemory((size_t) count+MagickPathExtent,
sizeof(*resource));
if (resource != (char *) NULL)
{
@@ -670,8 +670,8 @@
We have the resource of interest.
*/
attribute=(char *) NULL;
- if (~((size_t) count) >= (MaxTextExtent-1))
- attribute=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
+ if (~((size_t) count) >= (MagickPathExtent-1))
+ attribute=(char *) AcquireQuantumMemory((size_t) count+MagickPathExtent,
sizeof(*attribute));
if (attribute != (char *) NULL)
{
@@ -776,10 +776,10 @@
p1=p; \
for (component=0; component < components; component++) \
{ \
- length+=FormatLocaleString(buffer+length,MaxTextExtent-length, \
+ length+=FormatLocaleString(buffer+length,MagickPathExtent-length, \
format", ",arg); \
- if (length >= (MaxTextExtent-1)) \
- length=MaxTextExtent-1; \
+ if (length >= (MagickPathExtent-1)) \
+ length=MagickPathExtent-1; \
p1+=size; \
} \
if (length > 1) \
@@ -802,10 +802,10 @@
p1=p; \
for (component=0; component < components; component++) \
{ \
- length+=FormatLocaleString(buffer+length,MaxTextExtent-length, \
+ length+=FormatLocaleString(buffer+length,MagickPathExtent-length, \
format", ",(arg1),(arg2)); \
- if (length >= (MaxTextExtent-1)) \
- length=MaxTextExtent-1; \
+ if (length >= (MagickPathExtent-1)) \
+ length=MagickPathExtent-1; \
p1+=size; \
} \
if (length > 1) \
@@ -1353,7 +1353,7 @@
if ((all != 0) || (tag == (size_t) tag_value))
{
char
- buffer[MaxTextExtent],
+ buffer[MagickPathExtent],
*value;
value=(char *) NULL;
@@ -1470,7 +1470,7 @@
break;
}
}
- (void) FormatLocaleString(key,MaxTextExtent,"%s",description);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s",description);
if (level == 2)
(void) SubstituteString(&key,"exif:","exif:thumbnail:");
break;
@@ -1478,14 +1478,14 @@
case 2:
{
if (tag_value < 0x10000)
- (void) FormatLocaleString(key,MaxTextExtent,"#%04lx",
+ (void) FormatLocaleString(key,MagickPathExtent,"#%04lx",
(unsigned long) tag_value);
else
if (tag_value < 0x20000)
- (void) FormatLocaleString(key,MaxTextExtent,"@%04lx",
+ (void) FormatLocaleString(key,MagickPathExtent,"@%04lx",
(unsigned long) (tag_value & 0xffff));
else
- (void) FormatLocaleString(key,MaxTextExtent,"unknown");
+ (void) FormatLocaleString(key,MagickPathExtent,"unknown");
break;
}
default:
@@ -1582,21 +1582,21 @@
(void) SetImageProperty((Image *) image,"icc:name",name,exception);
#else
char
- info[MaxTextExtent];
+ info[MagickPathExtent];
(void) cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,
- "en","US",info,MaxTextExtent);
+ "en","US",info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:description",info,
exception);
(void) cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,
- "en","US",info,MaxTextExtent);
+ "en","US",info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:manufacturer",info,
exception);
(void) cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en",
- "US",info,MaxTextExtent);
+ "US",info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:model",info,exception);
(void) cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,
- "en","US",info,MaxTextExtent);
+ "en","US",info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:copyright",info,exception);
#endif
(void) cmsCloseProfile(icc_profile);
@@ -1727,26 +1727,26 @@
if (path == (char *) NULL)
return((char *) NULL);
message=AcquireString((char *) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,"/ClipImage\n");
+ (void) FormatLocaleString(message,MagickPathExtent,"/ClipImage\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent,"{\n");
+ (void) FormatLocaleString(message,MagickPathExtent,"{\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent," /c {curveto} bind def\n");
+ (void) FormatLocaleString(message,MagickPathExtent," /c {curveto} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent," /l {lineto} bind def\n");
+ (void) FormatLocaleString(message,MagickPathExtent," /l {lineto} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent," /m {moveto} bind def\n");
+ (void) FormatLocaleString(message,MagickPathExtent," /m {moveto} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" /v {currentpoint 6 2 roll curveto} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" /y {2 copy curveto} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" /z {closepath} bind def\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent," newpath\n");
+ (void) FormatLocaleString(message,MagickPathExtent," newpath\n");
(void) ConcatenateString(&path,message);
/*
The clipping path format is defined in "Adobe Photoshop File
@@ -1815,7 +1815,7 @@
}
if( IfMagickFalse(in_subpath) )
{
- (void) FormatLocaleString(message,MaxTextExtent," %g %g m\n",
+ (void) FormatLocaleString(message,MagickPathExtent," %g %g m\n",
point[1].x,point[1].y);
for (i=0; i < 3; i++)
{
@@ -1831,20 +1831,20 @@
*/
if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
(point[0].x == point[1].x) && (point[0].y == point[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g l\n",point[1].x,point[1].y);
else
if ((last[1].x == last[2].x) && (last[1].y == last[2].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g v\n",point[0].x,point[0].y,
point[1].x,point[1].y);
else
if ((point[0].x == point[1].x) && (point[0].y == point[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g y\n",last[2].x,last[2].y,
point[1].x,point[1].y);
else
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g %g %g c\n",last[2].x,
last[2].y,point[0].x,point[0].y,point[1].x,point[1].y);
for (i=0; i < 3; i++)
@@ -1864,20 +1864,20 @@
*/
if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
(first[0].x == first[1].x) && (first[0].y == first[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g l z\n",first[1].x,first[1].y);
else
if ((last[1].x == last[2].x) && (last[1].y == last[2].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g v z\n",first[0].x,first[0].y,
first[1].x,first[1].y);
else
if ((first[0].x == first[1].x) && (first[0].y == first[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g y z\n",last[2].x,last[2].y,
first[1].x,first[1].y);
else
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
" %g %g %g %g %g %g c z\n",last[2].x,
last[2].y,first[0].x,first[0].y,first[1].x,first[1].y);
(void) ConcatenateString(&path,message);
@@ -1899,9 +1899,9 @@
/*
Returns an empty PS path if the path has no knots.
*/
- (void) FormatLocaleString(message,MaxTextExtent," eoclip\n");
+ (void) FormatLocaleString(message,MagickPathExtent," eoclip\n");
(void) ConcatenateString(&path,message);
- (void) FormatLocaleString(message,MaxTextExtent,"} bind def");
+ (void) FormatLocaleString(message,MagickPathExtent,"} bind def");
(void) ConcatenateString(&path,message);
message=DestroyString(message);
return(path);
@@ -1935,7 +1935,7 @@
if (path == (char *) NULL)
return((char *) NULL);
message=AcquireString((char *) NULL);
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
("<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"
"<svg xmlns=\"http://www.w3.org/2000/svg\""
" width=\"%.20g\" height=\"%.20g\">\n"
@@ -2007,7 +2007,7 @@
}
if (in_subpath == MagickFalse)
{
- (void) FormatLocaleString(message,MaxTextExtent,"M %g %g\n",
+ (void) FormatLocaleString(message,MagickPathExtent,"M %g %g\n",
point[1].x,point[1].y);
for (i=0; i < 3; i++)
{
@@ -2023,10 +2023,10 @@
*/
if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
(point[0].x == point[1].x) && (point[0].y == point[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"L %g %g\n",point[1].x,point[1].y);
else
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"C %g %g %g %g %g %g\n",last[2].x,
last[2].y,point[0].x,point[0].y,point[1].x,point[1].y);
for (i=0; i < 3; i++)
@@ -2046,10 +2046,10 @@
*/
if ((last[1].x == last[2].x) && (last[1].y == last[2].y) &&
(first[0].x == first[1].x) && (first[0].y == first[1].y))
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"L %g %g Z\n",first[1].x,first[1].y);
else
- (void) FormatLocaleString(message,MaxTextExtent,
+ (void) FormatLocaleString(message,MagickPathExtent,
"C %g %g %g %g %g %g Z\n",last[2].x,
last[2].y,first[0].x,first[0].y,first[1].x,first[1].y);
(void) ConcatenateString(&path,message);
@@ -2270,7 +2270,7 @@
Image *image,const char letter,ExceptionInfo *exception)
{
char
- value[MaxTextExtent]; /* formated string to store as a returned artifact */
+ value[MagickPathExtent]; /* formated string to store as a returned artifact */
const char
*string; /* return a string already stored somewher */
@@ -2289,7 +2289,7 @@
case 'b': /* image size read in - in bytes */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatMagickSize(image->extent,MagickFalse,"B",MaxTextExtent,
+ (void) FormatMagickSize(image->extent,MagickFalse,"B",MagickPathExtent,
value);
break;
}
@@ -2325,7 +2325,7 @@
case 'g': /* Image geometry, canvas and offset %Wx%H+%X+%Y */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g%+.20g%+.20g",
(double) image->page.width,(double) image->page.height,
(double) image->page.x,(double) image->page.y);
break;
@@ -2333,7 +2333,7 @@
case 'h': /* Image height (current) */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
(image->rows != 0 ? image->rows : image->magick_rows));
break;
}
@@ -2349,7 +2349,7 @@
FUTURE: ensure this does not generate the formatted comment!
*/
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetNumberColors(image,(FILE *) NULL,exception));
break;
}
@@ -2370,7 +2370,7 @@
case 'n': /* Number of images in the list. */
{
if ( image != (Image *) NULL )
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetImageListLength(image));
else
string="0"; /* no images or scenes */
@@ -2383,14 +2383,14 @@
case 'p': /* Image index in current image list */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetImageIndexInList(image));
break;
}
case 'q': /* Quantum depth of image in memory */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
MAGICKCORE_QUANTUM_DEPTH);
break;
}
@@ -2403,7 +2403,7 @@
colorspace=image->colorspace;
if (IfMagickTrue(SetImageGray(image,exception)))
colorspace=GRAYColorspace; /* FUTURE: this is IMv6 not IMv7 */
- (void) FormatLocaleString(value,MaxTextExtent,"%s %s %s",
+ (void) FormatLocaleString(value,MagickPathExtent,"%s %s %s",
CommandOptionToMnemonic(MagickClassOptions,(ssize_t) image->storage_class),
CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace),
image->alpha_trait != UndefinedPixelTrait ? "Alpha" : "");
@@ -2413,16 +2413,16 @@
{
#if 0 /* this seems non-sensical -- simplifing */
if (image_info->number_scenes != 0)
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image_info->scene);
else if (image != (Image *) NULL)
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->scene);
else
string="0";
#else
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->scene);
#endif
break;
@@ -2441,28 +2441,28 @@
case 'w': /* Image width (current) */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
(image->columns != 0 ? image->columns : image->magick_columns));
break;
}
case 'x': /* Image horizontal resolution (with units) */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
fabs(image->resolution.x) > MagickEpsilon ? image->resolution.x : 72.0);
break;
}
case 'y': /* Image vertical resolution (with units) */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
fabs(image->resolution.y) > MagickEpsilon ? image->resolution.y : 72.0);
break;
}
case 'z': /* Image depth as read in */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
(double) image->depth);
break;
}
@@ -2490,14 +2490,14 @@
case 'G': /* Image size as geometry = "%wx%h" */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",
(double)image->magick_columns,(double) image->magick_rows);
break;
}
case 'H': /* layer canvas height */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
(double) image->page.height);
break;
}
@@ -2510,21 +2510,21 @@
case 'O': /* layer canvas offset with sign = "+%X+%Y" */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%+ld%+ld",(long)
+ (void) FormatLocaleString(value,MagickPathExtent,"%+ld%+ld",(long)
image->page.x,(long) image->page.y);
break;
}
case 'P': /* layer canvas page size = "%Wx%H" */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20gx%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",
(double) image->page.width,(double) image->page.height);
break;
}
case 'Q': /* image compression quality */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
(image->quality == 0 ? 92 : image->quality));
break;
}
@@ -2535,12 +2535,12 @@
if (image_info->number_scenes == 0)
string="2147483647";
else if ( image != (Image *) NULL )
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image_info->scene+image_info->number_scenes);
else
string="0";
#else
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
(image_info->number_scenes == 0 ? 2147483647 :
image_info->number_scenes));
#endif
@@ -2549,7 +2549,7 @@
case 'T': /* image time delay for animations */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->delay);
break;
}
@@ -2563,21 +2563,21 @@
case 'W': /* layer canvas width */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->page.width);
break;
}
case 'X': /* layer canvas X offset */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%+.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%+.20g",(double)
image->page.x);
break;
}
case 'Y': /* layer canvas Y offset */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MaxTextExtent,"%+.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%+.20g",(double)
image->page.y);
break;
}
@@ -2595,7 +2595,7 @@
WarnNoImageReturn("\"%%%c\"",letter);
page=GetImageBoundingBox(image,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g%+.20g%+.20g",
(double) page.width,(double) page.height,(double) page.x,(double)
page.y);
break;
@@ -2636,7 +2636,7 @@
Image *image,const char *property,ExceptionInfo *exception)
{
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
const char
*string;
@@ -2667,7 +2667,7 @@
}
if (LocaleCompare("bit-depth",property) == 0)
{
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetImageDepth(image, exception));
break;
}
@@ -2679,12 +2679,12 @@
{
WarnNoImageReturn("\"%%[%s]\"",property);
/* FUTURE: return actual image channels */
- (void) FormatLocaleString(value,MaxTextExtent,"%s",
+ (void) FormatLocaleString(value,MagickPathExtent,"%s",
CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
image->colorspace));
LocaleLower(value);
if( image->alpha_trait != UndefinedPixelTrait )
- (void) ConcatenateMagickString(value,"a",MaxTextExtent);
+ (void) ConcatenateMagickString(value,"a",MagickPathExtent);
break;
}
if (LocaleCompare("colorspace",property) == 0)
@@ -2697,7 +2697,7 @@
}
if (LocaleCompare("copyright",property) == 0)
{
- (void) CopyMagickString(value,GetMagickCopyright(),MaxTextExtent);
+ (void) CopyMagickString(value,GetMagickCopyright(),MagickPathExtent);
break;
}
break;
@@ -2707,7 +2707,7 @@
if (LocaleCompare("depth",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->depth);
break;
}
@@ -2729,7 +2729,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageEntropy(image,&entropy,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),entropy);
break;
}
@@ -2747,14 +2747,14 @@
if (LocaleCompare("gamma",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),image->gamma);
break;
}
if (LocaleCompare("group",property) == 0)
{
WarnNoImageInfoReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"0x%lx",(unsigned long)
+ (void) FormatLocaleString(value,MagickPathExtent,"0x%lx",(unsigned long)
image_info->group);
break;
}
@@ -2765,7 +2765,7 @@
if (LocaleCompare("height",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
image->magick_rows != 0 ? (double) image->magick_rows : 256.0);
break;
}
@@ -2791,7 +2791,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageKurtosis(image,&kurtosis,&skewness,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),kurtosis);
break;
}
@@ -2814,7 +2814,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageRange(image,&minimum,&maximum,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),maximum);
break;
}
@@ -2826,7 +2826,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageMean(image,&mean,&standard_deviation,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),mean);
break;
}
@@ -2839,7 +2839,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageRange(image,&minimum,&maximum,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),minimum);
break;
}
@@ -2864,7 +2864,7 @@
if (LocaleCompare("output",property) == 0)
{
WarnNoImageInfoReturn("\"%%[%s]\"",property);
- (void) CopyMagickString(value,image_info->filename,MaxTextExtent);
+ (void) CopyMagickString(value,image_info->filename,MagickPathExtent);
break;
}
break;
@@ -2896,7 +2896,7 @@
string=cmsTakeProductName(icc_profile);
#else
(void) cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,
- "en","US",value,MaxTextExtent);
+ "en","US",value,MagickPathExtent);
#endif
(void) cmsCloseProfile(icc_profile);
}
@@ -2911,12 +2911,12 @@
name=GetNextImageProfile(image);
if (name != (char *) NULL)
{
- (void) CopyMagickString(value,name,MaxTextExtent);
+ (void) CopyMagickString(value,name,MagickPathExtent);
name=GetNextImageProfile(image);
while (name != (char *) NULL)
{
- ConcatenateMagickString(value,",",MaxTextExtent);
- ConcatenateMagickString(value,name,MaxTextExtent);
+ ConcatenateMagickString(value,",",MagickPathExtent);
+ ConcatenateMagickString(value,name,MagickPathExtent);
name=GetNextImageProfile(image);
}
}
@@ -2929,14 +2929,14 @@
if (LocaleCompare("resolution.x",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",
image->resolution.x);
break;
}
if (LocaleCompare("resolution.y",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%g",
image->resolution.y);
break;
}
@@ -2948,11 +2948,11 @@
{
WarnNoImageInfoReturn("\"%%[%s]\"",property);
if (image_info->number_scenes != 0)
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image_info->scene);
else {
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->scene);
}
break;
@@ -2961,7 +2961,7 @@
{
/* FUTURE: equivelent to %n? */
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetImageListLength(image));
break;
}
@@ -2969,7 +2969,7 @@
{
WarnNoImageReturn("\"%%[%s]\"",property);
(void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",
- MaxTextExtent,value);
+ MagickPathExtent,value);
break;
}
if (LocaleCompare("skewness",property) == 0)
@@ -2980,7 +2980,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageKurtosis(image,&kurtosis,&skewness,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),skewness);
break;
}
@@ -2992,7 +2992,7 @@
WarnNoImageReturn("\"%%[%s]\"",property);
(void) GetImageMean(image,&mean,&standard_deviation,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
GetMagickPrecision(),standard_deviation);
break;
}
@@ -3041,7 +3041,7 @@
if (LocaleCompare("width",property) == 0)
{
WarnNoImageReturn("\"%%[%s]\"",property);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
(image->magick_columns != 0 ? image->magick_columns : 256));
break;
}
@@ -3174,7 +3174,7 @@
if ((size_t) (q-interpret_text+length+1) >= extent) \
{ extent+=length; \
interpret_text=(char *) ResizeQuantumMemory(interpret_text, \
- extent+MaxTextExtent,sizeof(*interpret_text)); \
+ extent+MagickPathExtent,sizeof(*interpret_text)); \
if (interpret_text == (char *) NULL) \
return((char *) NULL); \
q=interpret_text+strlen(interpret_text); \
@@ -3188,7 +3188,7 @@
if ((size_t) (q-interpret_text+length+1) >= extent) \
{ extent+=length; \
interpret_text=(char *) ResizeQuantumMemory(interpret_text, \
- extent+MaxTextExtent,sizeof(*interpret_text)); \
+ extent+MagickPathExtent,sizeof(*interpret_text)); \
if (interpret_text == (char *) NULL) \
return((char *) NULL); \
q=interpret_text+strlen(interpret_text); \
@@ -3205,7 +3205,7 @@
if ((size_t) (q-interpret_text+length+1) >= extent) \
{ extent+=length; \
interpret_text=(char *) ResizeQuantumMemory(interpret_text, \
- extent+MaxTextExtent,sizeof(*interpret_text)); \
+ extent+MagickPathExtent,sizeof(*interpret_text)); \
if (interpret_text == (char *) NULL) \
return((char *) NULL); \
q=interpret_text+strlen(interpret_text); \
@@ -3262,12 +3262,12 @@
Translate any embedded format characters.
*/
interpret_text=AcquireString(embed_text); /* new string with extra space */
- extent=MaxTextExtent; /* allocated space in string */
+ extent=MagickPathExtent; /* allocated space in string */
number=MagickFalse; /* is last char a number? */
for (q=interpret_text; *p!='\0'; number=IsMagickTrue(isdigit(*p)),p++)
{
*q='\0';
- ExtendInterpretText(MaxTextExtent);
+ ExtendInterpretText(MagickPathExtent);
/*
Look for the various escapes, (and handle other specials)
*/
@@ -3357,7 +3357,7 @@
*/
{
char
- pattern[2*MaxTextExtent];
+ pattern[2*MagickPathExtent];
const char
*key,
@@ -3377,7 +3377,7 @@
"UnknownImageProperty","\"%%[]\"");
break;
}
- for (len=0; len<(MaxTextExtent-1L) && (*p != '\0');)
+ for (len=0; len<(MagickPathExtent-1L) && (*p != '\0');)
{
/* skip escaped braces within braced pattern */
if ( (*p == '\\') && (*(p+1) != '\0') ) {
@@ -3435,9 +3435,9 @@
if( IfMagickTrue(status) )
{
char
- result[MaxTextExtent];
+ result[MagickPathExtent];
- (void) FormatLocaleString(result,MaxTextExtent,"%.*g",
+ (void) FormatLocaleString(result,MagickPathExtent,"%.*g",
GetMagickPrecision(),(double) value);
AppendString2Text(result);
}
@@ -3487,7 +3487,7 @@
if( IfMagickTrue(status) )
{
char
- name[MaxTextExtent];
+ name[MagickPathExtent];
(void) QueryColorname(image,&pixel,SVGCompliance,name,
exception);
@@ -4129,7 +4129,7 @@
*profile;
image_info=AcquireImageInfo();
- (void) CopyMagickString(image_info->filename,value,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,value,MagickPathExtent);
(void) SetImageInfo(image_info,1,exception);
profile=FileToStringInfo(image_info->filename,~0UL,exception);
if (profile != (StringInfo *) NULL)
diff --git a/MagickCore/random.c b/MagickCore/random.c
index 830d2d0..fd09e35 100644
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -444,7 +444,7 @@
#if defined(MAGICKCORE_HAVE_MKSTEMP)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
int
file;
diff --git a/MagickCore/registry.c b/MagickCore/registry.c
index 30888d1..00ae40a 100644
--- a/MagickCore/registry.c
+++ b/MagickCore/registry.c
@@ -107,20 +107,20 @@
const char *option,ExceptionInfo *exception)
{
char
- key[MaxTextExtent],
- value[MaxTextExtent];
+ key[MagickPathExtent],
+ value[MagickPathExtent];
register char
*p;
assert(option != (const char *) NULL);
- (void) CopyMagickString(key,option,MaxTextExtent);
+ (void) CopyMagickString(key,option,MagickPathExtent);
for (p=key; *p != '\0'; p++)
if (*p == '=')
break;
*value='\0';
if (*p == '=')
- (void) CopyMagickString(value,p+1,MaxTextExtent);
+ (void) CopyMagickString(value,p+1,MagickPathExtent);
*p='\0';
return(SetImageRegistry(type,key,value,exception));
}
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 00ccc13..514a942 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -3625,7 +3625,7 @@
#define SampleFactor 5
char
- value[MaxTextExtent];
+ value[MagickPathExtent];
const char
*name;
@@ -3690,37 +3690,37 @@
name=GetNextImageProfile(thumbnail_image);
}
(void) DeleteImageProperty(thumbnail_image,"comment");
- (void) CopyMagickString(value,image->magick_filename,MaxTextExtent);
+ (void) CopyMagickString(value,image->magick_filename,MagickPathExtent);
if (strstr(image->magick_filename,"//") == (char *) NULL)
- (void) FormatLocaleString(value,MaxTextExtent,"file://%s",
+ (void) FormatLocaleString(value,MagickPathExtent,"file://%s",
image->magick_filename);
(void) SetImageProperty(thumbnail_image,"Thumb::URI",value,exception);
- (void) CopyMagickString(value,image->magick_filename,MaxTextExtent);
+ (void) CopyMagickString(value,image->magick_filename,MagickPathExtent);
if ( IfMagickTrue(GetPathAttributes(image->filename,&attributes)) )
{
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
attributes.st_mtime);
(void) SetImageProperty(thumbnail_image,"Thumb::MTime",value,exception);
}
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
attributes.st_mtime);
- (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MaxTextExtent,
+ (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MagickPathExtent,
value);
(void) SetImageProperty(thumbnail_image,"Thumb::Size",value,exception);
- (void) FormatLocaleString(value,MaxTextExtent,"image/%s",image->magick);
+ (void) FormatLocaleString(value,MagickPathExtent,"image/%s",image->magick);
LocaleLower(value);
(void) SetImageProperty(thumbnail_image,"Thumb::Mimetype",value,exception);
(void) SetImageProperty(thumbnail_image,"software",GetMagickVersion(&version),
exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->magick_columns);
(void) SetImageProperty(thumbnail_image,"Thumb::Image::Width",value,
exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
image->magick_rows);
(void) SetImageProperty(thumbnail_image,"Thumb::Image::Height",value,
exception);
- (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
GetImageListLength(image));
(void) SetImageProperty(thumbnail_image,"Thumb::Document::Pages",value,
exception);
diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index d4eea9f..a5cb623 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -164,9 +164,9 @@
const MagickSizeType size)
{
char
- resource_current[MaxTextExtent],
- resource_limit[MaxTextExtent],
- resource_request[MaxTextExtent];
+ resource_current[MagickFormatExtent],
+ resource_limit[MagickFormatExtent],
+ resource_request[MagickFormatExtent];
MagickBooleanType
status;
@@ -175,7 +175,8 @@
limit;
status=MagickFalse;
- (void) FormatMagickSize(size,MagickFalse,"B",MaxTextExtent,resource_request);
+ (void) FormatMagickSize(size,MagickFalse,"B",MagickFormatExtent,
+ resource_request);
if (resource_semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&resource_semaphore);
LockSemaphoreInfo(resource_semaphore);
@@ -188,9 +189,9 @@
status=(resource_info.area_limit == MagickResourceInfinity) ||
(size < limit) ? MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.area,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.area_limit,MagickFalse,"B",
- MaxTextExtent,resource_limit);
+ MagickFormatExtent,resource_limit);
break;
}
case MemoryResource:
@@ -201,9 +202,9 @@
((MagickSizeType) resource_info.memory < limit) ? MagickTrue :
MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.memory,MagickTrue,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.memory_limit,MagickTrue,"B",
- MaxTextExtent,resource_limit);
+ MagickFormatExtent,resource_limit);
break;
}
case MapResource:
@@ -213,9 +214,9 @@
status=(resource_info.map_limit == MagickResourceInfinity) ||
((MagickSizeType) resource_info.map < limit) ? MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.map,MagickTrue,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.map_limit,MagickTrue,
- "B",MaxTextExtent,resource_limit);
+ "B",MagickFormatExtent,resource_limit);
break;
}
case DiskResource:
@@ -226,9 +227,9 @@
((MagickSizeType) resource_info.disk < limit) ? MagickTrue :
MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.disk,MagickTrue,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.disk_limit,MagickTrue,"B",
- MaxTextExtent,resource_limit);
+ MagickFormatExtent,resource_limit);
break;
}
case FileResource:
@@ -239,9 +240,9 @@
((MagickSizeType) resource_info.file < limit) ?
MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.file,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.file_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case HeightResource:
@@ -251,9 +252,9 @@
status=(resource_info.area_limit == MagickResourceInfinity) ||
(size < limit) ? MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.height,MagickFalse,
- "P",MaxTextExtent,resource_current);
+ "P",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.height_limit,MagickFalse,
- "P",MaxTextExtent,resource_limit);
+ "P",MagickFormatExtent,resource_limit);
break;
}
case ThreadResource:
@@ -263,9 +264,9 @@
((MagickSizeType) resource_info.thread < limit) ?
MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.thread,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.thread_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case ThrottleResource:
@@ -275,9 +276,9 @@
((MagickSizeType) resource_info.throttle < limit) ?
MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.throttle,
- MagickFalse,"B",MaxTextExtent,resource_current);
+ MagickFalse,"B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.throttle_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case TimeResource:
@@ -288,9 +289,9 @@
((MagickSizeType) resource_info.time < limit) ?
MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.time,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.time_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case WidthResource:
@@ -300,9 +301,9 @@
status=(resource_info.area_limit == MagickResourceInfinity) ||
(size < limit) ? MagickTrue : MagickFalse;
(void) FormatMagickSize((MagickSizeType) resource_info.width,MagickFalse,
- "P",MaxTextExtent,resource_current);
+ "P",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.width_limit,MagickFalse,"P",
- MaxTextExtent,resource_limit);
+ MagickFormatExtent,resource_limit);
break;
}
default:
@@ -401,7 +402,7 @@
struct stat
attributes;
- (void) FormatLocaleString(path,MaxTextExtent,"magick-%.20gXXXXXXXXXXXX",
+ (void) FormatLocaleString(path,MagickPathExtent,"magick-%.20gXXXXXXXXXXXX",
(double) getpid());
exception=AcquireExceptionInfo();
directory=(char *) GetImageRegistry(StringRegistryType,"temporary-path",
@@ -432,7 +433,7 @@
value=GetPolicyValue("temporary-path");
if (value != (char *) NULL)
(void) CloneString(&directory,value);
- if (strlen(directory) > (MaxTextExtent-25))
+ if (strlen(directory) > (MagickPathExtent-25))
{
directory=DestroyString(directory);
return(MagickFalse);
@@ -444,12 +445,12 @@
return(MagickFalse);
}
if (directory[strlen(directory)-1] == *DirectorySeparator)
- (void) FormatLocaleString(path,MaxTextExtent,"%smagick-%.20gXXXXXXXXXXXX",
- directory,(double) getpid());
+ (void) FormatLocaleString(path,MagickPathExtent,
+ "%smagick-%.20gXXXXXXXXXXXX",directory,(double) getpid());
else
- (void) FormatLocaleString(path,MaxTextExtent,
- "%s%smagick-%.20gXXXXXXXXXXXX",directory,DirectorySeparator,
- (double) getpid());
+ (void) FormatLocaleString(path,MagickPathExtent,
+ "%s%smagick-%.20gXXXXXXXXXXXX",directory,DirectorySeparator,(double)
+ getpid());
directory=DestroyString(directory);
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
{
@@ -769,13 +770,13 @@
ExceptionInfo *magick_unused(exception))
{
char
- area_limit[MaxTextExtent],
- disk_limit[MaxTextExtent],
- height_limit[MaxTextExtent],
- map_limit[MaxTextExtent],
- memory_limit[MaxTextExtent],
- time_limit[MaxTextExtent],
- width_limit[MaxTextExtent];
+ area_limit[MagickFormatExtent],
+ disk_limit[MagickFormatExtent],
+ height_limit[MagickFormatExtent],
+ map_limit[MagickFormatExtent],
+ memory_limit[MagickFormatExtent],
+ time_limit[MagickFormatExtent],
+ width_limit[MagickFormatExtent];
if (file == (const FILE *) NULL)
file=stdout;
@@ -783,22 +784,22 @@
ActivateSemaphoreInfo(&resource_semaphore);
LockSemaphoreInfo(resource_semaphore);
(void) FormatMagickSize(resource_info.width_limit,MagickFalse,"P",
- MaxTextExtent,width_limit);
+ MagickFormatExtent,width_limit);
(void) FormatMagickSize(resource_info.height_limit,MagickFalse,"P",
- MaxTextExtent,height_limit);
+ MagickFormatExtent,height_limit);
(void) FormatMagickSize(resource_info.area_limit,MagickFalse,"B",
- MaxTextExtent,area_limit);
+ MagickFormatExtent,area_limit);
(void) FormatMagickSize(resource_info.memory_limit,MagickTrue,"B",
- MaxTextExtent,memory_limit);
+ MagickFormatExtent,memory_limit);
(void) FormatMagickSize(resource_info.map_limit,MagickTrue,"B",
- MaxTextExtent,map_limit);
- (void) CopyMagickString(disk_limit,"unlimited",MaxTextExtent);
+ MagickFormatExtent,map_limit);
+ (void) CopyMagickString(disk_limit,"unlimited",MagickFormatExtent);
if (resource_info.disk_limit != MagickResourceInfinity)
(void) FormatMagickSize(resource_info.disk_limit,MagickTrue,"B",
- MaxTextExtent,disk_limit);
- (void) CopyMagickString(time_limit,"unlimited",MaxTextExtent);
+ MagickFormatExtent,disk_limit);
+ (void) CopyMagickString(time_limit,"unlimited",MagickFormatExtent);
if (resource_info.time_limit != MagickResourceInfinity)
- (void) FormatLocaleString(time_limit,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(time_limit,MagickFormatExtent,"%.20g",(double)
((MagickOffsetType) resource_info.time_limit));
(void) FormatLocaleFile(file,"Resource limits:\n");
(void) FormatLocaleFile(file," Width: %s\n",width_limit);
@@ -848,11 +849,12 @@
const MagickSizeType size)
{
char
- resource_current[MaxTextExtent],
- resource_limit[MaxTextExtent],
- resource_request[MaxTextExtent];
+ resource_current[MagickFormatExtent],
+ resource_limit[MagickFormatExtent],
+ resource_request[MagickFormatExtent];
- (void) FormatMagickSize(size,MagickFalse,"B",MaxTextExtent,resource_request);
+ (void) FormatMagickSize(size,MagickFalse,"B",MagickFormatExtent,
+ resource_request);
if (resource_semaphore == (SemaphoreInfo *) NULL)
ActivateSemaphoreInfo(&resource_semaphore);
LockSemaphoreInfo(resource_semaphore);
@@ -862,88 +864,88 @@
{
resource_info.width=(MagickOffsetType) size;
(void) FormatMagickSize((MagickSizeType) resource_info.width,MagickFalse,
- "P",MaxTextExtent,resource_current);
+ "P",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.width_limit,MagickFalse,
- "P",MaxTextExtent,resource_limit);
+ "P",MagickFormatExtent,resource_limit);
break;
}
case HeightResource:
{
resource_info.width=(MagickOffsetType) size;
(void) FormatMagickSize((MagickSizeType) resource_info.width,MagickFalse,
- "P",MaxTextExtent,resource_current);
+ "P",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.width_limit,MagickFalse,
- "P",MaxTextExtent,resource_limit);
+ "P",MagickFormatExtent,resource_limit);
break;
}
case AreaResource:
{
resource_info.area=(MagickOffsetType) size;
(void) FormatMagickSize((MagickSizeType) resource_info.area,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.area_limit,MagickFalse,
- "B",MaxTextExtent,resource_limit);
+ "B",MagickFormatExtent,resource_limit);
break;
}
case MemoryResource:
{
resource_info.memory-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.memory,
- MagickTrue,"B",MaxTextExtent,resource_current);
+ MagickTrue,"B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.memory_limit,MagickTrue,
- "B",MaxTextExtent,resource_limit);
+ "B",MagickFormatExtent,resource_limit);
break;
}
case MapResource:
{
resource_info.map-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.map,MagickTrue,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.map_limit,MagickTrue,
- "B",MaxTextExtent,resource_limit);
+ "B",MagickFormatExtent,resource_limit);
break;
}
case DiskResource:
{
resource_info.disk-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.disk,MagickTrue,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize(resource_info.disk_limit,MagickTrue,
- "B",MaxTextExtent,resource_limit);
+ "B",MagickFormatExtent,resource_limit);
break;
}
case FileResource:
{
resource_info.file-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.file,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.file_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case ThreadResource:
{
(void) FormatMagickSize((MagickSizeType) resource_info.thread,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.thread_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case ThrottleResource:
{
(void) FormatMagickSize((MagickSizeType) resource_info.throttle,
- MagickFalse,"B",MaxTextExtent,resource_current);
+ MagickFalse,"B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.throttle_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
case TimeResource:
{
resource_info.time-=size;
(void) FormatMagickSize((MagickSizeType) resource_info.time,MagickFalse,
- "B",MaxTextExtent,resource_current);
+ "B",MagickFormatExtent,resource_current);
(void) FormatMagickSize((MagickSizeType) resource_info.time_limit,
- MagickFalse,"B",MaxTextExtent,resource_limit);
+ MagickFalse,"B",MagickFormatExtent,resource_limit);
break;
}
default:
@@ -980,7 +982,7 @@
MagickExport MagickBooleanType RelinquishUniqueFileResource(const char *path)
{
char
- cache_path[MaxTextExtent];
+ cache_path[MagickPathExtent];
MagickBooleanType
status;
@@ -994,7 +996,7 @@
if (temporary_resources != (SplayTreeInfo *) NULL)
status=DeleteNodeFromSplayTree(temporary_resources, (const void *) path);
UnlockSemaphoreInfo(resource_semaphore);
- (void) CopyMagickString(cache_path,path,MaxTextExtent);
+ (void) CopyMagickString(cache_path,path,MagickPathExtent);
AppendImageFormat("cache",cache_path);
(void) ShredFile(cache_path);
if (status == MagickFalse)
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 478e0fe..85fd181 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -637,9 +637,9 @@
return((Image *) NULL);
{
char
- angle[MaxTextExtent];
+ angle[MagickPathExtent];
- (void) FormatLocaleString(angle,MaxTextExtent,"%.20g",degrees);
+ (void) FormatLocaleString(angle,MagickPathExtent,"%.20g",degrees);
(void) SetImageArtifact(clone_image,"deskew:angle",angle);
}
(void) SetImageVirtualPixelMethod(clone_image,BackgroundVirtualPixelMethod,
diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index be8128a..4facad8 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -809,7 +809,7 @@
MagickBooleanType
status;
- (void) CopyMagickString(stream_info->stream->filename,filename,MaxTextExtent);
+ (void) CopyMagickString(stream_info->stream->filename,filename,MagickPathExtent);
status=OpenBlob(image_info,stream_info->stream,WriteBinaryBlobMode,exception);
return(status);
}
diff --git a/MagickCore/string.c b/MagickCore/string.c
index 349c6bb..70f029b 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -103,7 +103,7 @@
% AcquireString() returns an new extented string, containing a clone of the
% given string.
%
-% An extended string is the string length, plus an extra MaxTextExtent space
+% An extended string is the string length, plus an extra MagickPathExtent space
% to allow for the string to be actively worked on.
%
% The returned string shoud be freed using DestoryString().
@@ -128,9 +128,9 @@
length=0;
if (source != (char *) NULL)
length+=strlen(source);
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
- destination=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ destination=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*destination));
if (destination == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
@@ -175,9 +175,9 @@
string_info->signature=MagickSignature;
string_info->length=length;
string_info->datum=(unsigned char *) NULL;
- if (~string_info->length >= (MaxTextExtent-1))
+ if (~string_info->length >= (MagickPathExtent-1))
string_info->datum=(unsigned char *) AcquireQuantumMemory(
- string_info->length+MaxTextExtent,sizeof(*string_info->datum));
+ string_info->length+MagickPathExtent,sizeof(*string_info->datum));
if (string_info->datum == (unsigned char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
return(string_info);
@@ -195,7 +195,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% BlobToStringInfo() returns the contents of a blob as a StringInfo structure
-% with MaxTextExtent extra space.
+% with MagickPathExtent extra space.
%
% The format of the BlobToStringInfo method is:
%
@@ -214,15 +214,15 @@
*string_info;
string_info=AcquireStringInfo(0);
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
string_info->length=length;
if (string_info->datum == (unsigned char *) NULL)
string_info->datum=(unsigned char *) AcquireQuantumMemory(length+
- MaxTextExtent,sizeof(*string_info->datum));
+ MagickPathExtent,sizeof(*string_info->datum));
else
string_info->datum=(unsigned char *) ResizeQuantumMemory(string_info->datum,
- length+MaxTextExtent,sizeof(*string_info->datum));
+ length+MagickPathExtent,sizeof(*string_info->datum));
if (string_info->datum == (unsigned char *) NULL)
{
string_info=DestroyStringInfo(string_info);
@@ -245,7 +245,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% CloneString() replaces or frees the destination string to make it
-% a clone of the input string plus MaxTextExtent more space so the string may
+% a clone of the input string plus MagickPathExtent more space so the string may
% be worked on on.
%
% If source is a NULL pointer the destination string will be freed and set to
@@ -283,9 +283,9 @@
return(*destination);
}
length=strlen(source);
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
- *destination=(char *) ResizeQuantumMemory(*destination,length+MaxTextExtent,
+ *destination=(char *) ResizeQuantumMemory(*destination,length+MagickPathExtent,
sizeof(**destination));
if (*destination == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
@@ -493,9 +493,9 @@
if (~length < source_length)
ThrowFatalException(ResourceLimitFatalError,"UnableToConcatenateString");
length+=source_length;
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"UnableToConcatenateString");
- *destination=(char *) ResizeQuantumMemory(*destination,length+MaxTextExtent,
+ *destination=(char *) ResizeQuantumMemory(*destination,length+MagickPathExtent,
sizeof(**destination));
if (*destination == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToConcatenateString");
@@ -603,8 +603,8 @@
}
length=(size_t) offset;
string=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- string=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*string));
+ if (~length >= (MagickPathExtent-1))
+ string=(char *) AcquireQuantumMemory(length+MagickPathExtent,sizeof(*string));
if (string == (char *) NULL)
{
file=close(file)-1;
@@ -934,8 +934,8 @@
length++;
}
destination=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- destination=(char *) AcquireQuantumMemory(length+MaxTextExtent,
+ if (~length >= (MagickPathExtent-1))
+ destination=(char *) AcquireQuantumMemory(length+MagickPathExtent,
sizeof(*destination));
if (destination == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToEscapeString");
@@ -1923,15 +1923,15 @@
{
assert(string_info != (StringInfo *) NULL);
assert(string_info->signature == MagickSignature);
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
string_info->length=length;
if (string_info->datum == (unsigned char *) NULL)
string_info->datum=(unsigned char *) AcquireQuantumMemory(length+
- MaxTextExtent,sizeof(*string_info->datum));
+ MagickPathExtent,sizeof(*string_info->datum));
else
string_info->datum=(unsigned char *) ResizeQuantumMemory(string_info->datum,
- length+MaxTextExtent,sizeof(*string_info->datum));
+ length+MagickPathExtent,sizeof(*string_info->datum));
if (string_info->datum == (unsigned char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
}
@@ -2003,7 +2003,7 @@
split_info=AcquireStringInfo(offset);
SetStringInfo(split_info,string_info);
(void) memmove(string_info->datum,string_info->datum+offset,
- string_info->length-offset+MaxTextExtent);
+ string_info->length-offset+MagickPathExtent);
SetStringInfoLength(string_info,string_info->length-offset);
return(split_info);
}
@@ -2040,8 +2040,8 @@
string=(char *) NULL;
length=string_info->length;
- if (~length >= (MaxTextExtent-1))
- string=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*string));
+ if (~length >= (MagickPathExtent-1))
+ string=(char *) AcquireQuantumMemory(length+MagickPathExtent,sizeof(*string));
if (string == (char *) NULL)
return((char *) NULL);
(void) memcpy(string,(char *) string_info->datum,length*sizeof(*string));
@@ -2092,9 +2092,9 @@
hex_digits[16];
length=string_info->length;
- if (~length < MaxTextExtent)
+ if (~length < MagickPathExtent)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
- string=(char *) AcquireQuantumMemory(length+MaxTextExtent,2*sizeof(*string));
+ string=(char *) AcquireQuantumMemory(length+MagickPathExtent,2*sizeof(*string));
if (string == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
hex_digits[0]='0';
@@ -2219,7 +2219,7 @@
else
while ((isspace((int) ((unsigned char) *q)) == 0) && (*q != '\0'))
q++;
- argv[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MaxTextExtent,
+ argv[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MagickPathExtent,
sizeof(**argv));
if (argv[i] == (char *) NULL)
{
@@ -2476,7 +2476,7 @@
for (q=p; *q != '\0'; q++)
if ((*q == '\r') || (*q == '\n'))
break;
- textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MaxTextExtent,
+ textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MagickPathExtent,
sizeof(**textlist));
if (textlist[i] == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText");
@@ -2490,7 +2490,7 @@
else
{
char
- hex_string[MaxTextExtent];
+ hex_string[MagickPathExtent];
register char
*q;
@@ -2509,17 +2509,17 @@
p=text;
for (i=0; i < (ssize_t) lines; i++)
{
- textlist[i]=(char *) AcquireQuantumMemory(2UL*MaxTextExtent,
+ textlist[i]=(char *) AcquireQuantumMemory(2UL*MagickPathExtent,
sizeof(**textlist));
if (textlist[i] == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText");
- (void) FormatLocaleString(textlist[i],MaxTextExtent,"0x%08lx: ",
+ (void) FormatLocaleString(textlist[i],MagickPathExtent,"0x%08lx: ",
(long) (0x14*i));
q=textlist[i]+strlen(textlist[i]);
for (j=1; j <= (ssize_t) MagickMin(strlen(p),0x14); j++)
{
- (void) FormatLocaleString(hex_string,MaxTextExtent,"%02x",*(p+j));
- (void) CopyMagickString(q,hex_string,MaxTextExtent);
+ (void) FormatLocaleString(hex_string,MagickPathExtent,"%02x",*(p+j));
+ (void) CopyMagickString(q,hex_string,MagickPathExtent);
q+=2;
if ((j % 0x04) == 0)
*q++=' ';
@@ -2704,7 +2704,7 @@
*/
offset=(ssize_t) (p-(*string));
extent=strlen(*string)+replace_extent-search_extent+1;
- *string=(char *) ResizeQuantumMemory(*string,extent+MaxTextExtent,
+ *string=(char *) ResizeQuantumMemory(*string,extent+MagickPathExtent,
sizeof(*p));
if (*string == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index c01fee7..f95084f 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -1288,7 +1288,7 @@
*image_view;
char
- token[MaxTextExtent];
+ token[MagickPathExtent];
const char
*p;
@@ -1327,7 +1327,7 @@
while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != ',')) &&
(*p != '\0'))
{
- if ((p-threshold_map) >= (MaxTextExtent-1))
+ if ((p-threshold_map) >= (MagickPathExtent-1))
break;
token[p-threshold_map]=(*p);
p++;
diff --git a/MagickCore/token.c b/MagickCore/token.c
index 7f0bdbe..4fda183 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -277,7 +277,7 @@
if (token[offset] == '#')
offset++;
i=(ssize_t) strlen(token);
- (void) CopyMagickString(token,token+offset,MaxTextExtent);
+ (void) CopyMagickString(token,token+offset,MagickPathExtent);
token[i-offset-1]='\0';
}
while (isspace((int) ((unsigned char) *p)) != 0)
@@ -346,7 +346,7 @@
Determine if pattern is a scene, i.e. img0001.pcd[2].
*/
image_info=AcquireImageInfo();
- (void) CopyMagickString(image_info->filename,pattern,MaxTextExtent);
+ (void) CopyMagickString(image_info->filename,pattern,MagickPathExtent);
exception=AcquireExceptionInfo();
(void) SetImageInfo(image_info,0,exception);
exception=DestroyExceptionInfo(exception);
diff --git a/MagickCore/type.c b/MagickCore/type.c
index c89e0c4..3bda3c1 100644
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -204,7 +204,7 @@
{
char
*font_path,
- path[MaxTextExtent];
+ path[MagickPathExtent];
const StringInfo
*option;
@@ -217,7 +217,7 @@
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- (void) CopyMagickString(path,GetStringInfoPath(option),MaxTextExtent);
+ (void) CopyMagickString(path,GetStringInfoPath(option),MagickPathExtent);
status&=LoadTypeCache(type_cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
@@ -232,7 +232,7 @@
/*
Search MAGICK_FONT_PATH.
*/
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",font_path,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",font_path,
DirectorySeparator,filename);
option=FileToString(path,~0UL,exception);
if (option != (void *) NULL)
@@ -736,8 +736,8 @@
#endif
char
- extension[MaxTextExtent],
- name[MaxTextExtent];
+ extension[MagickPathExtent],
+ name[MagickPathExtent];
FcChar8
*family,
@@ -814,21 +814,21 @@
(void) ResetMagickMemory(type_info,0,sizeof(*type_info));
type_info->path=ConstantString("System Fonts");
type_info->signature=MagickSignature;
- (void) CopyMagickString(name,"Unknown",MaxTextExtent);
+ (void) CopyMagickString(name,"Unknown",MagickPathExtent);
status=FcPatternGetString(font_set->fonts[i],FC_FULLNAME,0,&fullname);
if ((status == FcResultMatch) && (fullname != (FcChar8 *) NULL))
- (void) CopyMagickString(name,(const char *) fullname,MaxTextExtent);
+ (void) CopyMagickString(name,(const char *) fullname,MagickPathExtent);
else
{
if (family != (FcChar8 *) NULL)
- (void) CopyMagickString(name,(const char *) family,MaxTextExtent);
+ (void) CopyMagickString(name,(const char *) family,MagickPathExtent);
status=FcPatternGetString(font_set->fonts[i],FC_STYLE,0,&style);
if ((status == FcResultMatch) && (style != (FcChar8 *) NULL) &&
(LocaleCompare((const char *) style,"Regular") != 0))
{
- (void) ConcatenateMagickString(name," ",MaxTextExtent);
+ (void) ConcatenateMagickString(name," ",MagickPathExtent);
(void) ConcatenateMagickString(name,(const char *) style,
- MaxTextExtent);
+ MagickPathExtent);
}
}
type_info->name=ConstantString(name);
@@ -938,7 +938,7 @@
MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception)
{
char
- weight[MaxTextExtent];
+ weight[MagickPathExtent];
const char
*family,
@@ -985,7 +985,7 @@
glyphs="unknown";
if (type_info[i]->glyphs != (char *) NULL)
glyphs=type_info[i]->glyphs;
- (void) FormatLocaleString(weight,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(weight,MagickPathExtent,"%.20g",(double)
type_info[i]->weight);
(void) FormatLocaleFile(file," Font: %s\n",name);
(void) FormatLocaleFile(file," family: %s\n",family);
@@ -1050,8 +1050,8 @@
path=DestroyString(path);
GetPathComponent(filename,HeadPath,font_path);
(void) ConcatenateMagickString(font_path,DirectorySeparator,
- MaxTextExtent);
- (void) ConcatenateMagickString(font_path,token,MaxTextExtent);
+ MagickPathExtent);
+ (void) ConcatenateMagickString(font_path,token,MagickPathExtent);
path=ConstantString(font_path);
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
if (strchr(path,'@') != (char *) NULL)
@@ -1073,8 +1073,8 @@
ExceptionInfo *exception)
{
char
- font_path[MaxTextExtent],
- keyword[MaxTextExtent],
+ font_path[MagickPathExtent],
+ keyword[MagickPathExtent],
*token;
const char
@@ -1101,8 +1101,8 @@
Determine the Ghostscript font path.
*/
*font_path='\0';
- if (NTGhostscriptFonts(font_path,MaxTextExtent-2))
- (void) ConcatenateMagickString(font_path,DirectorySeparator,MaxTextExtent);
+ if (NTGhostscriptFonts(font_path,MagickPathExtent-2))
+ (void) ConcatenateMagickString(font_path,DirectorySeparator,MagickPathExtent);
#endif
for (q=(char *) xml; *q != '\0'; )
{
@@ -1112,7 +1112,7 @@
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
@@ -1138,7 +1138,7 @@
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickPathExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
@@ -1151,7 +1151,7 @@
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
ExceptionInfo
@@ -1161,11 +1161,11 @@
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
sans_exception=AcquireExceptionInfo();
xml=FileToString(path,~0UL,sans_exception);
sans_exception=DestroyExceptionInfo(sans_exception);
diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index 3ff6bb4..50e0971 100644
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -59,13 +59,13 @@
if (count > MAX_PATH)
{
char
- buffer[MaxTextExtent];
+ buffer[MagickPathExtent];
wchar_t
shortPath[MAX_PATH],
*longPath;
- (void) FormatLocaleString(buffer,MaxTextExtent,"\\\\?\\%s",utf8);
+ (void) FormatLocaleString(buffer,MagickPathExtent,"\\\\?\\%s",utf8);
count+=4;
longPath=(wchar_t *) AcquireQuantumMemory(count,sizeof(*longPath));
if (longPath == (wchar_t *) NULL)
@@ -151,9 +151,9 @@
(void) directory;
#else
wchar_t
- wide_path[MaxTextExtent];
+ wide_path[MagickPathExtent];
- (void) _wgetcwd(wide_path,MaxTextExtent-1);
+ (void) _wgetcwd(wide_path,MagickPathExtent-1);
(void) WideCharToMultiByte(CP_UTF8,0,wide_path,-1,path,(int) extent,NULL,NULL);
#endif
}
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 9ccacb1..e980da9 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -183,13 +183,13 @@
else
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
*path='\0';
- if (getcwd(path,MaxTextExtent) == (char *) NULL)
+ if (getcwd(path,MagickPathExtent) == (char *) NULL)
return(MagickFalse);
- (void) ConcatenateMagickString(path,DirectorySeparator,MaxTextExtent);
- (void) ConcatenateMagickString(path,source,MaxTextExtent);
+ (void) ConcatenateMagickString(path,DirectorySeparator,MagickPathExtent);
+ (void) ConcatenateMagickString(path,source,MagickPathExtent);
if (symlink(path,destination) == 0)
return(MagickTrue);
}
@@ -268,8 +268,8 @@
MagickExport void AppendImageFormat(const char *format,char *filename)
{
char
- extension[MaxTextExtent],
- root[MaxTextExtent];
+ extension[MagickPathExtent],
+ root[MagickPathExtent];
assert(format != (char *) NULL);
assert(filename != (char *) NULL);
@@ -279,10 +279,10 @@
if (LocaleCompare(filename,"-") == 0)
{
char
- message[MaxTextExtent];
+ message[MagickPathExtent];
- (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",format,filename);
- (void) CopyMagickString(filename,message,MaxTextExtent);
+ (void) FormatLocaleString(message,MagickPathExtent,"%s:%s",format,filename);
+ (void) CopyMagickString(filename,message,MagickPathExtent);
return;
}
GetPathComponent(filename,ExtensionPath,extension);
@@ -293,14 +293,14 @@
(LocaleCompare(extension,"svgz") == 0))
{
GetPathComponent(filename,RootPath,root);
- (void) CopyMagickString(filename,root,MaxTextExtent);
+ (void) CopyMagickString(filename,root,MagickPathExtent);
GetPathComponent(filename,RootPath,root);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s.%s.%s",root,format,
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s.%s.%s",root,format,
extension);
return;
}
GetPathComponent(filename,RootPath,root);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s.%s",root,format);
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s.%s",root,format);
}
/*
@@ -602,13 +602,13 @@
MagickPrivate void ExpandFilename(char *path)
{
char
- expand_path[MaxTextExtent];
+ expand_path[MagickPathExtent];
if (path == (char *) NULL)
return;
if (*path != '~')
return;
- (void) CopyMagickString(expand_path,path,MaxTextExtent);
+ (void) CopyMagickString(expand_path,path,MagickPathExtent);
if ((*(path+1) == *DirectorySeparator) || (*(path+1) == '\0'))
{
char
@@ -617,15 +617,15 @@
/*
Substitute ~ with $HOME.
*/
- (void) CopyMagickString(expand_path,".",MaxTextExtent);
- (void) ConcatenateMagickString(expand_path,path+1,MaxTextExtent);
+ (void) CopyMagickString(expand_path,".",MagickPathExtent);
+ (void) ConcatenateMagickString(expand_path,path+1,MagickPathExtent);
home=GetEnvironmentValue("HOME");
if (home == (char *) NULL)
home=GetEnvironmentValue("USERPROFILE");
if (home != (char *) NULL)
{
- (void) CopyMagickString(expand_path,home,MaxTextExtent);
- (void) ConcatenateMagickString(expand_path,path+1,MaxTextExtent);
+ (void) CopyMagickString(expand_path,home,MagickPathExtent);
+ (void) ConcatenateMagickString(expand_path,path+1,MagickPathExtent);
home=DestroyString(home);
}
}
@@ -633,7 +633,7 @@
{
#if defined(MAGICKCORE_POSIX_SUPPORT) && !defined(__OS2__)
char
- username[MaxTextExtent];
+ username[MagickPathExtent];
register char
*p;
@@ -644,22 +644,22 @@
/*
Substitute ~ with home directory from password file.
*/
- (void) CopyMagickString(username,path+1,MaxTextExtent);
+ (void) CopyMagickString(username,path+1,MagickPathExtent);
p=strchr(username,'/');
if (p != (char *) NULL)
*p='\0';
entry=getpwnam(username);
if (entry == (struct passwd *) NULL)
return;
- (void) CopyMagickString(expand_path,entry->pw_dir,MaxTextExtent);
+ (void) CopyMagickString(expand_path,entry->pw_dir,MagickPathExtent);
if (p != (char *) NULL)
{
- (void) ConcatenateMagickString(expand_path,"/",MaxTextExtent);
- (void) ConcatenateMagickString(expand_path,p+1,MaxTextExtent);
+ (void) ConcatenateMagickString(expand_path,"/",MagickPathExtent);
+ (void) ConcatenateMagickString(expand_path,p+1,MagickPathExtent);
}
#endif
}
- (void) CopyMagickString(path,expand_path,MaxTextExtent);
+ (void) CopyMagickString(path,expand_path,MagickPathExtent);
}
/*
@@ -722,7 +722,7 @@
char ***arguments)
{
char
- home_directory[MaxTextExtent],
+ home_directory[MagickPathExtent],
**vector;
register ssize_t
@@ -755,11 +755,11 @@
{
char
**filelist,
- filename[MaxTextExtent],
- magick[MaxTextExtent],
+ filename[MagickPathExtent],
+ magick[MagickPathExtent],
*option,
- path[MaxTextExtent],
- subimage[MaxTextExtent];
+ path[MagickPathExtent],
+ subimage[MagickPathExtent];
MagickBooleanType
destroy;
@@ -808,7 +808,7 @@
GetPathComponent(option,SubimagePath,subimage);
ExpandFilename(path);
if (*home_directory == '\0')
- getcwd_utf8(home_directory,MaxTextExtent-1);
+ getcwd_utf8(home_directory,MagickPathExtent-1);
filelist=ListFiles(*path == '\0' ? home_directory : path,filename,
&number_files);
}
@@ -882,34 +882,34 @@
}
continue;
}
- (void) CopyMagickString(filename,path,MaxTextExtent);
+ (void) CopyMagickString(filename,path,MagickPathExtent);
if (*path != '\0')
(void) ConcatenateMagickString(filename,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (filelist[j] != (char *) NULL)
- (void) ConcatenateMagickString(filename,filelist[j],MaxTextExtent);
+ (void) ConcatenateMagickString(filename,filelist[j],MagickPathExtent);
filelist[j]=DestroyString(filelist[j]);
- if (strlen(filename) >= (MaxTextExtent-1))
+ if (strlen(filename) >= (MagickPathExtent-1))
ThrowFatalException(OptionFatalError,"FilenameTruncated");
if (IsPathDirectory(filename) <= 0)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
*path='\0';
if (*magick != '\0')
{
- (void) ConcatenateMagickString(path,magick,MaxTextExtent);
- (void) ConcatenateMagickString(path,":",MaxTextExtent);
+ (void) ConcatenateMagickString(path,magick,MagickPathExtent);
+ (void) ConcatenateMagickString(path,":",MagickPathExtent);
}
- (void) ConcatenateMagickString(path,filename,MaxTextExtent);
+ (void) ConcatenateMagickString(path,filename,MagickPathExtent);
if (*subimage != '\0')
{
- (void) ConcatenateMagickString(path,"[",MaxTextExtent);
- (void) ConcatenateMagickString(path,subimage,MaxTextExtent);
- (void) ConcatenateMagickString(path,"]",MaxTextExtent);
+ (void) ConcatenateMagickString(path,"[",MagickPathExtent);
+ (void) ConcatenateMagickString(path,subimage,MagickPathExtent);
+ (void) ConcatenateMagickString(path,"]",MagickPathExtent);
}
- if (strlen(path) >= (MaxTextExtent-1))
+ if (strlen(path) >= (MagickPathExtent-1))
ThrowFatalException(OptionFatalError,"FilenameTruncated");
if (destroy != MagickFalse)
{
@@ -980,18 +980,18 @@
#if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK) && defined(PATH_MAX)
{
char
- link_path[MaxTextExtent],
+ link_path[MagickPathExtent],
execution_path[PATH_MAX+1];
ssize_t
count;
- (void) FormatLocaleString(link_path,MaxTextExtent,"/proc/%.20g/exe",
+ (void) FormatLocaleString(link_path,MagickPathExtent,"/proc/%.20g/exe",
(double) getpid());
count=readlink(link_path,execution_path,PATH_MAX);
if (count == -1)
{
- (void) FormatLocaleString(link_path,MaxTextExtent,"/proc/%.20g/file",
+ (void) FormatLocaleString(link_path,MagickPathExtent,"/proc/%.20g/file",
(double) getpid());
count=readlink(link_path,execution_path,PATH_MAX);
}
@@ -1173,7 +1173,7 @@
% GetPathComponent() returns the parent directory name, filename, basename, or
% extension of a file path.
%
-% The component string pointed to must have at least MaxTextExtent space
+% The component string pointed to must have at least MagickPathExtent space
% for the results to be stored.
%
% The format of the GetPathComponent function is:
@@ -1194,9 +1194,9 @@
char *component)
{
char
- magick[MaxTextExtent],
+ magick[MagickPathExtent],
*q,
- subimage[MaxTextExtent];
+ subimage[MagickPathExtent];
register char
*p;
@@ -1209,7 +1209,7 @@
*component='\0';
return;
}
- (void) CopyMagickString(component,path,MaxTextExtent);
+ (void) CopyMagickString(component,path,MagickPathExtent);
*magick='\0';
#if defined(__OS2__)
if (path[1] != ":")
@@ -1255,7 +1255,7 @@
break;
if (*q == '[')
{
- (void) CopyMagickString(subimage,q+1,MaxTextExtent);
+ (void) CopyMagickString(subimage,q+1,MagickPathExtent);
subimage[p-q-1]='\0';
if ((IsSceneGeometry(subimage,MagickFalse) == MagickFalse) &&
(IsGeometry(subimage) == MagickFalse))
@@ -1273,7 +1273,7 @@
{
case MagickPath:
{
- (void) CopyMagickString(component,magick,MaxTextExtent);
+ (void) CopyMagickString(component,magick,MagickPathExtent);
break;
}
case RootPath:
@@ -1304,7 +1304,7 @@
case BasePath:
{
if (IsBasenameSeparator(*p) != MagickFalse)
- (void) CopyMagickString(component,p+1,MaxTextExtent);
+ (void) CopyMagickString(component,p+1,MagickPathExtent);
for (p=component+(strlen(component)-1); p > component; p--)
if (*p == '.')
{
@@ -1316,7 +1316,7 @@
case ExtensionPath:
{
if (IsBasenameSeparator(*p) != MagickFalse)
- (void) CopyMagickString(component,p+1,MaxTextExtent);
+ (void) CopyMagickString(component,p+1,MagickPathExtent);
p=component;
if (*p != '\0')
for (p=component+strlen(component)-1; p > component; p--)
@@ -1324,12 +1324,12 @@
break;
*component='\0';
if (*p == '.')
- (void) CopyMagickString(component,p+1,MaxTextExtent);
+ (void) CopyMagickString(component,p+1,MagickPathExtent);
break;
}
case SubimagePath:
{
- (void) CopyMagickString(component,subimage,MaxTextExtent);
+ (void) CopyMagickString(component,subimage,MagickPathExtent);
break;
}
case CanonicalPath:
@@ -1392,7 +1392,7 @@
for (q=p; *q != '\0'; q++)
if (IsBasenameSeparator(*q))
break;
- components[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MaxTextExtent,
+ components[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MagickPathExtent,
sizeof(**components));
if (components[i] == (char *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
diff --git a/MagickCore/version.c b/MagickCore/version.c
index 56d7df5..36e5b53 100644
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -255,7 +255,7 @@
MagickExport char *GetMagickHomeURL(void)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
const char
*element;
@@ -274,7 +274,7 @@
element=(const char *) GetNextValueInLinkedList(paths);
while (element != (const char *) NULL)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",element,
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s%s",element,
DirectorySeparator,MagickURLFilename);
if (IsPathAccessible(path) != MagickFalse)
return(ConstantString(path));
@@ -493,7 +493,7 @@
unsigned int
signature;
- version=AcquireStringInfo(MaxTextExtent);
+ version=AcquireStringInfo(MagickPathExtent);
p=GetStringInfoDatum(version);
signature=MAGICKCORE_QUANTUM_DEPTH;
(void) memcpy(p,&signature,sizeof(signature));
diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index be5dee2..9c315fb 100644
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -410,7 +410,7 @@
for (i=0; i < (ssize_t) number_objects; i++)
{
char
- mean_color[MaxTextExtent];
+ mean_color[MagickPathExtent];
if (status == MagickFalse)
break;
diff --git a/MagickCore/vms.c b/MagickCore/vms.c
index 24029c5..9b76d5f 100644
--- a/MagickCore/vms.c
+++ b/MagickCore/vms.c
@@ -130,7 +130,7 @@
/*
Initialize descriptor.
*/
- (void) FormatLocaleString(directory->pattern,MaxTextExtent,"%s*.*",name);
+ (void) FormatLocaleString(directory->pattern,MagickPathExtent,"%s*.*",name);
directory->context=0;
directory->pat.dsc$a_pointer=directory->pattern;
directory->pat.dsc$w_length=strlen(directory->pattern);
@@ -206,9 +206,9 @@
*p='\0';
p=strchr(buffer,']');
if (p)
- (void) CopyMagickString(directory->entry.d_name,p+1,MaxTextExtent);
+ (void) CopyMagickString(directory->entry.d_name,p+1,MagickPathExtent);
else
- (void) CopyMagickString(directory->entry.d_name,buffer,MaxTextExtent);
+ (void) CopyMagickString(directory->entry.d_name,buffer,MagickPathExtent);
directory->entry.d_namlen=strlen(directory->entry.d_name);
return(&directory->entry);
}
diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index a80a1f8..24d5692 100644
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -1109,7 +1109,7 @@
{
text_info->cursor--;
(void) CopyMagickString(text_info->cursor,text_info->cursor+1,
- MaxTextExtent);
+ MagickPathExtent);
text_info->highlight=MagickFalse;
break;
}
@@ -1149,7 +1149,7 @@
break;
if (*text == '\0')
break;
- if ((Extent(text_info->text)+1) >= (int) MaxTextExtent)
+ if ((Extent(text_info->text)+1) >= (int) MagickPathExtent)
(void) XBell(display,0);
else
{
@@ -1613,9 +1613,9 @@
char
**colorlist,
- primary_selection[MaxTextExtent],
- reset_pattern[MaxTextExtent],
- text[MaxTextExtent];
+ primary_selection[MagickPathExtent],
+ reset_pattern[MagickPathExtent],
+ text[MagickPathExtent];
ExceptionInfo
*exception;
@@ -1628,7 +1628,7 @@
i;
static char
- glob_pattern[MaxTextExtent] = "*";
+ glob_pattern[MagickPathExtent] = "*";
static MagickStatusType
mask = (MagickStatusType) (CWWidth | CWHeight | CWX | CWY);
@@ -1688,7 +1688,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(reset_pattern,"*",MaxTextExtent);
+ (void) CopyMagickString(reset_pattern,"*",MagickPathExtent);
exception=AcquireExceptionInfo();
colorlist=GetColorList(glob_pattern,&colors,exception);
if (colorlist == (char **) NULL)
@@ -1696,7 +1696,7 @@
/*
Pattern failed, obtain all the colors.
*/
- (void) CopyMagickString(glob_pattern,"*",MaxTextExtent);
+ (void) CopyMagickString(glob_pattern,"*",MagickPathExtent);
colorlist=GetColorList(glob_pattern,&colors,exception);
if (colorlist == (char **) NULL)
{
@@ -1748,7 +1748,7 @@
Map Color Browser widget.
*/
(void) CopyMagickString(windows->widget.name,"Browse and Select a Color",
- MaxTextExtent);
+ MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -1911,7 +1911,7 @@
(void) XDrawString(display,windows->widget.id,
windows->widget.annotate_context,x,y,ColorPatternText,
Extent(ColorPatternText));
- (void) CopyMagickString(text_info.text,glob_pattern,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,glob_pattern,MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawBeveledButton(display,&windows->widget,&grab_info);
XDrawBeveledButton(display,&windows->widget,&reset_info);
@@ -1950,8 +1950,8 @@
/*
Reply is a single color name-- exit.
*/
- (void) CopyMagickString(reply,glob_pattern,MaxTextExtent);
- (void) CopyMagickString(glob_pattern,reset_pattern,MaxTextExtent);
+ (void) CopyMagickString(reply,glob_pattern,MagickPathExtent);
+ (void) CopyMagickString(glob_pattern,reset_pattern,MagickPathExtent);
action_info.raised=MagickFalse;
XDrawBeveledButton(display,&windows->widget,&action_info);
break;
@@ -1962,7 +1962,7 @@
checklist=GetColorList(glob_pattern,&number_colors,exception);
if (number_colors == 0)
{
- (void) CopyMagickString(glob_pattern,reset_pattern,MaxTextExtent);
+ (void) CopyMagickString(glob_pattern,reset_pattern,MagickPathExtent);
(void) XBell(display,0);
}
else
@@ -1995,7 +1995,7 @@
*/
*reply_info.text='\0';
reply_info.cursor=reply_info.text;
- (void) CopyMagickString(text_info.text,glob_pattern,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,glob_pattern,MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawMatteText(display,&windows->widget,&reply_info);
XDrawBeveledMatte(display,&windows->widget,&scroll_info);
@@ -2080,7 +2080,7 @@
if (state & RedrawActionState)
{
static char
- colorname[MaxTextExtent];
+ colorname[MagickPathExtent];
/*
Display the selected color in a drawing area.
@@ -2092,7 +2092,7 @@
(unsigned int) windows->widget.visual_info->colormap_size,
&windows->widget.pixel_info->matte_color);
mode_info.text=colorname;
- (void) FormatLocaleString(mode_info.text,MaxTextExtent,"#%02x%02x%02x",
+ (void) FormatLocaleString(mode_info.text,MagickPathExtent,"#%02x%02x%02x",
windows->widget.pixel_info->matte_color.red,
windows->widget.pixel_info->matte_color.green,
windows->widget.pixel_info->matte_color.blue);
@@ -2193,7 +2193,7 @@
if (id >= (int) colors)
break;
(void) CopyMagickString(reply_info.text,colorlist[id],
- MaxTextExtent);
+ MagickPathExtent);
reply_info.highlight=MagickFalse;
reply_info.marker=reply_info.text;
reply_info.cursor=reply_info.text+Extent(reply_info.text);
@@ -2202,7 +2202,7 @@
if (id == list_info.id)
{
(void) CopyMagickString(glob_pattern,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
selection_info.id=(~0);
@@ -2235,9 +2235,9 @@
*/
if (mode_info.text != (char *) NULL)
(void) CopyMagickString(reply_info.text,mode_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -2288,7 +2288,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -2359,7 +2359,7 @@
if (MatteIsActive(reset_info,event.xbutton))
{
(void) CopyMagickString(glob_pattern,reset_pattern,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
reset_info.raised=MagickTrue;
@@ -2454,7 +2454,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
@@ -2524,7 +2524,7 @@
*/
if (*reply_info.text == '\0')
break;
- (void) CopyMagickString(glob_pattern,reply_info.text,MaxTextExtent);
+ (void) CopyMagickString(glob_pattern,reply_info.text,MagickPathExtent);
state|=UpdateListState;
break;
}
@@ -2563,7 +2563,7 @@
case KeyRelease:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -2690,7 +2690,7 @@
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
break;
- if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
+ if ((Extent(reply_info.text)+length) >= (MagickPathExtent-1))
(void) XBell(display,0);
else
{
@@ -2759,7 +2759,7 @@
if (status != False)
return;
XNoticeWidget(display,windows,"Color is unknown to X server:",reply);
- (void) CopyMagickString(reply,"gray",MaxTextExtent);
+ (void) CopyMagickString(reply,"gray",MagickPathExtent);
}
/*
@@ -3300,7 +3300,7 @@
/*
Map Confirm widget.
*/
- (void) CopyMagickString(windows->widget.name,"Confirm",MaxTextExtent);
+ (void) CopyMagickString(windows->widget.name,"Confirm",MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -3368,10 +3368,10 @@
if (description != (char *) NULL)
{
char
- question[MaxTextExtent];
+ question[MagickPathExtent];
- (void) CopyMagickString(question,description,MaxTextExtent);
- (void) ConcatenateMagickString(question,"?",MaxTextExtent);
+ (void) CopyMagickString(question,description,MagickPathExtent);
+ (void) ConcatenateMagickString(question,"?",MagickPathExtent);
width=WidgetTextWidth(font_info,question);
x=(int) ((windows->widget.width >> 1)-(width >> 1));
y+=height;
@@ -3518,7 +3518,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -3637,7 +3637,7 @@
#define CancelButtonText "Cancel"
char
- primary_selection[MaxTextExtent];
+ primary_selection[MagickPathExtent];
int
x;
@@ -3714,7 +3714,7 @@
/*
Map Dialog widget.
*/
- (void) CopyMagickString(windows->widget.name,"Dialog",MaxTextExtent);
+ (void) CopyMagickString(windows->widget.name,"Dialog",MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -3876,7 +3876,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -3977,7 +3977,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
@@ -4030,7 +4030,7 @@
case KeyRelease:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -4115,7 +4115,7 @@
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
break;
- if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
+ if ((Extent(reply_info.text)+length) >= (MagickPathExtent-1))
(void) XBell(display,0);
else
{
@@ -4220,10 +4220,10 @@
char
*directory,
**filelist,
- home_directory[MaxTextExtent],
- primary_selection[MaxTextExtent],
- text[MaxTextExtent],
- working_path[MaxTextExtent];
+ home_directory[MagickPathExtent],
+ primary_selection[MagickPathExtent],
+ text[MagickPathExtent],
+ working_path[MagickPathExtent];
int
x,
@@ -4233,8 +4233,8 @@
i;
static char
- glob_pattern[MaxTextExtent] = "*",
- format[MaxTextExtent] = "miff";
+ glob_pattern[MagickPathExtent] = "*",
+ format[MagickPathExtent] = "miff";
static MagickStatusType
mask = (MagickStatusType) (CWWidth | CWHeight | CWX | CWY);
@@ -4292,9 +4292,9 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- directory=getcwd(home_directory,MaxTextExtent);
+ directory=getcwd(home_directory,MagickPathExtent);
(void) directory;
- (void) CopyMagickString(working_path,home_directory,MaxTextExtent);
+ (void) CopyMagickString(working_path,home_directory,MagickPathExtent);
filelist=ListFiles(working_path,glob_pattern,&files);
if (filelist == (char **) NULL)
{
@@ -4349,7 +4349,7 @@
Map File Browser widget.
*/
(void) CopyMagickString(windows->widget.name,"Browse and Select a File",
- MaxTextExtent);
+ MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -4417,7 +4417,7 @@
while ((p > (reply+1)) && (*(p-1) != '.'))
p--;
if ((p > (reply+1)) && (*(p-1) == '.'))
- (void) CopyMagickString(format,p,MaxTextExtent);
+ (void) CopyMagickString(format,p,MagickPathExtent);
}
XGetWidgetInfo(UpButtonText,&up_info);
up_info.width=width;
@@ -4521,11 +4521,11 @@
(void) XDrawString(display,windows->widget.id,
windows->widget.annotate_context,x,y,DirectoryText,
Extent(DirectoryText));
- (void) CopyMagickString(text_info.text,working_path,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,working_path,MagickPathExtent);
(void) ConcatenateMagickString(text_info.text,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
(void) ConcatenateMagickString(text_info.text,glob_pattern,
- MaxTextExtent);
+ MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawBeveledButton(display,&windows->widget,&up_info);
XDrawBeveledButton(display,&windows->widget,&home_info);
@@ -4600,11 +4600,11 @@
*reply_info.text='\0';
reply_info.cursor=reply_info.text;
}
- (void) CopyMagickString(text_info.text,working_path,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,working_path,MagickPathExtent);
(void) ConcatenateMagickString(text_info.text,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
(void) ConcatenateMagickString(text_info.text,glob_pattern,
- MaxTextExtent);
+ MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawMatteText(display,&windows->widget,&reply_info);
XDrawBeveledMatte(display,&windows->widget,&scroll_info);
@@ -4779,7 +4779,7 @@
selection_info.height;
if (id >= (int) files)
break;
- (void) CopyMagickString(reply_info.text,filelist[id],MaxTextExtent);
+ (void) CopyMagickString(reply_info.text,filelist[id],MagickPathExtent);
reply_info.highlight=MagickFalse;
reply_info.marker=reply_info.text;
reply_info.cursor=reply_info.text+Extent(reply_info.text);
@@ -4793,9 +4793,9 @@
if (*p == *DirectorySeparator)
ChopPathComponents(reply_info.text,1);
(void) ConcatenateMagickString(working_path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
(void) ConcatenateMagickString(working_path,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
*reply='\0';
state|=UpdateListState;
}
@@ -4872,7 +4872,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -4927,7 +4927,7 @@
ChopPathComponents(working_path,1);
if (*working_path == '\0')
(void) CopyMagickString(working_path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
up_info.raised=MagickTrue;
@@ -4939,7 +4939,7 @@
if (MatteIsActive(home_info,event.xbutton))
{
(void) CopyMagickString(working_path,home_directory,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
home_info.raised=MagickTrue;
@@ -4988,7 +4988,7 @@
if (event.xbutton.window == windows->widget.id)
if (MatteIsActive(special_info,event.xbutton))
{
- (void) CopyMagickString(working_path,"x:",MaxTextExtent);
+ (void) CopyMagickString(working_path,"x:",MagickPathExtent);
state|=ExitState;
}
special_info.raised=MagickTrue;
@@ -5082,7 +5082,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
@@ -5154,13 +5154,13 @@
break;
if (IsGlob(reply_info.text))
(void) CopyMagickString(glob_pattern,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
else
{
(void) ConcatenateMagickString(working_path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
(void) ConcatenateMagickString(working_path,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
if (*working_path == '~')
ExpandFilename(working_path);
*reply='\0';
@@ -5199,7 +5199,7 @@
case KeyRelease:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -5335,7 +5335,7 @@
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
break;
- if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
+ if ((Extent(reply_info.text)+length) >= (MagickPathExtent-1))
(void) XBell(display,0);
else
{
@@ -5399,10 +5399,10 @@
if (*reply != '\0')
{
(void) ConcatenateMagickString(working_path,DirectorySeparator,
- MaxTextExtent);
- (void) ConcatenateMagickString(working_path,reply,MaxTextExtent);
+ MagickPathExtent);
+ (void) ConcatenateMagickString(working_path,reply,MagickPathExtent);
}
- (void) CopyMagickString(reply,working_path,MaxTextExtent);
+ (void) CopyMagickString(reply,working_path,MagickPathExtent);
if (*reply == '~')
ExpandFilename(reply);
}
@@ -5475,12 +5475,12 @@
#define ResetButtonText "Reset"
char
- back_pattern[MaxTextExtent],
+ back_pattern[MagickPathExtent],
**fontlist,
**listhead,
- primary_selection[MaxTextExtent],
- reset_pattern[MaxTextExtent],
- text[MaxTextExtent];
+ primary_selection[MagickPathExtent],
+ reset_pattern[MagickPathExtent],
+ text[MagickPathExtent];
int
fonts,
@@ -5491,7 +5491,7 @@
i;
static char
- glob_pattern[MaxTextExtent] = "*";
+ glob_pattern[MagickPathExtent] = "*";
static MagickStatusType
mask = (MagickStatusType) (CWWidth | CWHeight | CWX | CWY);
@@ -5547,8 +5547,8 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- (void) CopyMagickString(back_pattern,glob_pattern,MaxTextExtent);
- (void) CopyMagickString(reset_pattern,"*",MaxTextExtent);
+ (void) CopyMagickString(back_pattern,glob_pattern,MagickPathExtent);
+ (void) CopyMagickString(reset_pattern,"*",MagickPathExtent);
fontlist=XListFonts(display,glob_pattern,32767,&fonts);
if (fonts == 0)
{
@@ -5557,7 +5557,7 @@
*/
XNoticeWidget(display,windows,"Unable to obtain fonts names:",
glob_pattern);
- (void) CopyMagickString(glob_pattern,"*",MaxTextExtent);
+ (void) CopyMagickString(glob_pattern,"*",MagickPathExtent);
fontlist=XListFonts(display,glob_pattern,32767,&fonts);
if (fontlist == (char **) NULL)
{
@@ -5620,7 +5620,7 @@
Map Font Browser widget.
*/
(void) CopyMagickString(windows->widget.name,"Browse and Select a Font",
- MaxTextExtent);
+ MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -5780,7 +5780,7 @@
(void) XDrawString(display,windows->widget.id,
windows->widget.annotate_context,x,y,FontPatternText,
Extent(FontPatternText));
- (void) CopyMagickString(text_info.text,glob_pattern,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,glob_pattern,MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawBeveledButton(display,&windows->widget,&back_info);
XDrawBeveledButton(display,&windows->widget,&reset_info);
@@ -5824,13 +5824,13 @@
/*
Might be a scaleable font-- exit.
*/
- (void) CopyMagickString(reply,glob_pattern,MaxTextExtent);
- (void) CopyMagickString(glob_pattern,back_pattern,MaxTextExtent);
+ (void) CopyMagickString(reply,glob_pattern,MagickPathExtent);
+ (void) CopyMagickString(glob_pattern,back_pattern,MagickPathExtent);
action_info.raised=MagickFalse;
XDrawBeveledButton(display,&windows->widget,&action_info);
break;
}
- (void) CopyMagickString(glob_pattern,back_pattern,MaxTextExtent);
+ (void) CopyMagickString(glob_pattern,back_pattern,MagickPathExtent);
(void) XBell(display,0);
}
else
@@ -5839,8 +5839,8 @@
/*
Reply is a single font name-- exit.
*/
- (void) CopyMagickString(reply,checklist[0],MaxTextExtent);
- (void) CopyMagickString(glob_pattern,back_pattern,MaxTextExtent);
+ (void) CopyMagickString(reply,checklist[0],MagickPathExtent);
+ (void) CopyMagickString(glob_pattern,back_pattern,MagickPathExtent);
(void) XFreeFontNames(checklist);
action_info.raised=MagickFalse;
XDrawBeveledButton(display,&windows->widget,&action_info);
@@ -5885,7 +5885,7 @@
*/
*reply_info.text='\0';
reply_info.cursor=reply_info.text;
- (void) CopyMagickString(text_info.text,glob_pattern,MaxTextExtent);
+ (void) CopyMagickString(text_info.text,glob_pattern,MagickPathExtent);
XDrawWidgetText(display,&windows->widget,&text_info);
XDrawMatteText(display,&windows->widget,&reply_info);
XDrawBeveledMatte(display,&windows->widget,&scroll_info);
@@ -6086,7 +6086,7 @@
selection_info.height;
if (id >= (int) fonts)
break;
- (void) CopyMagickString(reply_info.text,fontlist[id],MaxTextExtent);
+ (void) CopyMagickString(reply_info.text,fontlist[id],MagickPathExtent);
reply_info.highlight=MagickFalse;
reply_info.marker=reply_info.text;
reply_info.cursor=reply_info.text+Extent(reply_info.text);
@@ -6095,7 +6095,7 @@
if (id == list_info.id)
{
(void) CopyMagickString(glob_pattern,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
selection_info.id=(~0);
@@ -6162,7 +6162,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -6215,7 +6215,7 @@
if (MatteIsActive(back_info,event.xbutton))
{
(void) CopyMagickString(glob_pattern,back_pattern,
- MaxTextExtent);
+ MagickPathExtent);
state|=UpdateListState;
}
back_info.raised=MagickTrue;
@@ -6226,8 +6226,8 @@
if (event.xbutton.window == windows->widget.id)
if (MatteIsActive(reset_info,event.xbutton))
{
- (void) CopyMagickString(back_pattern,glob_pattern,MaxTextExtent);
- (void) CopyMagickString(glob_pattern,reset_pattern,MaxTextExtent);
+ (void) CopyMagickString(back_pattern,glob_pattern,MagickPathExtent);
+ (void) CopyMagickString(glob_pattern,reset_pattern,MagickPathExtent);
state|=UpdateListState;
}
reset_info.raised=MagickTrue;
@@ -6320,7 +6320,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
@@ -6390,8 +6390,8 @@
*/
if (*reply_info.text == '\0')
break;
- (void) CopyMagickString(back_pattern,glob_pattern,MaxTextExtent);
- (void) CopyMagickString(glob_pattern,reply_info.text,MaxTextExtent);
+ (void) CopyMagickString(back_pattern,glob_pattern,MagickPathExtent);
+ (void) CopyMagickString(glob_pattern,reply_info.text,MagickPathExtent);
state|=UpdateListState;
break;
}
@@ -6426,7 +6426,7 @@
case KeyRelease:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -6553,7 +6553,7 @@
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
break;
- if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
+ if ((Extent(reply_info.text)+length) >= (MagickPathExtent-1))
(void) XBell(display,0);
else
{
@@ -6750,7 +6750,7 @@
#define CancelButtonText "Cancel"
char
- primary_selection[MaxTextExtent];
+ primary_selection[MagickPathExtent];
int
x;
@@ -6852,7 +6852,7 @@
/*
Map List Browser widget.
*/
- (void) CopyMagickString(window_info->name,"Browse",MaxTextExtent);
+ (void) CopyMagickString(window_info->name,"Browse",MagickPathExtent);
status=XStringListToTextProperty(&window_info->name,1,&window_name);
if (status != False)
{
@@ -7154,7 +7154,7 @@
selection_info.height;
if (id >= (int) entries)
break;
- (void) CopyMagickString(reply_info.text,list[id],MaxTextExtent);
+ (void) CopyMagickString(reply_info.text,list[id],MagickPathExtent);
reply_info.highlight=MagickFalse;
reply_info.marker=reply_info.text;
reply_info.cursor=reply_info.text+Extent(reply_info.text);
@@ -7211,7 +7211,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,reply_info.text,
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,window_info->id,
event.xbutton.time);
reply_info.highlight=XGetSelectionOwner(display,XA_PRIMARY) ==
@@ -7347,7 +7347,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
@@ -7452,7 +7452,7 @@
case KeyRelease:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -7561,7 +7561,7 @@
if ((status != Success) || (type != XA_STRING) || (format == 32) ||
(length == 0))
break;
- if ((Extent(reply_info.text)+length) >= (MaxTextExtent-1))
+ if ((Extent(reply_info.text)+length) >= (MagickPathExtent-1))
(void) XBell(display,0);
else
{
@@ -8049,7 +8049,7 @@
}
if ((selection_info.id < 0) || (selection_info.id >= (int) number_selections))
return(~0);
- (void) CopyMagickString(item,selections[selection_info.id],MaxTextExtent);
+ (void) CopyMagickString(item,selections[selection_info.id],MagickPathExtent);
return(selection_info.id);
}
@@ -8165,7 +8165,7 @@
/*
Map Notice widget.
*/
- (void) CopyMagickString(windows->widget.name,"Notice",MaxTextExtent);
+ (void) CopyMagickString(windows->widget.name,"Notice",MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -8327,7 +8327,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -8436,7 +8436,7 @@
};
char
- cache[MaxTextExtent];
+ cache[MagickPathExtent];
int
x,
@@ -8510,7 +8510,7 @@
/*
Map Preferences widget.
*/
- (void) CopyMagickString(windows->widget.name,"Preferences",MaxTextExtent);
+ (void) CopyMagickString(windows->widget.name,"Preferences",MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -8578,7 +8578,7 @@
SharedColormap ? MagickTrue : MagickFalse;
preferences_info[7].raised=resource_info->use_pixmap ==
MagickFalse ? MagickTrue : MagickFalse;
- (void) FormatLocaleString(cache,MaxTextExtent,CacheButtonText,
+ (void) FormatLocaleString(cache,MagickPathExtent,CacheButtonText,
(unsigned long) resource_info->undo_cache);
XGetWidgetInfo(cache,&cache_info);
cache_info.bevel_width--;
@@ -8652,7 +8652,7 @@
resource_info->undo_cache<<=1;
if (resource_info->undo_cache > 256)
resource_info->undo_cache=1;
- (void) FormatLocaleString(cache,MaxTextExtent,CacheButtonText,
+ (void) FormatLocaleString(cache,MagickPathExtent,CacheButtonText,
(unsigned long) resource_info->undo_cache);
cache_info.raised=MagickFalse;
XDrawTriangleEast(display,&windows->widget,&cache_info);
@@ -8746,7 +8746,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static KeySym
key_symbol;
@@ -8960,7 +8960,7 @@
#define DismissButtonText "Dismiss"
char
- primary_selection[MaxTextExtent];
+ primary_selection[MagickPathExtent];
register int
i;
@@ -9057,7 +9057,7 @@
/*
Map Text View widget.
*/
- (void) CopyMagickString(windows->widget.name,title,MaxTextExtent);
+ (void) CopyMagickString(windows->widget.name,title,MagickPathExtent);
status=XStringListToTextProperty(&windows->widget.name,1,&window_name);
if (status != False)
{
@@ -9364,7 +9364,7 @@
Become the XA_PRIMARY selection owner.
*/
(void) CopyMagickString(primary_selection,textlist[list_info.id],
- MaxTextExtent);
+ MagickPathExtent);
(void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
event.xbutton.time);
if (XGetSelectionOwner(display,XA_PRIMARY) != windows->widget.id)
@@ -9474,7 +9474,7 @@
case KeyPress:
{
static char
- command[MaxTextExtent];
+ command[MagickPathExtent];
static int
length;
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 67e4e3a..3b1c3b8 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -216,8 +216,8 @@
{
char
**components,
- subnode[MaxTextExtent],
- tag[MaxTextExtent];
+ subnode[MagickPathExtent],
+ tag[MagickPathExtent];
register ssize_t
i;
@@ -342,12 +342,12 @@
*/
i=0;
canonical_content=AcquireString((char *) NULL);
- extent=MaxTextExtent;
+ extent=MagickPathExtent;
for (p=utf8; *p != '\0'; p++)
{
- if ((i+MaxTextExtent) > (ssize_t) extent)
+ if ((i+MagickPathExtent) > (ssize_t) extent)
{
- extent+=MaxTextExtent;
+ extent+=MagickPathExtent;
canonical_content=(char *) ResizeQuantumMemory(canonical_content,extent,
sizeof(*canonical_content));
if (canonical_content == (char *) NULL)
@@ -679,8 +679,8 @@
}
length=(size_t) MagickMin((MagickSizeType) offset,extent);
xml=(char *) NULL;
- if (~length >= (MaxTextExtent-1))
- xml=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*xml));
+ if (~length >= (MagickPathExtent-1))
+ xml=(char *) AcquireQuantumMemory(length+MagickPathExtent,sizeof(*xml));
if (xml == (char *) NULL)
{
file=close(file);
@@ -1006,8 +1006,8 @@
{
char
**components,
- subnode[MaxTextExtent],
- tag[MaxTextExtent];
+ subnode[MagickPathExtent],
+ tag[MagickPathExtent];
register ssize_t
i;
@@ -1333,9 +1333,9 @@
(content[i] & 0xff);
c=(((c & 0x3ff) << 10) | (byte & 0x3ff))+0x10000;
}
- if ((size_t) (j+MaxTextExtent) > extent)
+ if ((size_t) (j+MagickPathExtent) > extent)
{
- extent=(size_t) j+MaxTextExtent;
+ extent=(size_t) j+MagickPathExtent;
utf8=(char *) ResizeQuantumMemory(utf8,extent,sizeof(*utf8));
if (utf8 == (char *) NULL)
return(utf8);
@@ -2616,9 +2616,9 @@
}
if (canonical_content == (char *) NULL)
return(*destination);
- if ((*length+strlen(canonical_content)+MaxTextExtent) > *extent)
+ if ((*length+strlen(canonical_content)+MagickPathExtent) > *extent)
{
- *extent=(*length)+strlen(canonical_content)+MaxTextExtent;
+ *extent=(*length)+strlen(canonical_content)+MagickPathExtent;
*destination=(char *) ResizeQuantumMemory(*destination,*extent,
sizeof(**destination));
if (*destination == (char *) NULL)
@@ -2654,9 +2654,9 @@
offset=0;
*source=EncodePredefinedEntities(content+start,(ssize_t) (xml_info->offset-
start),source,length,extent,MagickFalse);
- if ((*length+strlen(xml_info->tag)+MaxTextExtent) > *extent)
+ if ((*length+strlen(xml_info->tag)+MagickPathExtent) > *extent)
{
- *extent=(*length)+strlen(xml_info->tag)+MaxTextExtent;
+ *extent=(*length)+strlen(xml_info->tag)+MagickPathExtent;
*source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(**source));
if (*source == (char *) NULL)
return(*source);
@@ -2667,9 +2667,9 @@
attribute=GetXMLTreeAttribute(xml_info,xml_info->attributes[i]);
if (attribute != xml_info->attributes[i+1])
continue;
- if ((*length+strlen(xml_info->attributes[i])+MaxTextExtent) > *extent)
+ if ((*length+strlen(xml_info->attributes[i])+MagickPathExtent) > *extent)
{
- *extent=(*length)+strlen(xml_info->attributes[i])+MaxTextExtent;
+ *extent=(*length)+strlen(xml_info->attributes[i])+MagickPathExtent;
*source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(**source));
if (*source == (char *) NULL)
return((char *) NULL);
@@ -2694,9 +2694,9 @@
j+=3;
continue;
}
- if ((*length+strlen(attributes[i][j])+MaxTextExtent) > *extent)
+ if ((*length+strlen(attributes[i][j])+MagickPathExtent) > *extent)
{
- *extent=(*length)+strlen(attributes[i][j])+MaxTextExtent;
+ *extent=(*length)+strlen(attributes[i][j])+MagickPathExtent;
*source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(**source));
if (*source == (char *) NULL)
return((char *) NULL);
@@ -2715,9 +2715,9 @@
else
*source=EncodePredefinedEntities(xml_info->content,-1,source,length,extent,
MagickFalse);
- if ((*length+strlen(xml_info->tag)+MaxTextExtent) > *extent)
+ if ((*length+strlen(xml_info->tag)+MagickPathExtent) > *extent)
{
- *extent=(*length)+strlen(xml_info->tag)+MaxTextExtent;
+ *extent=(*length)+strlen(xml_info->tag)+MagickPathExtent;
*source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(**source));
if (*source == (char *) NULL)
return((char *) NULL);
@@ -2772,7 +2772,7 @@
return((char *) NULL);
xml=AcquireString((char *) NULL);
length=0;
- extent=MaxTextExtent;
+ extent=MagickPathExtent;
root=(XMLTreeRoot *) xml_info;
while (root->root.parent != (XMLTreeInfo *) NULL)
root=(XMLTreeRoot *) root->root.parent;
@@ -2793,9 +2793,9 @@
continue;
}
q=root->processing_instructions[i][0];
- if ((length+strlen(p)+strlen(q)+MaxTextExtent) > extent)
+ if ((length+strlen(p)+strlen(q)+MagickPathExtent) > extent)
{
- extent=length+strlen(p)+strlen(q)+MaxTextExtent;
+ extent=length+strlen(p)+strlen(q)+MagickPathExtent;
xml=(char *) ResizeQuantumMemory(xml,extent,sizeof(*xml));
if (xml == (char *) NULL)
return(xml);
@@ -2827,9 +2827,9 @@
continue;
}
q=root->processing_instructions[i][0];
- if ((length+strlen(p)+strlen(q)+MaxTextExtent) > extent)
+ if ((length+strlen(p)+strlen(q)+MagickPathExtent) > extent)
{
- extent=length+strlen(p)+strlen(q)+MaxTextExtent;
+ extent=length+strlen(p)+strlen(q)+MagickPathExtent;
xml=(char *) ResizeQuantumMemory(xml,extent,sizeof(*xml));
if (xml == (char *) NULL)
return(xml);
diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index 386d4b8..8227030 100644
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -162,7 +162,7 @@
*coordinate_info;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
} XDrawInfo;
typedef enum
@@ -203,7 +203,7 @@
stencil;
char
- geometry[MaxTextExtent];
+ geometry[MagickPathExtent];
struct _XAnnotateInfo
*next,
@@ -344,7 +344,7 @@
gravity;
char
- home_directory[MaxTextExtent];
+ home_directory[MagickPathExtent];
} XResourceInfo;
typedef struct _XWindowInfo
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 327e23f..a484483 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -621,12 +621,12 @@
(height != (unsigned int) annotate_image->rows))
{
char
- image_geometry[MaxTextExtent];
+ image_geometry[MagickPathExtent];
/*
Scale image.
*/
- (void) FormatLocaleString(image_geometry,MaxTextExtent,"%ux%u",
+ (void) FormatLocaleString(image_geometry,MagickPathExtent,"%ux%u",
width,height);
(void) TransformImage(&annotate_image,(char *) NULL,image_geometry,
exception);
@@ -1279,7 +1279,7 @@
map_property;
char
- map_name[MaxTextExtent];
+ map_name[MagickPathExtent];
int
j,
@@ -1305,7 +1305,7 @@
/*
User specified Standard Colormap.
*/
- (void) FormatLocaleString((char *) map_name,MaxTextExtent,
+ (void) FormatLocaleString((char *) map_name,MagickPathExtent,
"RGB_%s_MAP",map_type);
LocaleUpper(map_name);
map_property=XInternAtom(display,(char *) map_name,MagickTrue);
@@ -1945,7 +1945,7 @@
Image *image,ExceptionInfo *exception)
{
char
- filename[MaxTextExtent],
+ filename[MagickPathExtent],
*text,
**textlist;
@@ -2056,13 +2056,13 @@
if (textlist != (char **) NULL)
{
char
- title[MaxTextExtent];
+ title[MagickPathExtent];
/*
Display information about the image in the Text View widget.
*/
(void) XWithdrawWindow(display,windows->info.id,windows->info.screen);
- (void) FormatLocaleString(title,MaxTextExtent,"Image Info: %s",
+ (void) FormatLocaleString(title,MagickPathExtent,"Image Info: %s",
image->filename);
XTextViewWidget(display,resource_info,windows,MagickTrue,title,
(char const **) textlist);
@@ -2519,12 +2519,12 @@
(height != (unsigned int) draw_image->rows))
{
char
- image_geometry[MaxTextExtent];
+ image_geometry[MagickPathExtent];
/*
Scale image.
*/
- (void) FormatLocaleString(image_geometry,MaxTextExtent,"%ux%u",
+ (void) FormatLocaleString(image_geometry,MagickPathExtent,"%ux%u",
width,height);
(void) TransformImage(&draw_image,(char *) NULL,image_geometry,
exception);
@@ -3267,8 +3267,8 @@
const char *client_name,const char *keyword,char *resource_default)
{
char
- resource_class[MaxTextExtent],
- resource_name[MaxTextExtent];
+ resource_class[MagickPathExtent],
+ resource_name[MagickPathExtent];
static char
*resource_type;
@@ -3292,7 +3292,7 @@
/*
Initialize resource keyword and class.
*/
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.%s",
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.%s",
client_name,keyword);
c=(int) (*client_name);
if ((c >= XK_a) && (c <= XK_z))
@@ -3312,7 +3312,7 @@
else
if ((k >= XK_oslash) && (k <= XK_thorn))
k-=(XK_oslash-XK_Ooblique);
- (void) FormatLocaleString(resource_class,MaxTextExtent,"%c%s.%c%s",c,
+ (void) FormatLocaleString(resource_class,MagickPathExtent,"%c%s.%c%s",c,
client_name+1,k,keyword+1);
}
status=XrmGetResource(database,resource_name,resource_class,&resource_type,
@@ -3356,7 +3356,7 @@
const char *client_name)
{
char
- filename[MaxTextExtent];
+ filename[MagickPathExtent];
int
c;
@@ -3401,7 +3401,7 @@
if ((c >= XK_oslash) && (c <= XK_thorn))
c-=(XK_oslash-XK_Ooblique);
#if defined(X11_APPLICATION_PATH)
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%c%s",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%c%s",
X11_APPLICATION_PATH,c,client_name+1);
(void) XrmCombineFileDatabase(filename,&resource_database,MagickFalse);
#endif
@@ -3417,7 +3417,7 @@
Merge user preferences database.
*/
#if defined(X11_PREFERENCES_PATH)
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%src",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%src",
X11_PREFERENCES_PATH,client_name);
ExpandFilename(filename);
(void) XrmCombineFileDatabase(filename,&resource_database,MagickFalse);
@@ -3554,7 +3554,7 @@
(char *) "Center");
resource_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
MagickFalse,resource_value);
- directory=getcwd(resource_info->home_directory,MaxTextExtent);
+ directory=getcwd(resource_info->home_directory,MagickPathExtent);
(void) directory;
resource_info->icon_geometry=XGetResourceClass(database,client_name,
"iconGeometry",(char *) NULL);
@@ -3667,7 +3667,7 @@
{
char
*resource_type,
- resource_name[MaxTextExtent];
+ resource_name[MagickPathExtent];
Status
status;
@@ -3679,7 +3679,7 @@
return((char *) resource_default);
*resource_name='\0';
if (keyword != (char *) NULL)
- (void) FormatLocaleString(resource_name,MaxTextExtent,"%s.%s",client_name,
+ (void) FormatLocaleString(resource_name,MagickPathExtent,"%s.%s",client_name,
keyword);
status=XrmGetResource(database,resource_name,"ImageMagick",&resource_type,
&resource_value);
@@ -3718,7 +3718,7 @@
MagickExport char *XGetScreenDensity(Display *display)
{
char
- density[MaxTextExtent];
+ density[MagickPathExtent];
double
x_density,
@@ -3731,7 +3731,7 @@
((double) DisplayWidthMM(display,XDefaultScreen(display))));
y_density=((((double) DisplayHeight(display,XDefaultScreen(display)))*25.4)/
((double) DisplayHeightMM(display,XDefaultScreen(display))));
- (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",x_density,
+ (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",x_density,
y_density);
return(GetPageGeometry(density));
}
@@ -5057,7 +5057,7 @@
else
{
(void) CopyMagickString(image->filename,image_info->filename,
- MaxTextExtent);
+ MagickPathExtent);
if ((crop_info.width != 0) && (crop_info.height != 0))
{
Image
@@ -5901,7 +5901,7 @@
(image->storage_class == DirectClass) && (image->alpha_trait != UndefinedPixelTrait))
{
char
- size[MaxTextExtent];
+ size[MagickPathExtent];
Image
*pattern;
@@ -5913,8 +5913,8 @@
(void) CopyMagickString(image_info->filename,
resource_info->image_info->texture != (char *) NULL ?
resource_info->image_info->texture : "pattern:checkerboard",
- MaxTextExtent);
- (void) FormatLocaleString(size,MaxTextExtent,"%.20gx%.20g",(double)
+ MagickPathExtent);
+ (void) FormatLocaleString(size,MagickPathExtent,"%.20gx%.20g",(double)
image->columns,(double) image->rows);
image_info->size=ConstantString(size);
pattern=ReadImage(image_info,exception);
@@ -6518,7 +6518,7 @@
(image->alpha_trait != UndefinedPixelTrait))
{
char
- size[MaxTextExtent];
+ size[MagickPathExtent];
Image
*pattern;
@@ -6530,8 +6530,8 @@
(void) CopyMagickString(image_info->filename,
resource_info->image_info->texture != (char *) NULL ?
resource_info->image_info->texture : "pattern:checkerboard",
- MaxTextExtent);
- (void) FormatLocaleString(size,MaxTextExtent,"%.20gx%.20g",(double)
+ MagickPathExtent);
+ (void) FormatLocaleString(size,MagickPathExtent,"%.20gx%.20g",(double)
image->columns,(double) image->rows);
image_info->size=ConstantString(size);
pattern=ReadImage(image_info,exception);
@@ -7094,7 +7094,7 @@
ExceptionInfo *exception)
{
char
- tuple[MaxTextExtent];
+ tuple[MagickPathExtent];
int
y;
@@ -7166,7 +7166,7 @@
i=0;
while ((1 << i) <= (int) magnify)
i++;
- (void) FormatLocaleString(windows->magnify.name,MaxTextExtent,
+ (void) FormatLocaleString(windows->magnify.name,MagickPathExtent,
"Magnify %.20gX",(double) i);
status=XStringListToTextProperty(&windows->magnify.name,1,&window_name);
if (status != False)
@@ -7486,25 +7486,25 @@
*/
(void) GetOneVirtualPixelInfo(windows->image.image,TileVirtualPixelMethod,
(ssize_t) windows->magnify.x,(ssize_t) windows->magnify.y,&pixel,exception);
- (void) FormatLocaleString(tuple,MaxTextExtent,"%d,%d: ",
+ (void) FormatLocaleString(tuple,MagickPathExtent,"%d,%d: ",
windows->magnify.x,windows->magnify.y);
- (void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
+ (void) ConcatenateMagickString(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);
height=(unsigned int) windows->magnify.font_info->ascent+
windows->magnify.font_info->descent;
x=windows->magnify.font_info->max_bounds.width >> 1;
@@ -8393,8 +8393,8 @@
if (window_info->geometry != (char *) NULL)
{
char
- default_geometry[MaxTextExtent],
- geometry[MaxTextExtent];
+ default_geometry[MagickPathExtent],
+ geometry[MagickPathExtent];
int
flags;
@@ -8405,16 +8405,16 @@
/*
User specified geometry.
*/
- (void) FormatLocaleString(default_geometry,MaxTextExtent,"%dx%d",
+ (void) FormatLocaleString(default_geometry,MagickPathExtent,"%dx%d",
size_hints->width,size_hints->height);
- (void) CopyMagickString(geometry,window_info->geometry,MaxTextExtent);
+ (void) CopyMagickString(geometry,window_info->geometry,MagickPathExtent);
p=geometry;
while (strlen(p) != 0)
{
if ((isspace((int) ((unsigned char) *p)) == 0) && (*p != '%'))
p++;
else
- (void) CopyMagickString(p,p+1,MaxTextExtent-(p-geometry));
+ (void) CopyMagickString(p,p+1,MagickPathExtent-(p-geometry));
}
flags=XWMGeometry(display,window_info->screen,geometry,default_geometry,
window_info->border_width,size_hints,&size_hints->x,&size_hints->y,
@@ -8582,8 +8582,8 @@
static const char *GetLocaleMonitorMessage(const char *text)
{
char
- message[MaxTextExtent],
- tag[MaxTextExtent];
+ message[MagickPathExtent],
+ tag[MagickPathExtent];
const char
*locale_message;
@@ -8591,11 +8591,11 @@
register char
*p;
- (void) CopyMagickMemory(tag,text,MaxTextExtent);
+ (void) CopyMagickMemory(tag,text,MagickPathExtent);
p=strrchr(tag,'/');
if (p != (char *) NULL)
*p='\0';
- (void) FormatLocaleString(message,MaxTextExtent,"Monitor/%s",tag);
+ (void) FormatLocaleString(message,MagickPathExtent,"Monitor/%s",tag);
locale_message=GetLocaleMessage(message);
if (locale_message == message)
return(text);
@@ -9142,7 +9142,7 @@
annotate_info.degrees=(double) (180.0/MagickPI)*
atan2(draw_info->affine.rx,draw_info->affine.sx);
}
- (void) FormatLocaleString(annotate_info.geometry,MaxTextExtent,
+ (void) FormatLocaleString(annotate_info.geometry,MagickPathExtent,
"%.20gx%.20g%+.20g%+.20g",(double) width,(double) height,
ceil(offset->x-0.5),ceil(offset->y-metrics->ascent-metrics->descent+
draw_info->interline_spacing-0.5));
@@ -9519,9 +9519,9 @@
{
#if defined(X11_PREFERENCES_PATH)
char
- cache[MaxTextExtent],
- filename[MaxTextExtent],
- specifier[MaxTextExtent];
+ cache[MagickPathExtent],
+ filename[MagickPathExtent],
+ specifier[MagickPathExtent];
const char
*client_name,
@@ -9536,40 +9536,40 @@
assert(resource_info != (XResourceInfo *) NULL);
client_name=GetClientName();
preferences_database=XrmGetStringDatabase("");
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.backdrop",client_name);
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.backdrop",client_name);
value=resource_info->backdrop ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.colormap",client_name);
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.colormap",client_name);
value=resource_info->colormap == SharedColormap ? "Shared" : "Private";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.confirmExit",
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.confirmExit",
client_name);
value=resource_info->confirm_exit ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.confirmEdit",
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.confirmEdit",
client_name);
value=resource_info->confirm_edit ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.displayWarnings",
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.displayWarnings",
client_name);
value=resource_info->display_warnings ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.dither",client_name);
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.dither",client_name);
value=resource_info->quantize_info->dither_method != NoDitherMethod ?
"True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.gammaCorrect",
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.gammaCorrect",
client_name);
value=resource_info->gamma_correct ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.undoCache",client_name);
- (void) FormatLocaleString(cache,MaxTextExtent,"%.20g",(double)
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.undoCache",client_name);
+ (void) FormatLocaleString(cache,MagickPathExtent,"%.20g",(double)
resource_info->undo_cache);
XrmPutStringResource(&preferences_database,specifier,cache);
- (void) FormatLocaleString(specifier,MaxTextExtent,"%s.usePixmap",client_name);
+ (void) FormatLocaleString(specifier,MagickPathExtent,"%s.usePixmap",client_name);
value=resource_info->use_pixmap ? "True" : "False";
XrmPutStringResource(&preferences_database,specifier,(char *) value);
- (void) FormatLocaleString(filename,MaxTextExtent,"%s%src",
+ (void) FormatLocaleString(filename,MagickPathExtent,"%s%src",
X11_PREFERENCES_PATH,client_name);
ExpandFilename(filename);
XrmPutFileDatabase(preferences_database,filename);
@@ -9647,15 +9647,15 @@
const char *reason,const char *description)
{
char
- text[MaxTextExtent];
+ text[MagickPathExtent];
XWindows
*windows;
if (reason == (char *) NULL)
return;
- (void) CopyMagickString(text,reason,MaxTextExtent);
- (void) ConcatenateMagickString(text,":",MaxTextExtent);
+ (void) CopyMagickString(text,reason,MagickPathExtent);
+ (void) ConcatenateMagickString(text,":",MagickPathExtent);
windows=XSetWindows((XWindows *) ~0);
XNoticeWidget(windows->display,windows,text,(char *) description);
}