From: cristy Date: Wed, 15 Apr 2015 10:50:31 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1101 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=151b66dffc9e3c2e8c4f8cdaca37ff987ca0f497;p=imagemagick --- diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp index 38fa12ed0..173c22499 100644 --- a/Magick++/lib/Color.cpp +++ b/Magick++/lib/Color.cpp @@ -241,7 +241,7 @@ Magick::Color::operator MagickCore::PixelInfo() const Magick::Color::operator std::string() const { char - colorbuf[MaxTextExtent]; + colorbuf[MagickPathExtent]; PixelInfo pixel; diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp index 3843705c5..5c6a6d664 100644 --- a/Magick++/lib/Geometry.cpp +++ b/Magick++/lib/Geometry.cpp @@ -179,7 +179,7 @@ const Magick::Geometry& Magick::Geometry::operator=( const std::string &geometry_) { char - geom[MaxTextExtent]; + geom[MagickPathExtent]; char *pageptr; @@ -196,14 +196,14 @@ const Magick::Geometry& Magick::Geometry::operator=( // If argument does not start with digit, presume that it is a // page-size specification that needs to be converted to an // equivalent geometry specification using PostscriptGeometry() - (void) CopyMagickString(geom,geometry_.c_str(),MaxTextExtent); + (void) CopyMagickString(geom,geometry_.c_str(),MagickPathExtent); if (geom[0] != '-' && geom[0] != '+' && geom[0] != 'x' && !isdigit(static_cast(geom[0]))) { pageptr=GetPageGeometry(geom); if (pageptr != 0) { - (void) CopyMagickString(geom,pageptr,MaxTextExtent); + (void) CopyMagickString(geom,pageptr,MagickPathExtent); pageptr=(char *) RelinquishMagickMemory(pageptr); } } @@ -266,7 +266,7 @@ const Magick::Geometry& Magick::Geometry::operator=( Magick::Geometry::operator std::string() const { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; std::string geometry; @@ -277,13 +277,13 @@ Magick::Geometry::operator std::string() const if (_width) { - FormatLocaleString(buffer,MaxTextExtent,"%.20g",(double) _width); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",(double) _width); geometry+=buffer; } if (_height) { - FormatLocaleString(buffer,MaxTextExtent,"%.20g",(double) _height); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",(double) _height); geometry+='x'; geometry+=buffer; } @@ -293,13 +293,13 @@ Magick::Geometry::operator std::string() const if (_xOff >= 0) geometry+='+'; - FormatLocaleString(buffer,MaxTextExtent,"%.20g",(double) _xOff); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",(double) _xOff); geometry+=buffer; if (_yOff >= 0) geometry+='+'; - FormatLocaleString(buffer,MaxTextExtent,"%.20g",(double) _yOff); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",(double) _yOff); geometry+=buffer; } @@ -569,7 +569,7 @@ const Magick::Point& Magick::Point::operator=(const std::string &point_) Magick::Point::operator std::string() const { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; string point; @@ -579,7 +579,7 @@ Magick::Point::operator std::string() const else point+="+"; - FormatLocaleString(buffer,MaxTextExtent,"%.20g",_x); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",_x); point+=buffer; if (_y < 0.0) @@ -587,7 +587,7 @@ Magick::Point::operator std::string() const else point+="x+"; - FormatLocaleString(buffer,MaxTextExtent,"%.20g",(double) _y); + FormatLocaleString(buffer,MagickPathExtent,"%.20g",(double) _y); point+=buffer; return(point); diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index a49a16bef..d7e03e4bb 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -356,10 +356,10 @@ size_t Magick::Image::animationIterations(void) const void Magick::Image::attenuate(const double attenuate_) { char - value[MaxTextExtent]; + value[MagickPathExtent]; modifyImage(); - FormatLocaleString(value,MaxTextExtent,"%.20g",attenuate_); + FormatLocaleString(value,MagickPathExtent,"%.20g",attenuate_); (void) SetImageArtifact(image(),"attenuate",value); } @@ -1464,11 +1464,11 @@ Magick::Image Magick::Image::strokePattern(void) const void Magick::Image::strokeWidth(const double strokeWidth_) { char - value[MaxTextExtent]; + value[MagickPathExtent]; modifyImage(); options()->strokeWidth(strokeWidth_); - FormatLocaleString(value,MaxTextExtent,"%.20g",strokeWidth_); + FormatLocaleString(value,MagickPathExtent,"%.20g",strokeWidth_); (void) SetImageArtifact(image(),"strokewidth",value); } @@ -1824,7 +1824,7 @@ void Magick::Image::annotate(const std::string &text_, oaffine; char - boundingArea[MaxTextExtent]; + boundingArea[MagickPathExtent]; DrawInfo *drawInfo; @@ -1839,13 +1839,13 @@ void Magick::Image::annotate(const std::string &text_, { if (boundingArea_.width() == 0 || boundingArea_.height() == 0) { - FormatLocaleString(boundingArea,MaxTextExtent,"%+.20g%+.20g", + FormatLocaleString(boundingArea,MagickPathExtent,"%+.20g%+.20g", (double) boundingArea_.xOff(),(double) boundingArea_.yOff()); } else { (void) CopyMagickString(boundingArea, - std::string(boundingArea_).c_str(), MaxTextExtent); + std::string(boundingArea_).c_str(), MagickPathExtent); } drawInfo->geometry=boundingArea; } @@ -2273,7 +2273,7 @@ void Magick::Image::colorize(const unsigned int alphaRed_, const Color &penColor_) { char - blend[MaxTextExtent]; + blend[MagickPathExtent]; MagickCore::Image *newImage; @@ -2285,7 +2285,7 @@ void Magick::Image::colorize(const unsigned int alphaRed_, throwExceptionExplicit(MagickCore::OptionError, "Pen color argument is invalid"); - FormatLocaleString(blend,MaxTextExtent,"%u/%u/%u",alphaRed_,alphaGreen_, + FormatLocaleString(blend,MagickPathExtent,"%u/%u/%u",alphaRed_,alphaGreen_, alphaBlue_); target=static_cast(penColor_); @@ -3398,9 +3398,9 @@ void Magick::Image::modulate(const double brightness_,const double saturation_, const double hue_) { char - modulate[MaxTextExtent + 1]; + modulate[MagickPathExtent + 1]; - FormatLocaleString(modulate,MaxTextExtent,"%3.6f,%3.6f,%3.6f",brightness_, + FormatLocaleString(modulate,MagickPathExtent,"%3.6f,%3.6f,%3.6f",brightness_, saturation_,hue_); modifyImage(); diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index c92c267c4..5650d516f 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -2645,7 +2645,7 @@ namespace Magick *imageInfo; imageInfo=options.imageInfo(); - imageSpec_.copy(imageInfo->filename,MaxTextExtent-1); + imageSpec_.copy(imageInfo->filename,MagickPathExtent-1); imageInfo->filename[imageSpec_.length()] = 0; GetPPException; images=MagickCore::ReadImage(imageInfo,exceptionInfo); diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp index 762831f13..8ecd358ce 100644 --- a/Magick++/lib/Montage.cpp +++ b/Magick++/lib/Montage.cpp @@ -201,7 +201,7 @@ void Magick::Montage::updateMontageInfo(MontageInfo &montageInfo_ ) const // filename if (_font.length() != 0) { - _fileName.copy(montageInfo_.filename,MaxTextExtent-1); + _fileName.copy(montageInfo_.filename,MagickPathExtent-1); montageInfo_.filename[ _fileName.length() ] = 0; // null terminate } // fill diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index b4014cdd3..7738e2536 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -224,9 +224,9 @@ FILE *Magick::Options::file(void) const void Magick::Options::fileName(const std::string &fileName_) { - fileName_.copy(_imageInfo->filename,MaxTextExtent-1); - if (fileName_.length() > MaxTextExtent-1) - _imageInfo->filename[MaxTextExtent-1]=0; + fileName_.copy(_imageInfo->filename,MagickPathExtent-1); + if (fileName_.length() > MagickPathExtent-1) + _imageInfo->filename[MagickPathExtent-1]=0; else _imageInfo->filename[fileName_.length()]=0; } @@ -345,7 +345,7 @@ void Magick::Options::magick(const std::string &magick_) return; } - FormatLocaleString(_imageInfo->filename,MaxTextExtent,"%.1024s:", + FormatLocaleString(_imageInfo->filename,MagickPathExtent,"%.1024s:", magick_.c_str()); GetPPException; SetImageInfo(_imageInfo,1,exceptionInfo); diff --git a/MagickCore/PreRvIcccm.c b/MagickCore/PreRvIcccm.c index 17937f1ba..6b9c870b1 100644 --- a/MagickCore/PreRvIcccm.c +++ b/MagickCore/PreRvIcccm.c @@ -311,7 +311,7 @@ int XStringListToTextProperty(char **argv,int argc,XTextProperty *property) *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 96adf73e5..bc47dca6a 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -836,7 +836,7 @@ static Image *ComputeBlurImage(const Image* image,const ChannelType channel, *image_view; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; cl_command_queue queue; @@ -978,7 +978,7 @@ static Image *ComputeBlurImage(const Image* image,const ChannelType channel, /* 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 @@ static Image* ComputeBlurImageSection(const Image* image, *image_view; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; cl_command_queue queue; @@ -1326,7 +1326,7 @@ static Image* ComputeBlurImageSection(const Image* image, /* 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 @@ static Image *ComputeUnsharpMaskImage(const Image *image, *image_view; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; cl_command_queue queue; @@ -2131,7 +2131,7 @@ static Image *ComputeUnsharpMaskImage(const Image *image, /* 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 @@ static Image *ComputeUnsharpMaskImageSection(const Image *image, *image_view; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; cl_command_queue queue; @@ -2492,7 +2492,7 @@ static Image *ComputeUnsharpMaskImageSection(const Image *image, /* 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 @@ static Image *ComputeUnsharpMaskImageSingle(const Image *image, *image_view; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; cl_command_queue queue; @@ -2868,7 +2868,7 @@ static Image *ComputeUnsharpMaskImageSingle(const Image *image, /* 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 e9ce6c297..b5124e664 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -408,7 +408,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, i; static char - filenames[MaxTextExtent] = "*"; + filenames[MagickPathExtent] = "*"; if (resource_info->immutable != MagickFalse) break; @@ -448,7 +448,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case PlayCommand: { char - basename[MaxTextExtent]; + basename[MagickPathExtent]; int status; @@ -488,7 +488,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport void XAnimateBackgroundImage(Display *display, 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 @@ MagickExport void XAnimateBackgroundImage(Display *display, */ 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 @@ MagickExport void XAnimateBackgroundImage(Display *display, (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 @@ MagickExport void XAnimateBackgroundImage(Display *display, if (resources.image_geometry != (char *) NULL) { char - default_geometry[MaxTextExtent]; + default_geometry[MagickPathExtent]; int flags, @@ -1019,7 +1019,7 @@ MagickExport void XAnimateBackgroundImage(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, }; char - command[MaxTextExtent], + command[MagickPathExtent], *directory, - geometry[MaxTextExtent], - resource_name[MaxTextExtent]; + geometry[MagickPathExtent], + resource_name[MagickPathExtent]; CommandType command_type; @@ -1342,7 +1342,7 @@ MagickExport Image *XAnimateImages(Display *display, scene; static char - working_directory[MaxTextExtent]; + working_directory[MagickPathExtent]; static size_t number_windows; @@ -1414,7 +1414,7 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, */ 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, Offix DND. */ (void) CopyMagickString(resource_info->image_info->filename, - (char *) data,MaxTextExtent); + (char *) data,MagickPathExtent); } else { @@ -2353,7 +2353,7 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, /* 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 @@ static MagickBooleanType XSaveImage(Display *display, ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; ImageInfo *image_info; @@ -2905,11 +2905,11 @@ static MagickBooleanType XSaveImage(Display *display, */ 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 @@ static MagickBooleanType XSaveImage(Display *display, 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 @@ static MagickBooleanType XSaveImage(Display *display, 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 @@ static MagickBooleanType XSaveImage(Display *display, /* 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 @@ static MagickBooleanType XSaveImage(Display *display, (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 3670f9d51..c06c7c354 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -256,7 +256,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, const DrawInfo *draw_info,ExceptionInfo *exception) { char - primitive[MaxTextExtent], + primitive[MagickPathExtent], **textlist; DrawInfo @@ -489,7 +489,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, 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 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, } 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 @@ static int TraceCubicBezier(FT_Vector *p,FT_Vector *q,FT_Vector *to, 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 @@ static int TraceLineTo(FT_Vector *to,DrawInfo *draw_info) 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 @@ static int TraceMoveTo(FT_Vector *to,DrawInfo *draw_info) 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 @@ static int TraceQuadraticBezier(FT_Vector *control,FT_Vector *to, 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 @@ static char *EscapeParenthesis(const char *text) 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 @@ static MagickBooleanType RenderPostscript(Image *image, ExceptionInfo *exception) { char - filename[MaxTextExtent], - geometry[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], *text; FILE @@ -1756,10 +1756,10 @@ static MagickBooleanType RenderPostscript(Image *image, 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 @@ static MagickBooleanType RenderPostscript(Image *image, 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 81902c8ce..df92fbf72 100644 --- a/MagickCore/artifact.c +++ b/MagickCore/artifact.c @@ -152,21 +152,21 @@ MagickExport MagickBooleanType DefineImageArtifact(Image *image, 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 9ff189afa..3abb8ba98 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -359,9 +359,9 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob, 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 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob, 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 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob, 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 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, } *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 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info, 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 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info, 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 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info, else { char - unique[MaxTextExtent]; + unique[MagickPathExtent]; int file; @@ -1601,7 +1601,7 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info, 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 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images, (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 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images, 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 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images, else { char - filename[MaxTextExtent], - unique[MaxTextExtent]; + filename[MagickPathExtent], + unique[MagickPathExtent]; int file; @@ -1860,7 +1860,7 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images, 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 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, Image *image,Image *inject_image,const char *format,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *unique_file; @@ -1961,7 +1961,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, Image *image,const BlobMode mode,ExceptionInfo *exception) { char - extension[MaxTextExtent], - filename[MaxTextExtent]; + extension[MagickPathExtent], + filename[MagickPathExtent]; const char *type; @@ -2436,7 +2436,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, if (LocaleNCompare(filename,"fd:",3) == 0) { char - mode[MaxTextExtent]; + mode[MagickPathExtent]; *mode=(*type); mode[1]='\0'; @@ -2479,7 +2479,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, if (*filename == '|') { char - mode[MaxTextExtent]; + mode[MagickPathExtent]; /* Pipe image to or from a system command. @@ -2519,7 +2519,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, (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 @@ MagickExport char *ReadBlobString(Image *image,char *string) 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 f7ff13954..cf3b772e2 100644 --- a/MagickCore/cache-private.h +++ b/MagickCore/cache-private.h @@ -188,8 +188,8 @@ typedef struct _CacheInfo 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 29dd17dca..423ca9b95 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -672,9 +672,9 @@ static MagickBooleanType ClonePixelCacheRepository( 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 @@ MagickPrivate Cache DestroyPixelCache(Cache cache) 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 @@ static MagickBooleanType SetPixelCacheExtent(Image *image,MagickSizeType length) 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, source_info; char - format[MaxTextExtent], - message[MaxTextExtent]; + format[MagickPathExtent], + message[MagickPathExtent]; const char *type; @@ -3297,7 +3297,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, 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 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, } 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 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image, (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 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image, 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 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image, 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 c64b3561c..559e3ad9c 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -203,7 +203,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, channel_mask; char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; diff --git a/MagickCore/client.c b/MagickCore/client.c index 51aff658f..4563bcc16 100644 --- a/MagickCore/client.c +++ b/MagickCore/client.c @@ -114,10 +114,10 @@ MagickExport const char *GetClientPath(void) 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 *SetClientName(const char *name) 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 c674c563d..46a40d109 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -787,7 +787,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; const char @@ -817,7 +817,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -856,17 +856,17 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache, 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 19d94d15d..300bb0eeb 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -999,7 +999,7 @@ MagickExport const ColorInfo *GetColorCompliance(const char *name, const ComplianceType compliance,ExceptionInfo *exception) { char - colorname[MaxTextExtent]; + colorname[MagickPathExtent]; register const ColorInfo *p; @@ -1015,12 +1015,12 @@ MagickExport const ColorInfo *GetColorCompliance(const char *name, */ *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 @@ MagickExport void ConcatenateColorComponent(const PixelInfo *pixel, const PixelChannel component,const ComplianceType compliance,char *tuple) { char - text[MaxTextExtent]; + text[MagickPathExtent]; double color; @@ -1158,37 +1158,37 @@ MagickExport void ConcatenateColorComponent(const PixelInfo *pixel, } 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 @@ MagickExport void ConcatenateColorComponent(const PixelInfo *pixel, (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 @@ static void ConcatentateHexColorComponent(const PixelInfo *pixel, const PixelChannel channel,char *tuple) { char - component[MaxTextExtent]; + component[MagickPathExtent]; double color; @@ -1479,29 +1479,29 @@ static void ConcatentateHexColorComponent(const PixelInfo *pixel, } 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 @@ MagickExport void GetColorTuple(const PixelInfo *pixel, /* 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 @@ MagickExport void GetColorTuple(const PixelInfo *pixel, 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 @@ MagickExport MagickBooleanType ListColorInfo(FILE *file, ExceptionInfo *exception) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; const char *path; @@ -1977,7 +1977,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; ColorInfo @@ -2007,7 +2007,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -2046,17 +2046,17 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache, 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 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if (strchr(name,'(') != (char *) NULL) { char - colorspace[MaxTextExtent]; + colorspace[MagickPathExtent]; MagickBooleanType icc_color; @@ -2328,7 +2328,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, /* 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 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, 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 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, 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 @@ MagickExport MagickBooleanType QueryColorname( (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 8fc15d63b..53575539e 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -650,7 +650,7 @@ MagickExport LinkedListInfo *GetConfigureOptions(const char *filename, ExceptionInfo *exception) { char - path[MaxTextExtent]; + path[MagickPathExtent]; const char *element; @@ -665,7 +665,7 @@ MagickExport LinkedListInfo *GetConfigureOptions(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigureOptions(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, #define MagickCoreDebugDLL "CORE_DB_MagickCore_.dll" char - path[MaxTextExtent]; + path[MagickPathExtent]; LinkedListInfo *paths; @@ -753,7 +753,7 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, /* 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, #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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, /* 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 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, /* 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 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; ConfigureInfo @@ -1153,7 +1153,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -1192,17 +1192,17 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache, 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 0f3be0cd6..0526f1727 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -263,7 +263,7 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename, ExceptionInfo *exception) { char - ping_filename[MaxTextExtent]; + ping_filename[MagickPathExtent]; Image *image, @@ -282,7 +282,7 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename, 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 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - filename[MaxTextExtent], - magick[MaxTextExtent], - magick_filename[MaxTextExtent]; + filename[MagickPathExtent], + magick[MagickPathExtent], + magick_filename[MagickPathExtent]; const char *value; @@ -402,10 +402,10 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, (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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, 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 @@ MagickExport Image *ReadImages(ImageInfo *image_info,const char *filename, ExceptionInfo *exception) { char - read_filename[MaxTextExtent]; + read_filename[MagickPathExtent]; Image *image, @@ -805,7 +805,7 @@ MagickExport Image *ReadImages(ImageInfo *image_info,const char *filename, 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 @@ MagickExport Image *ReadImages(ImageInfo *image_info,const char *filename, 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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; const char *option; @@ -994,12 +994,12 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, */ write_info->adjoin=MagickTrue; (void) CopyMagickString(write_info->filename,image->filename, - MaxTextExtent); + MagickPathExtent); (void) AcquireUniqueFilename(image->filename); temporary=MagickTrue; } @@ -1109,7 +1109,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info, 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 b780edfee..d0fd23097 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -395,7 +395,7 @@ MagickExport int ExternalDelegateCommand(const MagickBooleanType asynchronous, } 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 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, char *command, **commands, - input_filename[MaxTextExtent], - output_filename[MaxTextExtent]; + input_filename[MagickPathExtent], + output_filename[MagickPathExtent]; const DelegateInfo *delegate_info; @@ -1220,21 +1220,21 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, } 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 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, } 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 @@ MagickExport MagickBooleanType ListDelegateInfo(FILE *file, char **commands, - delegate[MaxTextExtent]; + delegate[MagickPathExtent]; const char *path; @@ -1424,8 +1424,8 @@ MagickExport MagickBooleanType ListDelegateInfo(FILE *file, 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 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; const char @@ -1516,7 +1516,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -1555,17 +1555,17 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, 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 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, 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 18ca4aede..851f69e3a 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -1853,8 +1853,8 @@ static MagickBooleanType XAnnotateEditImage(Display *display, pen_id = 0; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; const char *ColorMenu[MaxNumberPens+1]; @@ -1927,7 +1927,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, /* 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 @@ static MagickBooleanType XAnnotateEditImage(Display *display, 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 @@ static MagickBooleanType XAnnotateEditImage(Display *display, 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 @@ static MagickBooleanType XAnnotateEditImage(Display *display, 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 @@ static MagickBooleanType XAnnotateEditImage(Display *display, entry; static char - angle[MaxTextExtent] = "30.0"; + angle[MagickPathExtent] = "30.0"; static const char *RotateMenu[] = @@ -2591,7 +2591,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, 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 @@ static MagickBooleanType XAnnotateEditImage(Display *display, 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 @@ static MagickBooleanType XBackgroundImage(Display *display, status; static char - window_id[MaxTextExtent] = "root"; + window_id[MagickPathExtent] = "root"; XResourceInfo background_resources; @@ -2885,7 +2885,7 @@ static MagickBooleanType XChopImage(Display *display, }; char - text[MaxTextExtent]; + text[MagickPathExtent]; Image *chop_image; @@ -2938,7 +2938,7 @@ static MagickBooleanType XChopImage(Display *display, /* 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 @@ static MagickBooleanType XChopImage(Display *display, case ChopDirectionCommand: { char - command[MaxTextExtent]; + command[MagickPathExtent]; static const char *Directions[] = @@ -3022,7 +3022,7 @@ static MagickBooleanType XChopImage(Display *display, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -3110,7 +3110,7 @@ static MagickBooleanType XChopImage(Display *display, */ 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 @@ static MagickBooleanType XColorEditImage(Display *display, border_color = { 0, 0, 0, 0, 0, 0 }; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; Cursor cursor; @@ -3380,7 +3380,7 @@ static MagickBooleanType XColorEditImage(Display *display, /* 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 @@ static MagickBooleanType XColorEditImage(Display *display, 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 @@ static MagickBooleanType XColorEditImage(Display *display, 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 @@ static MagickBooleanType XColorEditImage(Display *display, case ColorEditFuzzCommand: { static char - fuzz[MaxTextExtent]; + fuzz[MagickPathExtent]; static const char *FuzzMenu[] = @@ -3538,12 +3538,12 @@ static MagickBooleanType XColorEditImage(Display *display, 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 @@ static MagickBooleanType XCompositeImage(Display *display, 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 @@ static MagickBooleanType XCompositeImage(Display *display, }; char - text[MaxTextExtent]; + text[MagickPathExtent]; Cursor cursor; @@ -3979,7 +3979,7 @@ static MagickBooleanType XCompositeImage(Display *display, 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 @@ static MagickBooleanType XCompositeImage(Display *display, /* 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 @@ static MagickBooleanType XCompositeImage(Display *display, case CompositeOperatorsCommand: { char - command[MaxTextExtent], + command[MagickPathExtent], **operators; /* @@ -4063,7 +4063,7 @@ static MagickBooleanType XCompositeImage(Display *display, case CompositeDissolveCommand: { static char - factor[MaxTextExtent] = "20.0"; + factor[MagickPathExtent] = "20.0"; /* Dissolve the two images a given percent. @@ -4168,7 +4168,7 @@ static MagickBooleanType XCompositeImage(Display *display, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -4397,7 +4397,7 @@ static MagickBooleanType XConfigureImage(Display *display, ExceptionInfo *exception) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; MagickStatusType status; @@ -4454,10 +4454,10 @@ static MagickBooleanType XConfigureImage(Display *display, 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 @@ static MagickBooleanType XCropImage(Display *display, *image_view; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; Cursor cursor; @@ -4686,7 +4686,7 @@ static MagickBooleanType XCropImage(Display *display, /* 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 @@ static MagickBooleanType XCropImage(Display *display, */ 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 @@ static MagickBooleanType XCropImage(Display *display, /* 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 @@ static MagickBooleanType XCropImage(Display *display, /* 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 @@ static MagickBooleanType XDrawEditImage(Display *display, line_width = 1; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; Cursor cursor; @@ -5534,7 +5534,7 @@ static MagickBooleanType XDrawEditImage(Display *display, /* 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 @@ static MagickBooleanType XDrawEditImage(Display *display, 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 @@ static MagickBooleanType XDrawEditImage(Display *display, status; static char - filename[MaxTextExtent] = "\0"; + filename[MagickPathExtent] = "\0"; static const char *StipplesMenu[] = @@ -5738,14 +5738,14 @@ static MagickBooleanType XDrawEditImage(Display *display, 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 @@ static MagickBooleanType XDrawEditImage(Display *display, case DrawWidthCommand: { static char - width[MaxTextExtent] = "0"; + width[MagickPathExtent] = "0"; static const char *WidthsMenu[] = @@ -5939,7 +5939,7 @@ static MagickBooleanType XDrawEditImage(Display *display, (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 @@ static MagickBooleanType XDrawEditImage(Display *display, */ 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 @@ static MagickBooleanType XDrawEditImage(Display *display, /* 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 @@ static MagickBooleanType XDrawEditImage(Display *display, /* 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 @@ static MagickBooleanType XDrawEditImage(Display *display, */ 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 @@ static MagickBooleanType XDrawEditImage(Display *display, 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 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, case UndoCommand: { char - image_geometry[MaxTextExtent]; + image_geometry[MagickPathExtent]; /* Undo the last image transformation. @@ -6468,7 +6468,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, 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 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, { 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 @@ static CommandType XImageWindowCommand(Display *display, KeySym key_symbol,Image **image,ExceptionInfo *exception) { static char - delta[MaxTextExtent] = ""; + delta[MagickPathExtent] = ""; static const char Digits[] = "01234567890"; @@ -7103,9 +7103,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, ExceptionInfo *exception) { char - filename[MaxTextExtent], - geometry[MaxTextExtent], - modulate_factors[MaxTextExtent]; + filename[MagickPathExtent], + geometry[MagickPathExtent], + modulate_factors[MagickPathExtent]; GeometryInfo geometry_info; @@ -7134,7 +7134,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, i; static char - color[MaxTextExtent] = "gray"; + color[MagickPathExtent] = "gray"; unsigned int height, @@ -7191,7 +7191,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, */ 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case DeleteCommand: { static char - filename[MaxTextExtent] = "\0"; + filename[MagickPathExtent] = "\0"; /* Delete image file. @@ -7261,8 +7261,8 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, status; static char - color[MaxTextExtent] = "gray", - geometry[MaxTextExtent] = "640x480"; + color[MagickPathExtent] = "gray", + geometry[MagickPathExtent] = "640x480"; static const char *format = "gradient"; @@ -7282,7 +7282,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, /* 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, /* 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *roll_image; static char - geometry[MaxTextExtent] = "+2+2"; + geometry[MagickPathExtent] = "+2+2"; /* Query user for the roll geometry. @@ -7705,12 +7705,12 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case HueCommand: { static char - hue_percent[MaxTextExtent] = "110"; + hue_percent[MagickPathExtent] = "110"; /* Query user for percent hue change. @@ -7745,9 +7745,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, */ 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case SaturationCommand: { static char - saturation_percent[MaxTextExtent] = "110"; + saturation_percent[MagickPathExtent] = "110"; /* Query user for percent saturation change. @@ -7773,9 +7773,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, */ 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case BrightnessCommand: { static char - brightness_percent[MaxTextExtent] = "110"; + brightness_percent[MagickPathExtent] = "110"; /* Query user for percent brightness change. @@ -7802,7 +7802,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case GammaCommand: { static char - factor[MaxTextExtent] = "1.6"; + factor[MagickPathExtent] = "1.6"; /* Query user for gamma value. @@ -7873,7 +7873,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, white_point; static char - levels[MaxTextExtent] = "1%"; + levels[MagickPathExtent] = "1%"; /* Query user for gamma value. @@ -7914,7 +7914,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, flags; static char - levels[MaxTextExtent] = "3x50%"; + levels[MagickPathExtent] = "3x50%"; /* Query user for gamma value. @@ -8009,7 +8009,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *affinity_image; static char - filename[MaxTextExtent] = "\0"; + filename[MagickPathExtent] = "\0"; /* Request image file name from user. @@ -8022,7 +8022,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, */ 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, status; static char - colors[MaxTextExtent] = "256"; + colors[MagickPathExtent] = "256"; /* Query user for maximum number of colors. @@ -8098,7 +8098,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *emboss_image; static char - radius[MaxTextExtent] = "0.0x1.0"; + radius[MagickPathExtent] = "0.0x1.0"; /* Query user for emboss radius. @@ -8136,7 +8136,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *noise_image; static char - radius[MaxTextExtent] = "0"; + radius[MagickPathExtent] = "0"; /* Query user for noise radius. @@ -8175,7 +8175,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *noise_image; static char - noise_type[MaxTextExtent] = "Gaussian"; + noise_type[MagickPathExtent] = "Gaussian"; /* Add noise to the image. @@ -8212,7 +8212,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *sharp_image; static char - radius[MaxTextExtent] = "0.0x1.0"; + radius[MagickPathExtent] = "0.0x1.0"; /* Query user for sharpen radius. @@ -8248,7 +8248,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *blur_image; static char - radius[MaxTextExtent] = "0.0x1.0"; + radius[MagickPathExtent] = "0.0x1.0"; /* Query user for blur radius. @@ -8284,7 +8284,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, threshold; static char - factor[MaxTextExtent] = "128"; + factor[MagickPathExtent] = "128"; /* Query user for threshold value. @@ -8313,7 +8313,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *edge_image; static char - radius[MaxTextExtent] = "0"; + radius[MagickPathExtent] = "0"; /* Query user for edge factor. @@ -8348,7 +8348,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *spread_image; static char - amount[MaxTextExtent] = "2"; + amount[MagickPathExtent] = "2"; /* Query user for spread amount. @@ -8386,7 +8386,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, status; static char - geometry[MaxTextExtent] = "30x30"; + geometry[MagickPathExtent] = "30x30"; /* Query user for the shade geometry. @@ -8421,7 +8421,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case RaiseCommand: { static char - bevel_width[MaxTextExtent] = "10"; + bevel_width[MagickPathExtent] = "10"; /* Query user for bevel width. @@ -8449,7 +8449,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case SegmentCommand: { static char - threshold[MaxTextExtent] = "1.0x1.5"; + threshold[MagickPathExtent] = "1.0x1.5"; /* Query user for smoothing threshold. @@ -8484,7 +8484,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *sepia_image; static char - factor[MaxTextExtent] = "80%"; + factor[MagickPathExtent] = "80%"; /* Query user for sepia-tone factor. @@ -8519,7 +8519,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, threshold; static char - factor[MaxTextExtent] = "60%"; + factor[MagickPathExtent] = "60%"; /* Query user for solarize factor. @@ -8548,7 +8548,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *swirl_image; static char - degrees[MaxTextExtent] = "60"; + degrees[MagickPathExtent] = "60"; /* Query user for swirl angle. @@ -8584,7 +8584,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *implode_image; static char - factor[MaxTextExtent] = "0.3"; + factor[MagickPathExtent] = "0.3"; /* Query user for implode factor. @@ -8620,7 +8620,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *vignette_image; static char - geometry[MaxTextExtent] = "0x20"; + geometry[MagickPathExtent] = "0x20"; /* Query user for the vignette geometry. @@ -8663,7 +8663,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *wave_image; static char - geometry[MaxTextExtent] = "25x150"; + geometry[MagickPathExtent] = "25x150"; /* Query user for the wave geometry. @@ -8701,7 +8701,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *paint_image; static char - radius[MaxTextExtent] = "0"; + radius[MagickPathExtent] = "0"; /* Query user for circular neighborhood radius. @@ -8737,7 +8737,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *charcoal_image; static char - radius[MaxTextExtent] = "0x1"; + radius[MagickPathExtent] = "0x1"; /* Query user for charcoal radius. @@ -8848,7 +8848,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *border_image; static char - geometry[MaxTextExtent] = "6x6"; + geometry[MagickPathExtent] = "6x6"; /* Query user for border color and geometry. @@ -8897,7 +8897,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *frame_image; static char - geometry[MaxTextExtent] = "6x6"; + geometry[MagickPathExtent] = "6x6"; /* Query user for frame color and geometry. @@ -9013,7 +9013,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, *preview_image; static char - preview_type[MaxTextExtent] = "Gamma"; + preview_type[MagickPathExtent] = "Gamma"; /* Select preview type from menu. @@ -9092,15 +9092,15 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, (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 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, case SlideShowCommand: { static char - delay[MaxTextExtent] = "5"; + delay[MagickPathExtent] = "5"; /* Display next image after pausing. @@ -9255,14 +9255,14 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 @@ static void XMagnifyImage(Display *display,XWindows *windows,XEvent *event, ExceptionInfo *exception) { char - text[MaxTextExtent]; + text[MagickPathExtent]; register int x, @@ -9374,7 +9374,7 @@ static void XMagnifyImage(Display *display,XWindows *windows,XEvent *event, /* 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 @@ static MagickBooleanType XMatteEditImage(Display *display, ExceptionInfo *exception) { static char - matte[MaxTextExtent] = "0"; + matte[MagickPathExtent] = "0"; static const char *MatteEditMenu[] = @@ -9683,8 +9683,8 @@ static MagickBooleanType XMatteEditImage(Display *display, border_color = { 0, 0, 0, 0, 0, 0 }; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; Cursor cursor; @@ -9742,7 +9742,7 @@ static MagickBooleanType XMatteEditImage(Display *display, /* 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 @@ static MagickBooleanType XMatteEditImage(Display *display, 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 @@ static MagickBooleanType XMatteEditImage(Display *display, case MatteEditFuzzCommand: { static char - fuzz[MaxTextExtent]; + fuzz[MagickPathExtent]; static const char *FuzzMenu[] = @@ -9854,12 +9854,12 @@ static MagickBooleanType XMatteEditImage(Display *display, 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 @@ static MagickBooleanType XMatteEditImage(Display *display, case MatteEditValueCommand: { static char - message[MaxTextExtent]; + message[MagickPathExtent]; static const char *MatteMenu[] = @@ -9887,14 +9887,14 @@ static MagickBooleanType XMatteEditImage(Display *display, 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 @@ static MagickBooleanType XMatteEditImage(Display *display, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -10253,7 +10253,7 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, *image_info; static char - filename[MaxTextExtent] = "\0"; + filename[MagickPathExtent] = "\0"; /* Request file name from user. @@ -10306,18 +10306,18 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, 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 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, */ 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 @@ static Image *XOpenImage(Display *display,XResourceInfo *resource_info, 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 @@ static void XPanImage(Display *display,XWindows *windows,XEvent *event, ExceptionInfo *exception) { char - text[MaxTextExtent]; + text[MagickPathExtent]; Cursor cursor; @@ -10534,7 +10534,7 @@ static void XPanImage(Display *display,XWindows *windows,XEvent *event, */ 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 @@ static MagickBooleanType XPasteImage(Display *display, compose = CopyCompositeOp; char - text[MaxTextExtent]; + text[MagickPathExtent]; Cursor cursor; @@ -10686,7 +10686,7 @@ static MagickBooleanType XPasteImage(Display *display, /* 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 @@ static MagickBooleanType XPasteImage(Display *display, case PasteOperatorsCommand: { char - command[MaxTextExtent], + command[MagickPathExtent], **operators; /* @@ -10808,7 +10808,7 @@ static MagickBooleanType XPasteImage(Display *display, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -10969,8 +10969,8 @@ static MagickBooleanType XPrintImage(Display *display, ExceptionInfo *exception) { char - filename[MaxTextExtent], - geometry[MaxTextExtent]; + filename[MagickPathExtent], + geometry[MagickPathExtent]; Image *print_image; @@ -10985,9 +10985,9 @@ static MagickBooleanType XPrintImage(Display *display, 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 @@ static MagickBooleanType XPrintImage(Display *display, 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 @@ static MagickBooleanType XPrintImage(Display *display, 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 @@ static MagickBooleanType XROIImage(Display *display, }; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; CommandType command_type; @@ -11332,7 +11332,7 @@ static MagickBooleanType XROIImage(Display *display, /* 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 @@ static MagickBooleanType XROIImage(Display *display, */ 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 @@ static MagickBooleanType XROIImage(Display *display, /* 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 @@ static MagickBooleanType XROIImage(Display *display, 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 @@ static MagickBooleanType XROIImage(Display *display, if (entry >= 0) { (void) CopyMagickString(command,Menus[id][entry], - MaxTextExtent); + MagickPathExtent); command_type=Commands[id][entry]; } } @@ -11931,7 +11931,7 @@ static MagickBooleanType XROIImage(Display *display, /* 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 @@ static MagickBooleanType XRotateImage(Display *display, pen_id = 0; char - command[MaxTextExtent], - text[MaxTextExtent]; + command[MagickPathExtent], + text[MagickPathExtent]; Image *rotate_image; @@ -12145,7 +12145,7 @@ static MagickBooleanType XRotateImage(Display *display, 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 @@ static MagickBooleanType XRotateImage(Display *display, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -12307,7 +12307,7 @@ static MagickBooleanType XRotateImage(Display *display, */ 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 @@ static MagickBooleanType XRotateImage(Display *display, /* 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 @@ static MagickBooleanType XRotateImage(Display *display, /* 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 @@ static MagickBooleanType XRotateImage(Display *display, /* 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 @@ static MagickBooleanType XSaveImage(Display *display, ExceptionInfo *exception) { char - filename[MaxTextExtent], - geometry[MaxTextExtent]; + filename[MagickPathExtent], + geometry[MagickPathExtent]; Image *save_image; @@ -12538,11 +12538,11 @@ static MagickBooleanType XSaveImage(Display *display, */ 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 @@ static MagickBooleanType XSaveImage(Display *display, 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 @@ static MagickBooleanType XSaveImage(Display *display, /* 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 @@ static MagickBooleanType XSaveImage(Display *display, (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 @@ static MagickBooleanType XSaveImage(Display *display, 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 @@ static void XScreenEvent(Display *display,XWindows *windows,XEvent *event, case KeyPress: { char - command[MaxTextExtent]; + command[MagickPathExtent]; KeySym key_symbol; @@ -12951,7 +12951,7 @@ static void XSetCropGeometry(Display *display,XWindows *windows, RectangleInfo *crop_info,Image *image) { char - text[MaxTextExtent]; + text[MagickPathExtent]; int x, @@ -12969,7 +12969,7 @@ static void XSetCropGeometry(Display *display,XWindows *windows, /* 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 @@ static void XSetCropGeometry(Display *display,XWindows *windows, 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 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, }; char - command[MaxTextExtent], - filename[MaxTextExtent]; + command[MagickPathExtent], + filename[MagickPathExtent]; Image *tile_image; @@ -13171,9 +13171,9 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, */ 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 @@ static void XTranslateImage(Display *display,XWindows *windows, Image *image,const KeySym key_symbol) { char - text[MaxTextExtent]; + text[MagickPathExtent]; int x, @@ -13400,7 +13400,7 @@ static void XTranslateImage(Display *display,XWindows *windows, /* 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 @@ static Image *XVisualDirectoryImage(Display *display, i; static char - filename[MaxTextExtent] = "\0", - filenames[MaxTextExtent] = "*"; + filename[MagickPathExtent] = "\0", + filenames[MagickPathExtent] = "*"; XResourceInfo background_resources; @@ -13656,7 +13656,7 @@ static Image *XVisualDirectoryImage(Display *display, */ 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 @@ static Image *XVisualDirectoryImage(Display *display, 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 @@ static Image *XVisualDirectoryImage(Display *display, 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 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, XResourceInfo *resource_info,Image *image,ExceptionInfo *exception) { char - geometry[MaxTextExtent], - visual_type[MaxTextExtent]; + geometry[MagickPathExtent], + visual_type[MagickPathExtent]; int height, @@ -13844,10 +13844,10 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, */ 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 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, (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 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, (*resources.image_geometry != '\0')) { char - default_geometry[MaxTextExtent]; + default_geometry[MagickPathExtent]; int flags, @@ -13981,7 +13981,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, }; char - command[MaxTextExtent], + command[MagickPathExtent], *directory, - geometry[MaxTextExtent], - resource_name[MaxTextExtent]; + geometry[MagickPathExtent], + resource_name[MagickPathExtent]; CommandType command_type; @@ -14443,7 +14443,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, i; static char - working_directory[MaxTextExtent]; + working_directory[MagickPathExtent]; static XPoint vid_info; @@ -14524,7 +14524,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, */ 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, (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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Offix DND. */ (void) CopyMagickString(resource_info->image_info->filename, - (char *) data,MaxTextExtent); + (char *) data,MagickPathExtent); } else { @@ -15487,7 +15487,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, Display image named by the remote command protocol. */ status=XGetWindowProperty(display,event.xproperty.window, - event.xproperty.atom,0L,(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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, 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 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, /* 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 f49fa5ed7..f9a65b5c0 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -1959,12 +1959,12 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, 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 36eaf2ac6..33827e89a 100644 --- a/MagickCore/distribute-cache-private.h +++ b/MagickCore/distribute-cache-private.h @@ -34,7 +34,7 @@ typedef struct _DistributeCacheInfo session_key; char - hostname[MaxTextExtent]; + hostname[MagickPathExtent]; int port; diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c index 93cf26fae..adf1507d6 100644 --- a/MagickCore/distribute-cache.c +++ b/MagickCore/distribute-cache.c @@ -174,7 +174,7 @@ static int ConnectPixelCacheServer(const char *hostname,const int port, { #if defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE) char - service[MaxTextExtent]; + service[MagickPathExtent]; const char *shared_secret; @@ -193,7 +193,7 @@ static int ConnectPixelCacheServer(const char *hostname,const int port, *result; unsigned char - secret[MaxTextExtent]; + secret[MagickPathExtent]; /* Connect to distributed pixel cache and get session key. @@ -213,7 +213,7 @@ static int ConnectPixelCacheServer(const char *hostname,const int port, 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 @@ static int ConnectPixelCacheServer(const char *hostname,const int port, "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 @@ MagickPrivate DistributeCacheInfo *AcquireDistributeCacheInfo( 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 @@ static MagickBooleanType OpenDistributeCache(SplayTreeInfo *registry,int file, *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Open distributed pixel cache. @@ -550,7 +550,7 @@ static MagickBooleanType ReadDistributeCacheMetacontent(SplayTreeInfo *registry, *q; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Read distributed pixel cache metacontent. @@ -607,7 +607,7 @@ static MagickBooleanType ReadDistributeCachePixels(SplayTreeInfo *registry, *q; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Read distributed pixel cache pixels. @@ -669,7 +669,7 @@ static MagickBooleanType WriteDistributeCacheMetacontent( *p; unsigned char - message[MaxTextExtent], + message[MagickPathExtent], *metacontent; /* @@ -727,7 +727,7 @@ static MagickBooleanType WriteDistributeCachePixels(SplayTreeInfo *registry, *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Write distributed pixel cache pixels. @@ -796,7 +796,7 @@ static HANDLER_RETURN_TYPE DistributePixelCacheClient(void *socket) unsigned char command, - session[2*MaxTextExtent]; + session[2*MagickPathExtent]; /* Distributed pixel cache client. @@ -805,7 +805,7 @@ static HANDLER_RETURN_TYPE DistributePixelCacheClient(void *socket) 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 @@ MagickExport void DistributePixelCacheServer(const int port, { #if defined(MAGICKCORE_HAVE_DISTRIBUTE_CACHE) char - service[MaxTextExtent]; + service[MagickPathExtent]; int status; @@ -928,7 +928,7 @@ MagickExport void DistributePixelCacheServer(const int port, 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 @@ MagickPrivate MagickBooleanType OpenDistributePixelCache( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Open distributed pixel cache. @@ -1219,7 +1219,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCacheMetacontent( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Read distributed pixel cache metacontent. @@ -1294,7 +1294,7 @@ MagickPrivate MagickOffsetType ReadDistributePixelCachePixels( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Read distributed pixel cache pixels. @@ -1362,7 +1362,7 @@ MagickPrivate MagickBooleanType RelinquishDistributePixelCache( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Delete distributed pixel cache. @@ -1426,7 +1426,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCacheMetacontent( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Write distributed pixel cache metacontent. @@ -1501,7 +1501,7 @@ MagickPrivate MagickOffsetType WriteDistributePixelCachePixels( *p; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; /* Write distributed pixel cache pixels. diff --git a/MagickCore/draw.c b/MagickCore/draw.c index dbc082eca..6dc242fdf 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1379,7 +1379,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image, const DrawInfo *draw_info,const char *name,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; Image *clip_mask; @@ -1398,7 +1398,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, 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 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image, ExceptionInfo *exception) { char - property[MaxTextExtent]; + property[MagickPathExtent]; const char *geometry, @@ -3493,11 +3493,11 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image, (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 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, affine; char - composite_geometry[MaxTextExtent]; + composite_geometry[MagickPathExtent]; Image *composite_image; @@ -4432,7 +4432,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, 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 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, ((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 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, 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 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, case TextPrimitive: { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; DrawInfo *clone_info; @@ -4515,7 +4515,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, 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 void TraceLine(PrimitiveInfo *primitive_info,const PointInfo start, 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 88345b79d..c5831fe54 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -775,7 +775,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, const double sigma,ExceptionInfo *exception) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; KernelInfo *kernel_info; @@ -789,7 +789,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, (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 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius, const double sigma,ExceptionInfo *exception) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; KernelInfo *kernel_info; @@ -1379,7 +1379,7 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius, (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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, #define DefaultPreviewGeometry "204x204+10+10" char - factor[MaxTextExtent], - label[MaxTextExtent]; + factor[MagickPathExtent], + label[MagickPathExtent]; double degrees, @@ -2040,14 +2040,14 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, { 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, *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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, } (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 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, 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 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, if (image->debug != MagickFalse) { char - format[MaxTextExtent], + format[MagickPathExtent], *message; register const MagickRealType @@ -2822,11 +2822,11 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, 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 85c38fcf2..2f46a445e 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -503,7 +503,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, *image_view; char - token[MaxTextExtent]; + token[MagickPathExtent]; ColorCorrection color_correction; diff --git a/MagickCore/exception.c b/MagickCore/exception.c index 2da2b8586..c9a4cf478 100644 --- a/MagickCore/exception.c +++ b/MagickCore/exception.c @@ -454,7 +454,7 @@ MagickExport ExceptionInfo *DestroyExceptionInfo(ExceptionInfo *exception) MagickExport char *GetExceptionMessage(const int error) { char - exception[MaxTextExtent]; + exception[MagickPathExtent]; *exception='\0'; #if defined(MAGICKCORE_HAVE_STRERROR_R) @@ -573,13 +573,13 @@ MagickExport const char *GetLocaleExceptionMessage(const ExceptionType severity, 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 @@ MagickExport MagickBooleanType ThrowMagickExceptionList( 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 @@ MagickExport MagickBooleanType ThrowMagickExceptionList( 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 @@ MagickExport MagickBooleanType ThrowMagickExceptionList( 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 217dd6e15..f234bd803 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -246,7 +246,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, pixel; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; double lower_threshold, @@ -281,7 +281,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, /* 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 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, *image_view; char - message[MaxTextExtent], - path[MaxTextExtent]; + message[MagickPathExtent], + path[MagickPathExtent]; const char *artifact; @@ -1908,12 +1908,12 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, 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 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, (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 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, */ 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 b4302a6b9..05dd10d1a 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -902,7 +902,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, if (image->debug != MagickFalse) { char - format[MaxTextExtent], + format[MagickPathExtent], *message; (void) LogMagickEvent(TransformEvent,GetMagickModule(), @@ -911,11 +911,11 @@ MagickExport Image *ColorMatrixImage(const Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, channel_mask; char - key[MaxTextExtent], - statistic[MaxTextExtent]; + key[MagickPathExtent], + statistic[MagickPathExtent]; const char *value; @@ -1124,7 +1124,7 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxChannelStatistics(FxInfo *fx_info,Image *image, 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 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, { char *q, - subexpression[MaxTextExtent], - symbol[MaxTextExtent]; + subexpression[MagickPathExtent], + symbol[MagickPathExtent]; const char *p, @@ -1399,9 +1399,9 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, (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 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, } } } - (void) CopyMagickString(symbol,p,MaxTextExtent); + (void) CopyMagickString(symbol,p,MagickPathExtent); StripString(symbol); if (*symbol == '\0') { @@ -2086,7 +2086,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, { char *q, - subexpression[MaxTextExtent]; + subexpression[MagickPathExtent]; double alpha, @@ -2239,7 +2239,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, 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 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, case '=': { char - numeric[MaxTextExtent]; + numeric[MagickPathExtent]; q=subexpression; while (isalpha((int) ((unsigned char) *q)) != 0) @@ -2270,7 +2270,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } 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 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } 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 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, 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 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info, if (caption != (const char *) NULL) { char - geometry[MaxTextExtent], + geometry[MagickPathExtent], *text; DrawInfo @@ -3977,7 +3977,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info, 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 @@ MagickExport Image *VignetteImage(const Image *image,const double radius, 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 @@ MagickExport Image *VignetteImage(const Image *image,const double radius, 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 493998d35..761718fa5 100644 --- a/MagickCore/geometry.c +++ b/MagickCore/geometry.c @@ -98,7 +98,7 @@ MagickExport MagickStatusType GetGeometry(const char *geometry,ssize_t *x, { char *p, - pedantic_geometry[MaxTextExtent], + pedantic_geometry[MagickPathExtent], *q; double @@ -116,14 +116,14 @@ MagickExport MagickStatusType GetGeometry(const char *geometry,ssize_t *x, 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 @@ MagickExport MagickStatusType GetGeometry(const char *geometry,ssize_t *x, 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 @@ MagickExport char *GetPageGeometry(const char *page_geometry) /* 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 @@ MagickExport MagickStatusType ParseAffineGeometry(const char *geometry, AffineMatrix *affine_matrix,ExceptionInfo *exception) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -811,7 +811,7 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, { char *p, - pedantic_geometry[MaxTextExtent], + pedantic_geometry[MagickPathExtent], *q; double @@ -830,14 +830,14 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, 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 @@ MagickExport MagickStatusType ParseGeometry(const char *geometry, 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 ddac0e83a..5cf3ba409 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -1085,9 +1085,9 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, #define HistogramImageTag "Histogram/Image" char - color[MaxTextExtent], - hex[MaxTextExtent], - tuple[MaxTextExtent]; + color[MagickPathExtent], + hex[MagickPathExtent], + tuple[MagickPathExtent]; PixelInfo *histogram; @@ -1130,25 +1130,25 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, 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 4cb815cc4..98b220133 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -429,9 +429,9 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, if ((x < (ssize_t) image->columns) || (y < (ssize_t) image->rows)) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; PixelInfo pixel; @@ -987,9 +987,9 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, if (image->colors <= 1024) { char - color[MaxTextExtent], - hex[MaxTextExtent], - tuple[MaxTextExtent]; + color[MagickPathExtent], + hex[MagickPathExtent], + tuple[MagickPathExtent]; PixelInfo pixel; @@ -1002,28 +1002,28 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, 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 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, } (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 0beb5e211..ce2a0248b 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -405,7 +405,7 @@ MagickExport char *GetImageViewException(const ImageView *image_view, 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 @@ MagickExport char *GetImageViewException(const ImageView *image_view, 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 8e1ad6a94..3e21b9273 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -171,7 +171,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info, /* 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 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info, */ 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 @@ MagickExport void AcquireNextImage(const ImageInfo *image_info,Image *image, 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 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname, (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 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname, 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 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname, } 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 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns, 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 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info) 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 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, 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 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, 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 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, case '[': { char - pattern[MaxTextExtent]; + pattern[MagickPathExtent]; const char *value; @@ -1530,7 +1530,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, 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 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, 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 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, 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 IsImageObject(const Image *image) MagickExport MagickBooleanType IsTaintImage(const Image *image) { char - magick[MaxTextExtent], - filename[MaxTextExtent]; + magick[MagickPathExtent], + filename[MagickPathExtent]; register const Image *p; @@ -1773,8 +1773,8 @@ MagickExport MagickBooleanType IsTaintImage(const Image *image) 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, count; unsigned char - magick[2*MaxTextExtent]; + magick[2*MagickPathExtent]; /* Look for 'image.format' in filename. @@ -2441,9 +2441,9 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, /* 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, *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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, */ 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, 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 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, (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 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, * parenthesis, but may not be unset when parenthesis ends. */ char - property[MaxTextExtent]; + property[MagickPathExtent]; const char *value; @@ -3694,7 +3694,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, 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 e17b44d56..a3a580f75 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -319,9 +319,9 @@ struct _Image *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 @@ struct _ImageInfo 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 c2aa14b9d..b5e8173f2 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -745,7 +745,7 @@ MagickExport char **GetLocaleList(const char *pattern,size_t *number_messages, MagickExport const char *GetLocaleMessage(const char *tag) { char - name[MaxTextExtent]; + name[MagickPathExtent]; const LocaleInfo *locale_info; @@ -756,7 +756,7 @@ MagickExport const char *GetLocaleMessage(const char *tag) 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 @@ MagickExport LinkedListInfo *GetLocaleOptions(const char *filename, ExceptionInfo *exception) { char - path[MaxTextExtent]; + path[MagickPathExtent]; const char *element; @@ -809,7 +809,7 @@ MagickExport LinkedListInfo *GetLocaleOptions(const char *filename, 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 @@ MagickExport LinkedListInfo *GetLocaleOptions(const char *filename, 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 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], - message[MaxTextExtent], - tag[MaxTextExtent], + keyword[MagickPathExtent], + message[MagickPathExtent], + tag[MagickPathExtent], *token; const char @@ -1190,7 +1190,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -1243,18 +1243,18 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, 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 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, */ 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 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, if (LocaleCompare(keyword,"") == 0) { ChopLocaleComponents(tag,1); - (void) ConcatenateMagickString(tag,"/",MaxTextExtent); + (void) ConcatenateMagickString(tag,"/",MagickPathExtent); continue; } if (LocaleCompare(keyword,"") == 0) @@ -1299,15 +1299,15 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, */ 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 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, 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 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, (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,"") == 0) { ChopLocaleComponents(tag,2); - (void) ConcatenateMagickString(tag,"/",MaxTextExtent); + (void) ConcatenateMagickString(tag,"/",MagickPathExtent); continue; } if (*keyword == '<') @@ -1353,13 +1353,13 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, { 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 18e47d419..40ed0b8fa 100644 --- a/MagickCore/log.c +++ b/MagickCore/log.c @@ -203,7 +203,7 @@ static const LogMapInfo }; static char - log_name[MaxTextExtent] = "Magick"; + log_name[MagickPathExtent] = "Magick"; static LinkedListInfo *log_cache = (LinkedListInfo *) NULL; @@ -961,11 +961,11 @@ static char *TranslateEvent(const LogEventType magick_unused(type), 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 @@ static char *TranslateEvent(const LogEventType magick_unused(type), 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 @@ static char *TranslateFilename(const LogInfo *log_info) 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 @@ MagickBooleanType LogMagickEventList(const LogEventType type,const char *module, 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 @@ MagickBooleanType LogMagickEventList(const LogEventType type,const char *module, } 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 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml, const char *filename,const size_t depth,ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; const char @@ -1452,7 +1452,7 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -1491,17 +1491,17 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *log_cache,const char *xml, 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 void SetLogMethod(MagickLogMethod method) 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 9658b4674..f76c3f7ce 100644 --- a/MagickCore/mac.c +++ b/MagickCore/mac.c @@ -459,7 +459,7 @@ MagickExport MagickBooleanType MACIsMagickConflict(const char *magick) 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 @@ MagickExport void MACErrorHandler(const ExceptionType error,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 defined(DISABLE_SIOUX) if(exception.hook != (MACErrorHookPtr) NULL) @@ -559,15 +559,15 @@ static void MACFatalErrorHandler(const ExceptionType severity, 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 @@ MagickExport void MACWarningHandler(const ExceptionType warning, 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 @@ MagickExport struct dirent *readdir(DIR *entry) dir_entry; static unsigned char - pathname[MaxTextExtent]; + pathname[MagickPathExtent]; if (entry == (DIR *) NULL) return((struct dirent *) NULL); @@ -1561,7 +1561,7 @@ MagickExport void SetApplicationType(const char *filename,const char *magick, (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 9eeb5af4f..848262296 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -247,7 +247,7 @@ static LinkedListInfo *AcquireMagicCache(const char *filename, ExceptionInfo *exception) { char - path[MaxTextExtent]; + path[MagickPathExtent]; const StringInfo *option; @@ -274,7 +274,7 @@ static LinkedListInfo *AcquireMagicCache(const char *filename, 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 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; const char @@ -788,7 +788,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -827,17 +827,17 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache, 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 99fb28575..965c0ca1b 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -301,7 +301,7 @@ MagickExport MagickBooleanType GetImageMagick(const unsigned char *magick, (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 @@ MagickExport MagickBooleanType ListMagickInfo(FILE *file, #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 @@ MagickExport void MagickCoreGenesis(const char *path, { char *events, - execution_path[MaxTextExtent], - filename[MaxTextExtent]; + execution_path[MagickPathExtent], + filename[MagickPathExtent]; /* Initialize the Magick environment. @@ -1418,9 +1418,9 @@ MagickExport void MagickCoreGenesis(const char *path, 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 cc65ee8cb..cd7096281 100644 --- a/MagickCore/matrix.c +++ b/MagickCore/matrix.c @@ -76,7 +76,7 @@ struct _MatrixInfo synchronize; char - path[MaxTextExtent]; + path[MagickPathExtent]; int file; diff --git a/MagickCore/memory.c b/MagickCore/memory.c index b21561f76..fa1d44ea7 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -129,7 +129,7 @@ typedef struct _MagickMemoryMethods struct _MemoryInfo { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; VirtualMemoryType type; diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h index a0091025f..7e8edf1c8 100644 --- a/MagickCore/method-attribute.h +++ b/MagickCore/method-attribute.h @@ -102,8 +102,14 @@ extern "C" { #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 e46c0a7da..6c8e80d36 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -834,17 +834,17 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache, 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 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache, MagickExport char *MagickToMime(const char *magick) { char - filename[MaxTextExtent], - media[MaxTextExtent]; + filename[MagickPathExtent], + media[MagickPathExtent]; const MimeInfo *mime_info; @@ -1011,14 +1011,14 @@ MagickExport char *MagickToMime(const char *magick) 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 1f9a4dfea..e685f8b6c 100644 --- a/MagickCore/module.c +++ b/MagickCore/module.c @@ -401,9 +401,9 @@ MagickExport char **GetModuleList(const char *pattern, { char **modules, - filename[MaxTextExtent], - module_path[MaxTextExtent], - path[MaxTextExtent]; + filename[MagickPathExtent], + module_path[MagickPathExtent], + path[MagickPathExtent]; DIR *directory; @@ -486,7 +486,7 @@ MagickExport char **GetModuleList(const char *pattern, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, (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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, "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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, 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 @@ static MagickBooleanType GetMagickModulePath(const char *filename, /* 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 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, 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 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, 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 @@ MagickExport MagickBooleanType ListModuleInfo(FILE *file, 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 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, 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 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, 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 @@ static void TagToCoderModuleName(const char *tag,char *name) (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 @@ static void TagToFilterModuleName(const char *tag,char *name) (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 TagToFilterModuleName(const char *tag,char *name) 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 d67864182..e6560235b 100644 --- a/MagickCore/monitor-private.h +++ b/MagickCore/monitor-private.h @@ -28,11 +28,11 @@ static inline MagickBooleanType SetImageProgress(const Image *image, 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 c84097d92..483008f58 100644 --- a/MagickCore/montage.c +++ b/MagickCore/montage.c @@ -134,7 +134,7 @@ MagickExport MontageInfo *CloneMontageInfo(const ImageInfo *image_info, 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 @@ MagickExport void GetMontageInfo(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, #define TileImageTag "Tile/Image" char - tile_geometry[MaxTextExtent], + tile_geometry[MagickPathExtent], *title; const char @@ -489,11 +489,11 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, if (montage_info->title != (char *) NULL) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; DrawInfo *clone_info; @@ -682,7 +682,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, 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 9b6a6b493..bbfd5f34f 100644 --- a/MagickCore/montage.h +++ b/MagickCore/montage.h @@ -60,7 +60,7 @@ typedef struct _MontageInfo gravity; char - filename[MaxTextExtent]; + filename[MagickPathExtent]; MagickBooleanType debug; diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index b3c55a6a8..38f153bf7 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -217,7 +217,7 @@ static KernelInfo *ParseKernelArray(const char *kernel_string) *kernel; char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p, @@ -374,7 +374,7 @@ static KernelInfo *ParseKernelName(const char *kernel_string, ExceptionInfo *exception) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p, @@ -492,7 +492,7 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string, char *kernel_cache, - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -3667,7 +3667,7 @@ MagickPrivate Image *MorphologyApply(const Image *image, 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 @@ MagickPrivate Image *MorphologyApply(const Image *image, /* 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 5902aa00d..1c7668a54 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -198,11 +198,11 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved) *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 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved) 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 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved) 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 @@ MagickPrivate void NTErrorHandler(const ExceptionType severity, const char *reason,const char *description) { char - buffer[3*MaxTextExtent], + buffer[3*MagickPathExtent], *message; (void) severity; @@ -617,18 +617,18 @@ MagickPrivate void NTErrorHandler(const ExceptionType severity, } 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 @@ MagickPrivate MagickBooleanType NTGetExecutionPath(char *path, 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 @@ char *NTGetLastError(void) MagickPrivate const char *NTGetLibraryError(void) { static char - last_error[MaxTextExtent]; + last_error[MagickPathExtent]; char *error; @@ -828,7 +828,7 @@ MagickPrivate const char *NTGetLibraryError(void) *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 @@ void *NTGetLibrarySymbol(void *handle,const char *name) MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path) { char - module_path[MaxTextExtent]; + module_path[MagickPathExtent]; HMODULE handle; @@ -908,7 +908,7 @@ MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path) 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 @@ static int NTLocateGhostscript(DWORD flags,int *root_index, for (i=0; i < (ssize_t) (sizeof(products)/sizeof(products[0])); i++) { char - key[MaxTextExtent]; + key[MagickPathExtent]; HKEY hkey; @@ -1022,7 +1022,7 @@ static int NTLocateGhostscript(DWORD flags,int *root_index, 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 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit, char *value,const size_t length) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], *directory; int @@ -1106,7 +1106,7 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit, 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 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit, *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 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit, 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 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit, MagickPrivate int NTGhostscriptDLL(char *path,int length) { static char - dll[MaxTextExtent] = { "" }; + dll[MagickPathExtent] = { "" }; static BOOL is_64_bit_version; @@ -1258,7 +1258,7 @@ MagickPrivate int NTGhostscriptEXE(char *path,int length) *p; static char - program[MaxTextExtent] = { "" }; + program[MagickPathExtent] = { "" }; static BOOL is_64_bit_version = FALSE; @@ -1307,9 +1307,9 @@ MagickPrivate int NTGhostscriptEXE(char *path,int length) MagickPrivate int NTGhostscriptFonts(char *path,int length) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], *directory, - filename[MaxTextExtent]; + filename[MagickPathExtent]; register char *p, @@ -1319,12 +1319,12 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length) 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 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length) 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 NTGhostscriptFonts(char *path,int length) MagickPrivate int NTGhostscriptLoadDLL(void) { char - path[MaxTextExtent]; + path[MagickPathExtent]; if (ghost_semaphore == (SemaphoreInfo *) NULL) ActivateSemaphoreInfo(&ghost_semaphore); @@ -1622,15 +1622,15 @@ MagickPrivate DIR *NTOpenDirectory(const char *path) 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 @@ MagickPrivate DIR *NTOpenDirectory(const char *path) 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 @@ static inline void *NTLoadLibrary(const char *filename) 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 @@ static inline void *NTLoadLibrary(const char *filename) MagickPrivate void *NTOpenLibrary(const char *filename) { char - path[MaxTextExtent]; + path[MagickPathExtent]; register const char *p, @@ -1757,9 +1757,9 @@ MagickPrivate void *NTOpenLibrary(const char *filename) 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 struct dirent *NTReadDirectory(DIR *entry) MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey) { char - package_key[MaxTextExtent]; + package_key[MagickPathExtent]; DWORD size, @@ -1872,7 +1872,7 @@ MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey) /* 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 @@ MagickPrivate unsigned char *NTResourceToBlob(const char *id) #ifndef MAGICKCORE_LIBRARY_NAME char - path[MaxTextExtent]; + path[MagickPathExtent]; #endif DWORD @@ -2014,7 +2014,7 @@ MagickPrivate unsigned char *NTResourceToBlob(const char *id) #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 @@ MagickPrivate unsigned char *NTResourceToBlob(const char *id) 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 @@ MagickPrivate int NTSystemCommand(const char *command,char *output) 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 @@ MagickPrivate int NTSystemCommand(const char *command,char *output) 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 @@ MagickPrivate int NTSystemCommand(const char *command,char *output) 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 @@ MagickPrivate void NTWarningHandler(const ExceptionType severity, 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 a8f9cc819..60497c4a7 100644 --- a/MagickCore/nt-feature.c +++ b/MagickCore/nt-feature.c @@ -291,9 +291,9 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, 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 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, 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 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, value_name_length; char - value_data[MaxTextExtent], - value_name[MaxTextExtent]; + value_data[MagickPathExtent], + value_name[MagickPathExtent]; res = ERROR_SUCCESS; @@ -360,7 +360,7 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, { char *family_extent, - token[MaxTextExtent], + token[MagickPathExtent], *pos, *q; @@ -384,7 +384,7 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, 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 @@ MagickExport MagickBooleanType NTAcquireTypeCache(SplayTreeInfo *type_cache, /* 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 7118abfce..67adf1e28 100644 --- a/MagickCore/opencl-private.h +++ b/MagickCore/opencl-private.h @@ -380,9 +380,9 @@ static inline void OpenCLLogException(const char* function, 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 3790e48b7..479efc50b 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -632,10 +632,10 @@ static char* getBinaryCLProgramName(MagickCLEnv clEnv, MagickOpenCLProgram prog, { 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 @@ static char* getBinaryCLProgramName(MagickCLEnv clEnv, MagickOpenCLProgram prog, } 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 @@ static MagickBooleanType CompileOpenCLKernels(MagickCLEnv clEnv, ExceptionInfo* /* 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 @@ static MagickBooleanType CompileOpenCLKernels(MagickCLEnv clEnv, ExceptionInfo* #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 @@ static MagickBooleanType CompileOpenCLKernels(MagickCLEnv clEnv, ExceptionInfo* 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 @@ static MagickBooleanType CompileOpenCLKernels(MagickCLEnv clEnv, ExceptionInfo* 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 @@ static MagickBooleanType InitOpenCLPlatformDevice(MagickCLEnv clEnv, ExceptionIn 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 @@ static ds_status AcceleratePerfEvaluator(ds_device *device, 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 @@ static MagickBooleanType autoSelectDevice(MagickCLEnv clEnv, ExceptionInfo* exce unsigned int i; unsigned int bestDeviceIndex; AccelerateScoreType bestScore; - char path[MaxTextExtent]; + char path[MagickPathExtent]; MagickBooleanType flag; ds_evaluation_type profileType; @@ -2305,7 +2305,7 @@ static MagickBooleanType autoSelectDevice(MagickCLEnv clEnv, ExceptionInfo* exce 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 @@ MagickBooleanType OpenCLThrowMagickException(ExceptionInfo *exception, 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 @@ const char* GetOpenCLCachedFilesDirectory() { } LockSemaphoreInfo(openclCachedFilesDirectoryLock); if (openclCachedFilesDirectory == NULL) { - char path[MaxTextExtent]; + char path[MagickPathExtent]; char *home = NULL; char *temp = NULL; struct stat attributes; @@ -2842,7 +2842,7 @@ const char* GetOpenCLCachedFilesDirectory() { */ /* 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 @@ const char* GetOpenCLCachedFilesDirectory() { /* 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 @@ void OpenCLLog(const char* message) { if (getenv("MAGICK_OCL_LOG")) { if (message) { - char path[MaxTextExtent]; + char path[MagickPathExtent]; unsigned long allocSize; MagickCLEnv clEnv; @@ -2951,7 +2951,7 @@ void OpenCLLog(const char* message) { 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 1d4901498..01e2a2ea8 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -1809,21 +1809,21 @@ MagickExport MagickBooleanType DefineImageOption(ImageInfo *image_info, 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 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, const MagickBooleanType list,const char *options) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const OptionInfo *command_info, @@ -2089,7 +2089,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, 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 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, (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 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option, const MagickBooleanType list,const char *options) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const OptionInfo *command_info, @@ -2634,7 +2634,7 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option, 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 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option, (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 @@ MagickExport ssize_t ParsePixelChannelOption(const char *channels) { char *q, - token[MaxTextExtent]; + token[MagickPathExtent]; ssize_t channel; diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index a47971c19..a5ccb0bec 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4325,7 +4325,7 @@ static void LogPixelChannels(const Image *image) for (i=0; i < (ssize_t) image->number_channels; i++) { char - traits[MaxTextExtent]; + traits[MagickPathExtent]; const char *name; @@ -4396,13 +4396,13 @@ static void LogPixelChannels(const Image *image) 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 3058ddc12..14c3d5473 100644 --- a/MagickCore/policy.c +++ b/MagickCore/policy.c @@ -256,7 +256,7 @@ static LinkedListInfo *AcquirePolicyCache(const char *filename, static PolicyInfo *GetPolicyInfo(const char *name,ExceptionInfo *exception) { char - policyname[MaxTextExtent]; + policyname[MagickPathExtent]; register PolicyInfo *p; @@ -272,12 +272,12 @@ static PolicyInfo *GetPolicyInfo(const char *name,ExceptionInfo *exception) */ *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 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache, ExceptionInfo *exception) { char - keyword[MaxTextExtent], + keyword[MagickPathExtent], *token; const char @@ -766,7 +766,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -805,17 +805,17 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache, 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 34935c4a1..dc1d92e51 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -1677,8 +1677,8 @@ static MagickBooleanType SetImageProfileInternal(Image *image,const char *name, ExceptionInfo *exception) { char - key[MaxTextExtent], - property[MaxTextExtent]; + key[MagickPathExtent], + property[MagickPathExtent]; MagickBooleanType status; @@ -1690,7 +1690,7 @@ static MagickBooleanType SetImageProfileInternal(Image *image,const char *name, 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 @@ static MagickBooleanType SetImageProfileInternal(Image *image,const char *name, /* 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 728b13a4e..259f20947 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -142,9 +142,9 @@ MagickExport MagickBooleanType CloneImageProperties(Image *image, 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 @@ MagickExport MagickBooleanType DefineImageProperty(Image *image, 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 @@ MagickExport MagickBooleanType FormatImageProperty(Image *image, const char *property,const char *format,...) { char - value[MaxTextExtent]; + value[MagickPathExtent]; ExceptionInfo *exception; @@ -370,7 +370,7 @@ MagickExport MagickBooleanType FormatImageProperty(Image *image, 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 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key, { char *attribute, - format[MaxTextExtent], - name[MaxTextExtent], + format[MagickPathExtent], + name[MagickPathExtent], *resource; const StringInfo @@ -601,7 +601,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key, 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 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key, 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 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key, 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 @@ static MagickBooleanType GetEXIFProperty(const Image *image, 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 @@ static MagickBooleanType GetEXIFProperty(const Image *image, 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 @@ static MagickBooleanType GetEXIFProperty(const Image *image, if ((all != 0) || (tag == (size_t) tag_value)) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], *value; value=(char *) NULL; @@ -1470,7 +1470,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image, 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 @@ static MagickBooleanType GetEXIFProperty(const Image *image, 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 @@ static MagickBooleanType GetICCProperty(const Image *image,const char *property, (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 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, 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 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, } 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 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, */ 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 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, */ 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 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, /* 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 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, if (path == (char *) NULL) return((char *) NULL); message=AcquireString((char *) NULL); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, ("\n" "\n" @@ -2007,7 +2007,7 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, } 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 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, */ 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 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, */ 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, { #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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, Image *image,const char *property,ExceptionInfo *exception) { char - value[MaxTextExtent]; + value[MagickPathExtent]; const char *string; @@ -2667,7 +2667,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, } 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, { 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, } if (LocaleCompare("copyright",property) == 0) { - (void) CopyMagickString(value,GetMagickCopyright(),MaxTextExtent); + (void) CopyMagickString(value,GetMagickCopyright(),MagickPathExtent); break; } break; @@ -2707,7 +2707,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, { 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, { /* 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, { WarnNoImageReturn("\"%%[%s]\"",property); (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B", - MaxTextExtent,value); + MagickPathExtent,value); break; } if (LocaleCompare("skewness",property) == 0) @@ -2980,7 +2980,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, 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 @@ DisableMSCWarning(4127) \ 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 @@ DisableMSCWarning(4127) \ 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 @@ DisableMSCWarning(4127) \ 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 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, 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 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, */ { char - pattern[2*MaxTextExtent]; + pattern[2*MagickPathExtent]; const char *key, @@ -3377,7 +3377,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, "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 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, 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 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, if( IfMagickTrue(status) ) { char - name[MaxTextExtent]; + name[MagickPathExtent]; (void) QueryColorname(image,&pixel,SVGCompliance,name, exception); @@ -4129,7 +4129,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, *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 830d2d0ae..fd09e357f 100644 --- a/MagickCore/random.c +++ b/MagickCore/random.c @@ -444,7 +444,7 @@ static StringInfo *GenerateEntropicChaos(RandomInfo *random_info) #if defined(MAGICKCORE_HAVE_MKSTEMP) { char - path[MaxTextExtent]; + path[MagickPathExtent]; int file; diff --git a/MagickCore/registry.c b/MagickCore/registry.c index 30888d143..00ae40a70 100644 --- a/MagickCore/registry.c +++ b/MagickCore/registry.c @@ -107,20 +107,20 @@ MagickExport MagickBooleanType DefineImageRegistry(const RegistryType type, 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 00ccc13ba..514a94217 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -3625,7 +3625,7 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns, #define SampleFactor 5 char - value[MaxTextExtent]; + value[MagickPathExtent]; const char *name; @@ -3690,37 +3690,37 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns, 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 d4eea9f8b..a5cb6230b 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -164,9 +164,9 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, ((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 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type, 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 @@ MagickExport MagickBooleanType GetPathTemplate(char *path) 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 @@ MagickExport MagickBooleanType GetPathTemplate(char *path) 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 @@ MagickExport MagickBooleanType GetPathTemplate(char *path) 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 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, 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 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, 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 @@ MagickExport void RelinquishMagickResource(const ResourceType type, 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 @@ MagickExport void RelinquishMagickResource(const ResourceType type, { 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 void RelinquishMagickResource(const ResourceType type, MagickExport MagickBooleanType RelinquishUniqueFileResource(const char *path) { char - cache_path[MaxTextExtent]; + cache_path[MagickPathExtent]; MagickBooleanType status; @@ -994,7 +996,7 @@ MagickExport MagickBooleanType RelinquishUniqueFileResource(const char *path) 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 478e0fe65..85fd181c5 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -637,9 +637,9 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold, 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 be8128a4d..4facad81c 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -809,7 +809,7 @@ MagickExport MagickBooleanType OpenStream(const ImageInfo *image_info, 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 349c6bbd8..70f029b04 100644 --- a/MagickCore/string.c +++ b/MagickCore/string.c @@ -103,7 +103,7 @@ static const unsigned char % 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 @@ MagickExport char *AcquireString(const char *source) 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 @@ MagickExport StringInfo *AcquireStringInfo(const size_t length) 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 @@ MagickExport StringInfo *AcquireStringInfo(const size_t length) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % 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 @@ MagickExport StringInfo *BlobToStringInfo(const void *blob,const size_t length) *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 @@ MagickExport StringInfo *BlobToStringInfo(const void *blob,const size_t length) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % 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 @@ MagickExport char *CloneString(char **destination,const char *source) 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 @@ MagickExport MagickBooleanType ConcatenateString(char **destination, 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 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename) } 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 @@ MagickExport char *EscapeString(const char *source,const char escape) 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 @@ MagickExport void SetStringInfoLength(StringInfo *string_info, { 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 @@ MagickExport StringInfo *SplitStringInfo(StringInfo *string_info, 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 @@ MagickExport char *StringInfoToString(const StringInfo *string_info) 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 @@ MagickExport char *StringInfoToHexString(const StringInfo *string_info) 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 @@ MagickExport char **StringToArgv(const char *text,int *argc) 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 @@ MagickExport char **StringToList(const char *text) 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 @@ MagickExport char **StringToList(const char *text) else { char - hex_string[MaxTextExtent]; + hex_string[MagickPathExtent]; register char *q; @@ -2509,17 +2509,17 @@ MagickExport char **StringToList(const char *text) 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 @@ MagickExport MagickBooleanType SubstituteString(char **string, */ 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 c01fee7b4..f95084f26 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -1288,7 +1288,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, *image_view; char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -1327,7 +1327,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, 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 7f0bdbe3a..4fda183d2 100644 --- a/MagickCore/token.c +++ b/MagickCore/token.c @@ -277,7 +277,7 @@ MagickExport void GetMagickToken(const char *start,const char **end,char *token) 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 @@ MagickExport MagickBooleanType GlobExpression(const char *expression, 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 c89e0c419..3bda3c106 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -204,7 +204,7 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename, { char *font_path, - path[MaxTextExtent]; + path[MagickPathExtent]; const StringInfo *option; @@ -217,7 +217,7 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename, 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 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename, /* 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 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, #endif char - extension[MaxTextExtent], - name[MaxTextExtent]; + extension[MagickPathExtent], + name[MagickPathExtent]; FcChar8 *family, @@ -814,21 +814,21 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_cache, (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 @@ static MagickBooleanType IsTypeTreeInstantiated(ExceptionInfo *exception) MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception) { char - weight[MaxTextExtent]; + weight[MagickPathExtent]; const char *family, @@ -985,7 +985,7 @@ MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception) 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 @@ static inline MagickBooleanType SetTypeNodePath(const char *filename, 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 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, ExceptionInfo *exception) { char - font_path[MaxTextExtent], - keyword[MaxTextExtent], + font_path[MagickPathExtent], + keyword[MagickPathExtent], *token; const char @@ -1101,8 +1101,8 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, 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 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, GetMagickToken(q,&q,token); if (*token == '\0') break; - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); if (LocaleNCompare(keyword,"')) && (*q != '\0')) { - (void) CopyMagickString(keyword,token,MaxTextExtent); + (void) CopyMagickString(keyword,token,MagickPathExtent); GetMagickToken(q,&q,token); if (*token != '=') continue; @@ -1151,7 +1151,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, else { char - path[MaxTextExtent], + path[MagickPathExtent], *xml; ExceptionInfo @@ -1161,11 +1161,11 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, 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 3ff6bb4a3..50e0971db 100644 --- a/MagickCore/utility-private.h +++ b/MagickCore/utility-private.h @@ -59,13 +59,13 @@ static inline wchar_t *create_wchar_path(const char *utf8) 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 @@ static inline void getcwd_utf8(char *path,size_t extent) (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 9ccacb112..e980da910 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -183,13 +183,13 @@ MagickExport MagickBooleanType AcquireUniqueSymbolicLink(const char *source, 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 MagickBooleanType AcquireUniqueSymbolicLink(const char *source, 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 @@ MagickExport void AppendImageFormat(const char *format,char *filename) 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 @@ MagickExport void AppendImageFormat(const char *format,char *filename) (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 ChopPathComponents(char *path,const size_t components) 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 @@ MagickPrivate void ExpandFilename(char *path) /* 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 @@ MagickPrivate void ExpandFilename(char *path) { #if defined(MAGICKCORE_POSIX_SUPPORT) && !defined(__OS2__) char - username[MaxTextExtent]; + username[MagickPathExtent]; register char *p; @@ -644,22 +644,22 @@ MagickPrivate void ExpandFilename(char *path) /* 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 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, char ***arguments) { char - home_directory[MaxTextExtent], + home_directory[MagickPathExtent], **vector; register ssize_t @@ -755,11 +755,11 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, { 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 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, 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 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, } 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 @@ MagickPrivate MagickBooleanType GetExecutionPath(char *path,const size_t extent) #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 @@ MagickExport MagickBooleanType GetPathAttributes(const char *path, % 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 @@ MagickExport void GetPathComponent(const char *path,PathType type, char *component) { char - magick[MaxTextExtent], + magick[MagickPathExtent], *q, - subimage[MaxTextExtent]; + subimage[MagickPathExtent]; register char *p; @@ -1209,7 +1209,7 @@ MagickExport void GetPathComponent(const char *path,PathType type, *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 @@ MagickExport void GetPathComponent(const char *path,PathType type, 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 @@ MagickExport void GetPathComponent(const char *path,PathType type, { case MagickPath: { - (void) CopyMagickString(component,magick,MaxTextExtent); + (void) CopyMagickString(component,magick,MagickPathExtent); break; } case RootPath: @@ -1304,7 +1304,7 @@ MagickExport void GetPathComponent(const char *path,PathType type, 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 @@ MagickExport void GetPathComponent(const char *path,PathType type, 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 @@ MagickExport void GetPathComponent(const char *path,PathType type, 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 @@ MagickPrivate char **GetPathComponents(const char *path, 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 56d7df5c3..36e5b5361 100644 --- a/MagickCore/version.c +++ b/MagickCore/version.c @@ -255,7 +255,7 @@ MagickExport const char *GetMagickFeatures(void) MagickExport char *GetMagickHomeURL(void) { char - path[MaxTextExtent]; + path[MagickPathExtent]; const char *element; @@ -274,7 +274,7 @@ MagickExport char *GetMagickHomeURL(void) 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 @@ MagickExport unsigned int GetMagickSignature(const StringInfo *nonce) 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 be5dee2d2..9c315fb47 100644 --- a/MagickCore/vision.c +++ b/MagickCore/vision.c @@ -410,7 +410,7 @@ static MagickBooleanType StatisticsComponentsStatistics(const Image *image, 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 24029c581..9b76d5fb8 100644 --- a/MagickCore/vms.c +++ b/MagickCore/vms.c @@ -130,7 +130,7 @@ DIR *opendir(char *name) /* 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 @@ struct dirent *readdir(DIR *directory) *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 a80a1f826..24d569267 100644 --- a/MagickCore/widget.c +++ b/MagickCore/widget.c @@ -1109,7 +1109,7 @@ static void XEditText(Display *display,XWidgetInfo *text_info, { text_info->cursor--; (void) CopyMagickString(text_info->cursor,text_info->cursor+1, - MaxTextExtent); + MagickPathExtent); text_info->highlight=MagickFalse; break; } @@ -1149,7 +1149,7 @@ static void XEditText(Display *display,XWidgetInfo *text_info, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, char **colorlist, - primary_selection[MaxTextExtent], - reset_pattern[MaxTextExtent], - text[MaxTextExtent]; + primary_selection[MagickPathExtent], + reset_pattern[MagickPathExtent], + text[MagickPathExtent]; ExceptionInfo *exception; @@ -1628,7 +1628,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, i; static char - glob_pattern[MaxTextExtent] = "*"; + glob_pattern[MagickPathExtent] = "*"; static MagickStatusType mask = (MagickStatusType) (CWWidth | CWHeight | CWX | CWY); @@ -1688,7 +1688,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, */ *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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, if (state & RedrawActionState) { static char - colorname[MaxTextExtent]; + colorname[MagickPathExtent]; /* Display the selected color in a drawing area. @@ -2092,7 +2092,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, if (id == list_info.id) { (void) CopyMagickString(glob_pattern,reply_info.text, - MaxTextExtent); + MagickPathExtent); state|=UpdateListState; } selection_info.id=(~0); @@ -2235,9 +2235,9 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, */ 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, if (MatteIsActive(reset_info,event.xbutton)) { (void) CopyMagickString(glob_pattern,reset_pattern, - MaxTextExtent); + MagickPathExtent); state|=UpdateListState; } reset_info.raised=MagickTrue; @@ -2454,7 +2454,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; @@ -2524,7 +2524,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, */ 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, case KeyRelease: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -2690,7 +2690,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate int XConfirmWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate int XConfirmWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate int XConfirmWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -3637,7 +3637,7 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, #define CancelButtonText "Cancel" char - primary_selection[MaxTextExtent]; + primary_selection[MagickPathExtent]; int x; @@ -3714,7 +3714,7 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; @@ -4030,7 +4030,7 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, case KeyRelease: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -4115,7 +4115,7 @@ MagickPrivate int XDialogWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, *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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, if (MatteIsActive(home_info,event.xbutton)) { (void) CopyMagickString(working_path,home_directory, - MaxTextExtent); + MagickPathExtent); state|=UpdateListState; } home_info.raised=MagickTrue; @@ -4988,7 +4988,7 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; @@ -5154,13 +5154,13 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, case KeyRelease: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -5335,7 +5335,7 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFileBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, #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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, i; static char - glob_pattern[MaxTextExtent] = "*"; + glob_pattern[MagickPathExtent] = "*"; static MagickStatusType mask = (MagickStatusType) (CWWidth | CWHeight | CWX | CWY); @@ -5547,8 +5547,8 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, */ 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, (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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, */ *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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, if (id == list_info.id) { (void) CopyMagickString(glob_pattern,reply_info.text, - MaxTextExtent); + MagickPathExtent); state|=UpdateListState; } selection_info.id=(~0); @@ -6162,7 +6162,7 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, if (MatteIsActive(back_info,event.xbutton)) { (void) CopyMagickString(glob_pattern,back_pattern, - MaxTextExtent); + MagickPathExtent); state|=UpdateListState; } back_info.raised=MagickTrue; @@ -6226,8 +6226,8 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; @@ -6390,8 +6390,8 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, */ 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 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, case KeyRelease: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -6553,7 +6553,7 @@ MagickPrivate void XFontBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, #define CancelButtonText "Cancel" char - primary_selection[MaxTextExtent]; + primary_selection[MagickPathExtent]; int x; @@ -6852,7 +6852,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; @@ -7452,7 +7452,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, case KeyRelease: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -7561,7 +7561,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, 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 @@ MagickPrivate int XMenuWidget(Display *display,XWindows *windows, } 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 @@ MagickPrivate void XNoticeWidget(Display *display,XWindows *windows, /* 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 @@ MagickPrivate void XNoticeWidget(Display *display,XWindows *windows, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -8436,7 +8436,7 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, }; char - cache[MaxTextExtent]; + cache[MagickPathExtent]; int x, @@ -8510,7 +8510,7 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, /* 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 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, 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 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, 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 @@ MagickPrivate MagickBooleanType XPreferencesWidget(Display *display, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static KeySym key_symbol; @@ -8960,7 +8960,7 @@ MagickPrivate void XTextViewWidget(Display *display, #define DismissButtonText "Dismiss" char - primary_selection[MaxTextExtent]; + primary_selection[MagickPathExtent]; register int i; @@ -9057,7 +9057,7 @@ MagickPrivate void XTextViewWidget(Display *display, /* 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 @@ MagickPrivate void XTextViewWidget(Display *display, 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 @@ MagickPrivate void XTextViewWidget(Display *display, case KeyPress: { static char - command[MaxTextExtent]; + command[MagickPathExtent]; static int length; diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index 67e4e3ace..3b1c3b85d 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -216,8 +216,8 @@ MagickPrivate XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info, { char **components, - subnode[MaxTextExtent], - tag[MaxTextExtent]; + subnode[MagickPathExtent], + tag[MagickPathExtent]; register ssize_t i; @@ -342,12 +342,12 @@ MagickPrivate char *CanonicalXMLContent(const char *content, */ 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 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent) } 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 @@ MagickPrivate XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path { char **components, - subnode[MaxTextExtent], - tag[MaxTextExtent]; + subnode[MagickPathExtent], + tag[MagickPathExtent]; register ssize_t i; @@ -1333,9 +1333,9 @@ static char *ConvertUTF16ToUTF8(const char *content,size_t *length) (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 @@ static char *EncodePredefinedEntities(const char *source,ssize_t offset, } 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 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length, 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 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length, 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 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length, 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 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length, 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 @@ MagickExport char *XMLTreeInfoToXML(XMLTreeInfo *xml_info) 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 @@ MagickExport char *XMLTreeInfoToXML(XMLTreeInfo *xml_info) 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 @@ MagickExport char *XMLTreeInfoToXML(XMLTreeInfo *xml_info) 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 386d4b8b1..82270306c 100644 --- a/MagickCore/xwindow-private.h +++ b/MagickCore/xwindow-private.h @@ -162,7 +162,7 @@ typedef struct _XDrawInfo *coordinate_info; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; } XDrawInfo; typedef enum @@ -203,7 +203,7 @@ typedef struct _XAnnotateInfo stencil; char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; struct _XAnnotateInfo *next, @@ -344,7 +344,7 @@ typedef struct _XResourceInfo gravity; char - home_directory[MaxTextExtent]; + home_directory[MagickPathExtent]; } XResourceInfo; typedef struct _XWindowInfo diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 327e23f42..a484483a2 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -621,12 +621,12 @@ MagickPrivate MagickBooleanType XAnnotateImage(Display *display, (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 @@ MagickPrivate XVisualInfo *XBestVisualInfo(Display *display, map_property; char - map_name[MaxTextExtent]; + map_name[MagickPathExtent]; int j, @@ -1305,7 +1305,7 @@ MagickPrivate XVisualInfo *XBestVisualInfo(Display *display, /* 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 @@ MagickPrivate void XDisplayImageInfo(Display *display, Image *image,ExceptionInfo *exception) { char - filename[MaxTextExtent], + filename[MagickPathExtent], *text, **textlist; @@ -2056,13 +2056,13 @@ MagickPrivate void XDisplayImageInfo(Display *display, 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 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, (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 @@ MagickExport char *XGetResourceClass(XrmDatabase database, 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 @@ MagickExport char *XGetResourceClass(XrmDatabase database, /* 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 @@ MagickExport char *XGetResourceClass(XrmDatabase database, 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 @@ MagickExport XrmDatabase XGetResourceDatabase(Display *display, const char *client_name) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; int c; @@ -3401,7 +3401,7 @@ MagickExport XrmDatabase XGetResourceDatabase(Display *display, 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 @@ MagickExport XrmDatabase XGetResourceDatabase(Display *display, 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 @@ MagickExport void XGetResourceInfo(const ImageInfo *image_info, (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 @@ MagickExport char *XGetResourceInstance(XrmDatabase database, { char *resource_type, - resource_name[MaxTextExtent]; + resource_name[MagickPathExtent]; Status status; @@ -3679,7 +3679,7 @@ MagickExport char *XGetResourceInstance(XrmDatabase database, 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 *XGetResourceInstance(XrmDatabase database, MagickExport char *XGetScreenDensity(Display *display) { char - density[MaxTextExtent]; + density[MagickPathExtent]; double x_density, @@ -3731,7 +3731,7 @@ MagickExport char *XGetScreenDensity(Display *display) ((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 @@ MagickExport Image *XImportImage(const ImageInfo *image_info, else { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if ((crop_info.width != 0) && (crop_info.height != 0)) { Image @@ -5901,7 +5901,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, (image->storage_class == DirectClass) && (image->alpha_trait != UndefinedPixelTrait)) { char - size[MaxTextExtent]; + size[MagickPathExtent]; Image *pattern; @@ -5913,8 +5913,8 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, (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 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, (image->alpha_trait != UndefinedPixelTrait)) { char - size[MaxTextExtent]; + size[MagickPathExtent]; Image *pattern; @@ -6530,8 +6530,8 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, (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 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, ExceptionInfo *exception) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; int y; @@ -7166,7 +7166,7 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, 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 @@ MagickPrivate void XMakeMagnifyImage(Display *display,XWindows *windows, */ (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 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv, if (window_info->geometry != (char *) NULL) { char - default_geometry[MaxTextExtent], - geometry[MaxTextExtent]; + default_geometry[MagickPathExtent], + geometry[MagickPathExtent]; int flags; @@ -8405,16 +8405,16 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv, /* 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 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv, static const char *GetLocaleMonitorMessage(const char *text) { char - message[MaxTextExtent], - tag[MaxTextExtent]; + message[MagickPathExtent], + tag[MagickPathExtent]; const char *locale_message; @@ -8591,11 +8591,11 @@ static const char *GetLocaleMonitorMessage(const char *text) 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 @@ MagickPrivate MagickBooleanType XRenderImage(Image *image, 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 @@ MagickPrivate void XUserPreferences(XResourceInfo *resource_info) { #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 @@ MagickPrivate void XUserPreferences(XResourceInfo *resource_info) 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 @@ MagickPrivate void XWarning(const ExceptionType magick_unused(warning), 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); } diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 029492448..3e173d7d4 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -1043,7 +1043,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, resource_info.map_type=(char *) NULL; if (*option == '+') break; - (void) CopyMagickString(argv[i]+1,"san",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"san",MagickPathExtent); i++; if (i == (ssize_t) argc) ThrowAnimateException(OptionError,"MissingArgument",option); diff --git a/MagickWand/compare.c b/MagickWand/compare.c index e6da9bcdc..9c97e2a9a 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -1024,7 +1024,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, (void) IsImagesEqual(image,reconstruct_image,exception); if (*difference_image->magick == '\0') (void) CopyMagickString(difference_image->magick,image->magick, - MaxTextExtent); + MagickPathExtent); if (image_info->verbose == MagickFalse) { switch (metric) diff --git a/MagickWand/composite.c b/MagickWand/composite.c index 2f247c2d0..d3af6541f 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -1452,7 +1452,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, if (LocaleCompare("tile",option+1) == 0) { composite_options.tile=(*option == '-') ? MagickTrue : MagickFalse; - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); break; } if (LocaleCompare("transform",option+1) == 0) diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c index a35a43da1..23b8fd5b8 100644 --- a/MagickWand/conjure.c +++ b/MagickWand/conjure.c @@ -153,7 +153,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info, } char - filename[MaxTextExtent], + filename[MagickPathExtent], *option; Image @@ -287,7 +287,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info, status=SetImageOption(image_info,"filename",argv[i]); if (status == MagickFalse) ThrowConjureException(ImageError,"UnableToPersistKey",argv[i]); - (void) FormatLocaleString(filename,MaxTextExtent,"msl:%s",argv[i]); + (void) FormatLocaleString(filename,MagickPathExtent,"msl:%s",argv[i]); image=ReadImages(image_info,filename,exception); CatchException(exception); if (image != (Image *) NULL) diff --git a/MagickWand/convert.c b/MagickWand/convert.c index c288bd791..45f54ff7a 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -2166,7 +2166,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, if (LocaleCompare("morphology",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; KernelInfo *kernel_info; diff --git a/MagickWand/display.c b/MagickWand/display.c index 95c73965b..6bc88484c 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -500,7 +500,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, option=argv[++i]; filename=option; } - (void) CopyMagickString(image_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(image_info->filename,filename,MagickPathExtent); images=ReadImage(image_info,exception); CatchException(exception); status&=(images != (Image *) NULL) && @@ -588,7 +588,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, Write image. */ (void) CopyMagickString(display_image->filename, - resource_info.write_filename,MaxTextExtent); + resource_info.write_filename,MagickPathExtent); (void) SetImageInfo(image_info,1,exception); status&=WriteImage(image_info,display_image,exception); } @@ -1168,7 +1168,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, resource_info.image_geometry=(char *) NULL; if (*option == '+') break; - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); i++; if (i == (ssize_t) argc) ThrowDisplayException(OptionError,"MissingArgument",option); diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 9e0c45c76..afbcd3823 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -93,7 +93,7 @@ struct _DrawingWand id; char - name[MaxTextExtent]; + name[MagickPathExtent]; /* Support structures */ Image @@ -176,7 +176,7 @@ static int MvgPrintf(DrawingWand *wand,const char *format,...) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",format); assert(wand != (DrawingWand *) NULL); assert(wand->signature == WandSignature); - extent=20UL*MaxTextExtent; + extent=20UL*MagickPathExtent; if (wand->mvg == (char *) NULL) { wand->mvg=(char *) AcquireQuantumMemory(extent,sizeof(*wand->mvg)); @@ -189,7 +189,7 @@ static int MvgPrintf(DrawingWand *wand,const char *format,...) wand->mvg_alloc=extent; wand->mvg_length=0; } - if (wand->mvg_alloc < (wand->mvg_length+10*MaxTextExtent)) + if (wand->mvg_alloc < (wand->mvg_length+10*MagickPathExtent)) { extent+=wand->mvg_alloc; wand->mvg=(char *) ResizeQuantumMemory(wand->mvg,extent, @@ -249,7 +249,7 @@ static int MvgPrintf(DrawingWand *wand,const char *format,...) static int MvgAutoWrapPrintf(DrawingWand *wand,const char *format,...) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; int count; @@ -284,7 +284,7 @@ static void MvgAppendColor(DrawingWand *wand,const PixelInfo *packet) else { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; PixelInfo pixel; @@ -454,7 +454,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand) "MemoryAllocationFailed",GetExceptionMessage(errno)); (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); - (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"DrawingWand-%.20g", + (void) FormatLocaleString(clone_wand->name,MagickPathExtent,"DrawingWand-%.20g", (double) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); @@ -993,7 +993,7 @@ WandExport MagickBooleanType DrawComposite(DrawingWand *wand, if (clone_image == (Image *) NULL) return(MagickFalse); image_info=AcquireImageInfo(); - (void) CopyMagickString(image_info->magick,"MIFF",MaxTextExtent); + (void) CopyMagickString(image_info->magick,"MIFF",MagickPathExtent); blob_length=2048; blob=(unsigned char *) ImageToBlob(image_info,clone_image,&blob_length, wand->exception); @@ -1007,9 +1007,9 @@ WandExport MagickBooleanType DrawComposite(DrawingWand *wand, if (base64 == (char *) NULL) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g bytes",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g bytes",(double) (4L*blob_length/3L+4L)); ThrowDrawException(ResourceLimitWarning,"MemoryAllocationFailed", wand->name); @@ -1327,7 +1327,7 @@ WandExport char *DrawGetException(const DrawingWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); assert(severity != (ExceptionType *) NULL); *severity=wand->exception->severity; - description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent, + description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent, sizeof(*description)); if (description == (char *) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", @@ -1336,14 +1336,14 @@ WandExport char *DrawGetException(const DrawingWand *wand, if (wand->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( wand->exception->severity,wand->exception->reason), - MaxTextExtent); + MagickPathExtent); if (wand->exception->description != (char *) NULL) { - (void) ConcatenateMagickString(description," (",MaxTextExtent); + (void) ConcatenateMagickString(description," (",MagickPathExtent); (void) ConcatenateMagickString(description,GetLocaleExceptionMessage( wand->exception->severity,wand->exception->description), - MaxTextExtent); - (void) ConcatenateMagickString(description,")",MaxTextExtent); + MagickPathExtent); + (void) ConcatenateMagickString(description,")",MagickPathExtent); } return(description); } @@ -2422,7 +2422,7 @@ WandExport double DrawGetTextInterwordSpacing(DrawingWand *wand) WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { char - value[MaxTextExtent], + value[MagickPathExtent], *xml; PixelInfo @@ -2451,7 +2451,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { (void) CopyMagickString(value,CommandOptionToMnemonic( MagickClipPathOptions,(ssize_t) CurrentContext->clip_units), - MaxTextExtent); + MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"decorate",0); @@ -2459,7 +2459,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { (void) CopyMagickString(value,CommandOptionToMnemonic( MagickDecorateOptions,(ssize_t) CurrentContext->decorate), - MaxTextExtent); + MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"encoding",0); @@ -2478,7 +2478,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) child=AddChildToXMLTree(xml_info,"fill-opacity",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", (double) (QuantumScale*CurrentContext->fill.alpha)); (void) SetXMLTreeContent(child,value); } @@ -2487,7 +2487,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { (void) CopyMagickString(value,CommandOptionToMnemonic( MagickFillRuleOptions,(ssize_t) CurrentContext->fill_rule), - MaxTextExtent); + MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"font",0); @@ -2499,7 +2499,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) child=AddChildToXMLTree(xml_info,"font-size",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", CurrentContext->pointsize); (void) SetXMLTreeContent(child,value); } @@ -2507,20 +2507,20 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,CommandOptionToMnemonic( - MagickStretchOptions,(ssize_t) CurrentContext->stretch),MaxTextExtent); + MagickStretchOptions,(ssize_t) CurrentContext->stretch),MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"font-style",0); if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,CommandOptionToMnemonic( - MagickStyleOptions,(ssize_t) CurrentContext->style),MaxTextExtent); + MagickStyleOptions,(ssize_t) CurrentContext->style),MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"font-weight",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) CurrentContext->weight); (void) SetXMLTreeContent(child,value); } @@ -2528,7 +2528,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,CommandOptionToMnemonic( - MagickGravityOptions,(ssize_t) CurrentContext->gravity),MaxTextExtent); + MagickGravityOptions,(ssize_t) CurrentContext->gravity),MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke",0); @@ -2544,7 +2544,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) child=AddChildToXMLTree(xml_info,"stroke-antialias",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%d", + (void) FormatLocaleString(value,MagickPathExtent,"%d", CurrentContext->stroke_antialias != MagickFalse ? 1 : 0); (void) SetXMLTreeContent(child,value); } @@ -2560,7 +2560,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { if (i != 0) (void) ConcatenateString(&dash_pattern,","); - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", CurrentContext->dash_pattern[i]); (void) ConcatenateString(&dash_pattern,value); } @@ -2570,7 +2570,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) child=AddChildToXMLTree(xml_info,"stroke-dashoffset",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", CurrentContext->dash_offset); (void) SetXMLTreeContent(child,value); } @@ -2578,7 +2578,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,CommandOptionToMnemonic(MagickLineCapOptions, - (ssize_t) CurrentContext->linecap),MaxTextExtent); + (ssize_t) CurrentContext->linecap),MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke-linejoin",0); @@ -2586,27 +2586,27 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) { (void) CopyMagickString(value,CommandOptionToMnemonic( MagickLineJoinOptions,(ssize_t) CurrentContext->linejoin), - MaxTextExtent); + MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke-miterlimit",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) CurrentContext->miterlimit); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke-opacity",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", (double) (QuantumScale*CurrentContext->stroke.alpha)); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke-width",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", CurrentContext->stroke_width); (void) SetXMLTreeContent(child,value); } @@ -2614,13 +2614,13 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,CommandOptionToMnemonic(MagickAlignOptions, - (ssize_t) CurrentContext->align),MaxTextExtent); + (ssize_t) CurrentContext->align),MagickPathExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"text-antialias",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatLocaleString(value,MaxTextExtent,"%d", + (void) FormatLocaleString(value,MagickPathExtent,"%d", CurrentContext->text_antialias != MagickFalse ? 1 : 0); (void) SetXMLTreeContent(child,value); } @@ -4006,8 +4006,8 @@ WandExport void DrawPopDefs(DrawingWand *wand) WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand) { char - geometry[MaxTextExtent], - key[MaxTextExtent]; + geometry[MagickPathExtent], + key[MagickPathExtent]; assert(wand != (DrawingWand *) NULL); assert(wand->signature == WandSignature); @@ -4021,9 +4021,9 @@ WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand) wand->name); return(MagickFalse); } - (void) FormatLocaleString(key,MaxTextExtent,"%s",wand->pattern_id); + (void) FormatLocaleString(key,MagickPathExtent,"%s",wand->pattern_id); (void) SetImageArtifact(wand->image,key,wand->mvg+wand->pattern_offset); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g%+.20g%+.20g", (double) wand->pattern_bounds.width,(double) wand->pattern_bounds.height, (double) wand->pattern_bounds.x,(double) wand->pattern_bounds.y); (void) SetImageArtifact(wand->image,key,geometry); @@ -4729,13 +4729,13 @@ WandExport MagickBooleanType DrawSetFontResolution(DrawingWand *wand, const double x_resolution,const double y_resolution) { char - density[MaxTextExtent]; + density[MagickPathExtent]; assert(wand != (DrawingWand *) NULL); assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(density,MaxTextExtent,"%.20gx%.20g",x_resolution, + (void) FormatLocaleString(density,MagickPathExtent,"%.20gx%.20g",x_resolution, y_resolution); (void) CloneString(&CurrentContext->density,density); return(MagickTrue); @@ -4816,8 +4816,8 @@ WandExport MagickBooleanType DrawSetFillPatternURL(DrawingWand *wand, const char *fill_url) { char - pattern[MaxTextExtent], - pattern_spec[MaxTextExtent]; + pattern[MagickPathExtent], + pattern_spec[MagickPathExtent]; assert(wand != (DrawingWand *) NULL); assert(wand->signature == WandSignature); @@ -4831,13 +4831,13 @@ WandExport MagickBooleanType DrawSetFillPatternURL(DrawingWand *wand, ThrowDrawException(DrawError,"NotARelativeURL",fill_url); return(MagickFalse); } - (void) FormatLocaleString(pattern,MaxTextExtent,"%s",fill_url+1); + (void) FormatLocaleString(pattern,MagickPathExtent,"%s",fill_url+1); if (GetImageArtifact(wand->image,pattern) == (const char *) NULL) { ThrowDrawException(DrawError,"URLNotFound",fill_url) return(MagickFalse); } - (void) FormatLocaleString(pattern_spec,MaxTextExtent,"url(%s)",fill_url); + (void) FormatLocaleString(pattern_spec,MagickPathExtent,"url(%s)",fill_url); #if DRAW_BINARY_IMPLEMENTATION DrawPatternPath(wand->image,CurrentContext,pattern_spec, &CurrentContext->fill_pattern); @@ -5259,8 +5259,8 @@ WandExport MagickBooleanType DrawSetStrokePatternURL(DrawingWand *wand, const char *stroke_url) { char - pattern[MaxTextExtent], - pattern_spec[MaxTextExtent]; + pattern[MagickPathExtent], + pattern_spec[MagickPathExtent]; assert(wand != (DrawingWand *) NULL); assert(wand->signature == WandSignature); @@ -5271,13 +5271,13 @@ WandExport MagickBooleanType DrawSetStrokePatternURL(DrawingWand *wand, assert(stroke_url != NULL); if (stroke_url[0] != '#') ThrowDrawException(DrawError,"NotARelativeURL",stroke_url); - (void) FormatLocaleString(pattern,MaxTextExtent,"%s",stroke_url+1); + (void) FormatLocaleString(pattern,MagickPathExtent,"%s",stroke_url+1); if (GetImageArtifact(wand->image,pattern) == (const char *) NULL) { ThrowDrawException(DrawError,"URLNotFound",stroke_url) return(MagickFalse); } - (void) FormatLocaleString(pattern_spec,MaxTextExtent,"url(%s)",stroke_url); + (void) FormatLocaleString(pattern_spec,MagickPathExtent,"url(%s)",stroke_url); #if DRAW_BINARY_IMPLEMENTATION DrawPatternPath(wand->image,CurrentContext,pattern_spec, &CurrentContext->stroke_pattern); @@ -6269,7 +6269,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand, if (child != (XMLTreeInfo *) NULL) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *q; @@ -6626,7 +6626,7 @@ WandExport DrawingWand *NewDrawingWand(void) GetExceptionMessage(errno)); (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); - (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",DrawingWandId, + (void) FormatLocaleString(wand->name,MagickPathExtent,"%s-%.20g",DrawingWandId, (double) wand->id); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); diff --git a/MagickWand/import.c b/MagickWand/import.c index 1500bf426..b36e89dc2 100644 --- a/MagickWand/import.c +++ b/MagickWand/import.c @@ -450,7 +450,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, filename=argv[i]; if (target_window != (char *) NULL) (void) CopyMagickString(image_info->filename,target_window, - MaxTextExtent); + MagickPathExtent); for (scene=0; scene < (size_t) MagickMax(snapshots,1); scene++) { (void) sleep(resource_info.pause); @@ -459,8 +459,8 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, (exception->severity < ErrorException); if (images == (Image *) NULL) continue; - (void) CopyMagickString(images->filename,filename,MaxTextExtent); - (void) CopyMagickString(images->magick,"PS",MaxTextExtent); + (void) CopyMagickString(images->filename,filename,MagickPathExtent); + (void) CopyMagickString(images->magick,"PS",MagickPathExtent); images->scene=scene; AppendImageStack(images); } @@ -493,7 +493,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, { if (LocaleCompare("border",option+1) == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); ximage_info.borders=(*option == '-') ? MagickTrue : MagickFalse; break; } @@ -802,7 +802,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, } if (LocaleCompare("frame",option+1) == 0) { - (void) CopyMagickString(argv[i]+1,"sans0",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans0",MagickPathExtent); ximage_info.frame=(*option == '-') ? MagickTrue : MagickFalse; break; } @@ -1164,7 +1164,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, } if (LocaleCompare("snaps",option+1) == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); i++; if (i == (ssize_t) argc) ThrowImportException(OptionError,"MissingArgument",option); diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 9f2eebaee..1459d31a4 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -702,7 +702,7 @@ WandExport MagickBooleanType MagickImageCommand(ImageInfo *image_info,int argc, GetPathComponent(argv[0],TailPath,cli_wand->wand.name); SetClientName(cli_wand->wand.name); - ConcatenateMagickString(cli_wand->wand.name,"-CLI",MaxTextExtent); + ConcatenateMagickString(cli_wand->wand.name,"-CLI",MagickPathExtent); len=strlen(argv[0]); /* precaution */ diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index 399afd83e..9ae3bec3e 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -100,7 +100,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand, images->filename); (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); - (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(clone_wand->name,MagickPathExtent,"%s-%.20g", MagickWandId,(double) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); @@ -595,7 +595,7 @@ WandExport MagickBooleanType MagickAnnotateImage(MagickWand *wand, const double angle,const char *text) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; DrawInfo *draw_info; @@ -613,7 +613,7 @@ WandExport MagickBooleanType MagickAnnotateImage(MagickWand *wand, if (draw_info == (DrawInfo *) NULL) return(MagickFalse); (void) CloneString(&draw_info->text,text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",x,y); + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",x,y); draw_info->affine.sx=cos((double) DegreesToRadians(fmod(angle,360.0))); draw_info->affine.rx=sin((double) DegreesToRadians(fmod(angle,360.0))); draw_info->affine.ry=(-sin((double) DegreesToRadians(fmod(angle,360.0)))); @@ -864,7 +864,7 @@ WandExport MagickBooleanType MagickBlackThresholdImage(MagickWand *wand, const PixelWand *threshold) { char - thresholds[MaxTextExtent]; + thresholds[MagickPathExtent]; MagickBooleanType status; @@ -875,7 +875,7 @@ WandExport MagickBooleanType MagickBlackThresholdImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - (void) FormatLocaleString(thresholds,MaxTextExtent, + (void) FormatLocaleString(thresholds,MagickPathExtent, QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat, PixelGetRedQuantum(threshold),PixelGetGreenQuantum(threshold), PixelGetBlueQuantum(threshold),PixelGetAlphaQuantum(threshold)); @@ -1548,7 +1548,7 @@ WandExport MagickBooleanType MagickColorizeImage(MagickWand *wand, const PixelWand *colorize,const PixelWand *blend) { char - percent_blend[MaxTextExtent]; + percent_blend[MagickPathExtent]; Image *colorize_image; @@ -1564,14 +1564,14 @@ WandExport MagickBooleanType MagickColorizeImage(MagickWand *wand, ThrowWandException(WandError,"ContainsNoImages",wand->name); GetPixelInfo(wand->images,&target); if (target.colorspace != CMYKColorspace) - (void) FormatLocaleString(percent_blend,MaxTextExtent, + (void) FormatLocaleString(percent_blend,MagickPathExtent, "%g,%g,%g,%g",(double) (100.0*QuantumScale* PixelGetRedQuantum(blend)),(double) (100.0*QuantumScale* PixelGetGreenQuantum(blend)),(double) (100.0*QuantumScale* PixelGetBlueQuantum(blend)),(double) (100.0*QuantumScale* PixelGetAlphaQuantum(blend))); else - (void) FormatLocaleString(percent_blend,MaxTextExtent, + (void) FormatLocaleString(percent_blend,MagickPathExtent, "%g,%g,%g,%g,%g",(double) (100.0*QuantumScale* PixelGetRedQuantum(blend)),(double) (100.0*QuantumScale* PixelGetGreenQuantum(blend)),(double) (100.0*QuantumScale* @@ -5953,7 +5953,7 @@ WandExport char *MagickIdentifyImage(MagickWand *wand) { char *description, - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -6596,7 +6596,7 @@ WandExport MagickBooleanType MagickModulateImage(MagickWand *wand, const double brightness,const double saturation,const double hue) { char - modulate[MaxTextExtent]; + modulate[MagickPathExtent]; MagickBooleanType status; @@ -6607,7 +6607,7 @@ WandExport MagickBooleanType MagickModulateImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g", + (void) FormatLocaleString(modulate,MagickPathExtent,"%g,%g,%g", brightness,saturation,hue); status=ModulateImage(wand->images,modulate,wand->exception); return(status); @@ -7370,7 +7370,7 @@ WandExport MagickBooleanType MagickPingImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); ping_info=CloneImageInfo(wand->image_info); if (filename != (const char *) NULL) - (void) CopyMagickString(ping_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(ping_info->filename,filename,MagickPathExtent); images=PingImage(ping_info,wand->exception); ping_info=DestroyImageInfo(ping_info); if (images == (Image *) NULL) @@ -7971,7 +7971,7 @@ WandExport MagickBooleanType MagickRandomThresholdImage(MagickWand *wand, const double low,const double high) { char - threshold[MaxTextExtent]; + threshold[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); @@ -7979,7 +7979,7 @@ WandExport MagickBooleanType MagickRandomThresholdImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - (void) FormatLocaleString(threshold,MaxTextExtent,"%gx%g",low,high); + (void) FormatLocaleString(threshold,MagickPathExtent,"%gx%g",low,high); return(RandomThresholdImage(wand->images,threshold,wand->exception)); } @@ -8027,7 +8027,7 @@ WandExport MagickBooleanType MagickReadImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); read_info=CloneImageInfo(wand->image_info); if (filename != (const char *) NULL) - (void) CopyMagickString(read_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(read_info->filename,filename,MagickPathExtent); images=ReadImage(read_info,wand->exception); read_info=DestroyImageInfo(read_info); if (images == (Image *) NULL) @@ -9486,7 +9486,7 @@ WandExport MagickBooleanType MagickSetImageFilename(MagickWand *wand, if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); if (filename != (const char *) NULL) - (void) CopyMagickString(wand->images->filename,filename,MaxTextExtent); + (void) CopyMagickString(wand->images->filename,filename,MagickPathExtent); return(MagickTrue); } @@ -9537,7 +9537,7 @@ WandExport MagickBooleanType MagickSetImageFormat(MagickWand *wand, if (magick_info == (const MagickInfo *) NULL) return(MagickFalse); ClearMagickException(wand->exception); - (void) CopyMagickString(wand->images->magick,format,MaxTextExtent); + (void) CopyMagickString(wand->images->magick,format,MagickPathExtent); return(MagickTrue); } @@ -11571,7 +11571,7 @@ WandExport MagickBooleanType MagickTintImage(MagickWand *wand, const PixelWand *tint,const PixelWand *blend) { char - percent_blend[MaxTextExtent]; + percent_blend[MagickPathExtent]; Image *tint_image; @@ -11586,14 +11586,14 @@ WandExport MagickBooleanType MagickTintImage(MagickWand *wand, if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); if (wand->images->colorspace != CMYKColorspace) - (void) FormatLocaleString(percent_blend,MaxTextExtent, + (void) FormatLocaleString(percent_blend,MagickPathExtent, "%g,%g,%g,%g",(double) (100.0*QuantumScale* PixelGetRedQuantum(blend)),(double) (100.0*QuantumScale* PixelGetGreenQuantum(blend)),(double) (100.0*QuantumScale* PixelGetBlueQuantum(blend)),(double) (100.0*QuantumScale* PixelGetAlphaQuantum(blend))); else - (void) FormatLocaleString(percent_blend,MaxTextExtent, + (void) FormatLocaleString(percent_blend,MagickPathExtent, "%g,%g,%g,%g,%g",(double) (100.0*QuantumScale* PixelGetCyanQuantum(blend)),(double) (100.0*QuantumScale* PixelGetMagentaQuantum(blend)),(double) (100.0*QuantumScale* @@ -12134,7 +12134,7 @@ WandExport MagickBooleanType MagickWhiteThresholdImage(MagickWand *wand, const PixelWand *threshold) { char - thresholds[MaxTextExtent]; + thresholds[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); @@ -12142,7 +12142,7 @@ WandExport MagickBooleanType MagickWhiteThresholdImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - (void) FormatLocaleString(thresholds,MaxTextExtent, + (void) FormatLocaleString(thresholds,MagickPathExtent, QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat, PixelGetRedQuantum(threshold),PixelGetGreenQuantum(threshold), PixelGetBlueQuantum(threshold),PixelGetAlphaQuantum(threshold)); @@ -12196,7 +12196,7 @@ WandExport MagickBooleanType MagickWriteImage(MagickWand *wand, if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); if (filename != (const char *) NULL) - (void) CopyMagickString(wand->images->filename,filename,MaxTextExtent); + (void) CopyMagickString(wand->images->filename,filename,MagickPathExtent); image=CloneImage(wand->images,0,0,MagickTrue,wand->exception); if (image == (Image *) NULL) return(MagickFalse); diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c index 0c4903d87..291d67b64 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -2115,7 +2115,7 @@ WandExport MagickBooleanType MagickSetFilename(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (filename != (const char *) NULL) - (void) CopyMagickString(wand->image_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(wand->image_info->filename,filename,MagickPathExtent); return(MagickTrue); } @@ -2200,7 +2200,7 @@ WandExport MagickBooleanType MagickSetFormat(MagickWand *wand, if (magick_info == (const MagickInfo *) NULL) return(MagickFalse); ClearMagickException(wand->exception); - (void) CopyMagickString(wand->image_info->magick,format,MaxTextExtent); + (void) CopyMagickString(wand->image_info->magick,format,MagickPathExtent); return(MagickTrue); } @@ -2576,14 +2576,14 @@ WandExport MagickBooleanType MagickSetPage(MagickWand *wand, const ssize_t y) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); if( IfMagickTrue(wand->debug) ) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g%+.20g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g%+.20g%+.20g", (double) width,(double) height,(double) x,(double) y); (void) CloneString(&wand->image_info->page,geometry); return(MagickTrue); @@ -2780,14 +2780,14 @@ WandExport MagickBooleanType MagickSetResolution(MagickWand *wand, const double x_resolution,const double y_resolution) { char - density[MaxTextExtent]; + density[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); if( IfMagickTrue(wand->debug) ) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",x_resolution, + (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",x_resolution, y_resolution); (void) CloneString(&wand->image_info->density,density); return(MagickTrue); @@ -2825,7 +2825,7 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand, const size_t number_factors,const double *sampling_factors) { char - sampling_factor[MaxTextExtent]; + sampling_factor[MagickPathExtent]; register ssize_t i; @@ -2842,12 +2842,12 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand, return(MagickTrue); for (i=0; i < (ssize_t) (number_factors-1); i++) { - (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%g,", + (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%g,", sampling_factors[i]); (void) ConcatenateString(&wand->image_info->sampling_factor, sampling_factor); } - (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%g", + (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%g", sampling_factors[i]); (void) ConcatenateString(&wand->image_info->sampling_factor,sampling_factor); return(MagickTrue); @@ -2885,14 +2885,14 @@ WandExport MagickBooleanType MagickSetSize(MagickWand *wand, const size_t columns,const size_t rows) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); if( IfMagickTrue(wand->debug) ) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double) + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",(double) columns,(double) rows); (void) CloneString(&wand->image_info->size,geometry); return(MagickTrue); @@ -2933,14 +2933,14 @@ WandExport MagickBooleanType MagickSetSizeOffset(MagickWand *wand, const size_t columns,const size_t rows,const ssize_t offset) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); if( IfMagickTrue(wand->debug) ) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g%+.20g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g%+.20g", (double) columns,(double) rows,(double) offset); (void) CloneString(&wand->image_info->size,geometry); return(MagickTrue); diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h index 01caae24e..4ca29b8af 100644 --- a/MagickWand/magick-wand-private.h +++ b/MagickWand/magick-wand-private.h @@ -52,7 +52,7 @@ struct _MagickWand id; char - name[MaxTextExtent]; /* Wand name to use for MagickWand Logs */ + name[MagickPathExtent]; /* Wand name to use for MagickWand Logs */ Image *images; /* The images in this wand - also the current image */ diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c index 233b772d5..f555212d3 100644 --- a/MagickWand/magick-wand.c +++ b/MagickWand/magick-wand.c @@ -126,7 +126,7 @@ WandExport MagickWand *CloneMagickWand(const MagickWand *wand) wand->name); (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); - (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(clone_wand->name,MagickPathExtent,"%s-%.20g", MagickWandId,(double) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); @@ -282,7 +282,7 @@ WandExport char *MagickGetException(const MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); assert(severity != (ExceptionType *) NULL); *severity=wand->exception->severity; - description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent, + description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent, sizeof(*description)); if (description == (char *) NULL) { @@ -293,13 +293,13 @@ WandExport char *MagickGetException(const MagickWand *wand, *description='\0'; if (wand->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( - wand->exception->severity,wand->exception->reason),MaxTextExtent); + wand->exception->severity,wand->exception->reason),MagickPathExtent); if (wand->exception->description != (char *) NULL) { - (void) ConcatenateMagickString(description," (",MaxTextExtent); + (void) ConcatenateMagickString(description," (",MagickPathExtent); (void) ConcatenateMagickString(description,GetLocaleExceptionMessage( - wand->exception->severity,wand->exception->description),MaxTextExtent); - (void) ConcatenateMagickString(description,")",MaxTextExtent); + wand->exception->severity,wand->exception->description),MagickPathExtent); + (void) ConcatenateMagickString(description,")",MagickPathExtent); } return(description); } @@ -1068,7 +1068,7 @@ WandExport MagickWand *NewMagickWand(void) GetExceptionMessage(errno)); (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); - (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",MagickWandId, + (void) FormatLocaleString(wand->name,MagickPathExtent,"%s-%.20g",MagickWandId, (double) wand->id); wand->images=NewImageList(); wand->image_info=AcquireImageInfo(); diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h index 6937b791a..611c12ebb 100644 --- a/MagickWand/method-attribute.h +++ b/MagickWand/method-attribute.h @@ -95,8 +95,14 @@ extern "C" { #endif #define WandSignature 0xabacadabUL -#if !defined(MaxTextExtent) -# define MaxTextExtent 8192 +#if !defined(MagickFormatExtent) +# define MagickFormatExtent 64 +#endif +#if !defined(MagickLocaleExtent) +# define MagickLocaleExtent 256 +#endif +#if !defined(MagickPathExtent) +# define MagickPathExtent 4096 #endif #if defined(MAGICKCORE_HAVE___ATTRIBUTE__) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 06891fbc6..1351e10fd 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -342,7 +342,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, ExceptionInfo *exception) { char - key[MaxTextExtent]; + key[MagickPathExtent]; ExceptionInfo *sans_exception; @@ -357,14 +357,14 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, Read an image into a image cache (for repeated usage) if not already in cache. Then return the image that is in the cache. */ - (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path); + (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",path); sans_exception=AcquireExceptionInfo(); image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception); sans_exception=DestroyExceptionInfo(sans_exception); if (image != (Image *) NULL) return(image); read_info=CloneImageInfo(image_info); - (void) CopyMagickString(read_info->filename,path,MaxTextExtent); + (void) CopyMagickString(read_info->filename,path,MagickPathExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) @@ -386,8 +386,8 @@ static MagickBooleanType MonitorProgress(const char *text, void *wand_unused(client_data)) { char - message[MaxTextExtent], - tag[MaxTextExtent]; + message[MagickPathExtent], + tag[MagickPathExtent]; const char *locale_message; @@ -397,11 +397,11 @@ static MagickBooleanType MonitorProgress(const char *text, if (extent < 2) return(MagickTrue); - (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) locale_message=tag; @@ -424,7 +424,7 @@ static Image *SparseColorOption(const Image *image, const MagickBooleanType color_from_image,ExceptionInfo *exception) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -804,7 +804,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, { char *text, - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; /* Annotate image. @@ -820,7 +820,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, break; (void) CloneString(&draw_info->text,text); text=DestroyString(text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+f%+f", geometry_info.xi,geometry_info.psi); (void) CloneString(&draw_info->geometry,geometry); draw_info->affine.sx=cos(DegreesToRadians( @@ -1360,7 +1360,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, { char *args, - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -1680,7 +1680,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, { char *arguments, - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -1987,7 +1987,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if (LocaleCompare("level-colors",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -2211,7 +2211,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if (LocaleCompare("morphology",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -2453,7 +2453,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, profile_info=CloneImageInfo(mogrify_info); (void) CopyMagickString(profile_info->filename,argv[i+1], - MaxTextExtent); + MagickPathExtent); profile=FileToStringInfo(profile_info->filename,~0UL,exception); if (profile != (StringInfo *) NULL) { @@ -3820,7 +3820,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, if (IsCommandOption(option) == MagickFalse) { char - backup_filename[MaxTextExtent], + backup_filename[MagickPathExtent], *filename; Image @@ -3840,11 +3840,11 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, continue; if (format != (char *) NULL) (void) CopyMagickString(images->filename,images->magick_filename, - MaxTextExtent); + MagickPathExtent); if (path != (char *) NULL) { GetPathComponent(option,TailPath,filename); - (void) FormatLocaleString(images->filename,MaxTextExtent,"%s%c%s", + (void) FormatLocaleString(images->filename,MagickPathExtent,"%s%c%s", path,*DirectorySeparator,filename); } if (format != (char *) NULL) @@ -3871,10 +3871,10 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, Rename image file as backup. */ (void) CopyMagickString(backup_filename,image->filename, - MaxTextExtent); + MagickPathExtent); for (i=0; i < 6; i++) { - (void) ConcatenateMagickString(backup_filename,"~",MaxTextExtent); + (void) ConcatenateMagickString(backup_filename,"~",MagickPathExtent); if (IsPathAccessible(backup_filename) == MagickFalse) break; } @@ -4793,7 +4793,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, } if (LocaleCompare("format",option+1) == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); (void) CloneString(&format,(char *) NULL); if (*option == '+') break; @@ -4801,9 +4801,9 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, if (i == (ssize_t) argc) ThrowMogrifyException(OptionError,"MissingArgument",option); (void) CloneString(&format,argv[i]); - (void) CopyMagickString(image_info->filename,format,MaxTextExtent); + (void) CopyMagickString(image_info->filename,format,MagickPathExtent); (void) ConcatenateMagickString(image_info->filename,":", - MaxTextExtent); + MagickPathExtent); (void) SetImageInfo(image_info,0,exception); if (*image_info->magick == '\0') ThrowMogrifyException(OptionError,"UnrecognizedImageFormat", @@ -5338,7 +5338,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, if (LocaleCompare("morphology",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; KernelInfo *kernel_info; @@ -7120,7 +7120,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, { char *canonical_page, - page[MaxTextExtent]; + page[MagickPathExtent]; const char *image_option; @@ -7144,10 +7144,10 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, canonical_page=GetPageGeometry(argv[i+1]); flags=ParseAbsoluteGeometry(canonical_page,&geometry); canonical_page=DestroyString(canonical_page); - (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu", + (void) FormatLocaleString(page,MagickPathExtent,"%lux%lu", (unsigned long) geometry.width,(unsigned long) geometry.height); if (((flags & XValue) != 0) || ((flags & YValue) != 0)) - (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu%+ld%+ld", + (void) FormatLocaleString(page,MagickPathExtent,"%lux%lu%+ld%+ld", (unsigned long) geometry.width,(unsigned long) geometry.height, (long) geometry.x,(long) geometry.y); (void) SetImageOption(image_info,option+1,page); @@ -8336,7 +8336,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, { char *args, - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -8447,8 +8447,8 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, */ length=strlen(argv[i+1]); token=(char *) NULL; - if (~length >= (MaxTextExtent-1)) - token=(char *) AcquireQuantumMemory(length+MaxTextExtent, + if (~length >= (MagickPathExtent-1)) + token=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*token)); if (token == (char *) NULL) break; @@ -8562,7 +8562,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, if (LocaleCompare("write",option+1) == 0) { char - key[MaxTextExtent]; + key[MagickPathExtent]; Image *write_images; @@ -8571,7 +8571,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, *write_info; (void) SyncImagesSettings(mogrify_info,*images,exception); - (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",argv[i+1]); + (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",argv[i+1]); (void) DeleteImageRegistry(key); write_images=(*images); if (*option == '+') diff --git a/MagickWand/montage.c b/MagickWand/montage.c index 83ee68cfe..52d3b0d24 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -409,7 +409,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, else { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; /* Form filename for multi-part images. @@ -417,7 +417,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, (void) InterpretImageFilename(image_info,(Image *) NULL, image_info->filename,(int) scene,filename,exception); if (LocaleCompare(filename,image_info->filename) == 0) - (void) FormatLocaleString(filename,MaxTextExtent,"%s.%.20g", + (void) FormatLocaleString(filename,MagickPathExtent,"%s.%.20g", image_info->filename,(double) scene); images=ReadImages(image_info,filename,exception); } @@ -538,7 +538,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, { if (k == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); montage_info->border_width=0; } if (*option == '+') @@ -979,7 +979,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, { if (k == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); (void) CloneString(&montage_info->frame,(char *) NULL); } if (*option == '+') @@ -1215,7 +1215,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, MontageMode mode; - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); if (*option == '+') break; i++; @@ -1470,7 +1470,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, { if (k == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); montage_info->shadow=(*option == '-') ? MagickTrue : MagickFalse; break; @@ -1580,7 +1580,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, { if (k == 0) { - (void) CopyMagickString(argv[i]+1,"sans",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"sans",MagickPathExtent); (void) CloneString(&montage_info->tile,(char *) NULL); } if (*option == '+') @@ -1779,7 +1779,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, FinalizeImageSettings(image_info,image,MagickTrue); if (image == (Image *) NULL) ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]); - (void) CopyMagickString(montage_info->filename,argv[argc-1],MaxTextExtent); + (void) CopyMagickString(montage_info->filename,argv[argc-1],MagickPathExtent); montage_image=MontageImageList(image_info,montage_info,image,exception); if (montage_image == (Image *) NULL) status=MagickFalse; @@ -1788,12 +1788,12 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, /* Write image. */ - (void) CopyMagickString(image_info->filename,argv[argc-1],MaxTextExtent); + (void) CopyMagickString(image_info->filename,argv[argc-1],MagickPathExtent); (void) CopyMagickString(montage_image->magick_filename,argv[argc-1], - MaxTextExtent); + MagickPathExtent); if (*montage_image->magick == '\0') (void) CopyMagickString(montage_image->magick,image->magick, - MaxTextExtent); + MagickPathExtent); status&=WriteImages(image_info,montage_image,argv[argc-1],exception); if (metadata != (char **) NULL) { diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 3f03263fe..1cd1945ca 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -92,8 +92,8 @@ static MagickBooleanType MonitorProgress(const char *text, void *wand_unused(cli_wandent_data)) { char - message[MaxTextExtent], - tag[MaxTextExtent]; + message[MagickPathExtent], + tag[MagickPathExtent]; const char *locale_message; @@ -103,11 +103,11 @@ static MagickBooleanType MonitorProgress(const char *text, if (extent < 2) return(MagickTrue); - (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) locale_message=tag; @@ -133,7 +133,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, ExceptionInfo *exception) { char - key[MaxTextExtent]; + key[MagickPathExtent]; ExceptionInfo *sans_exception; @@ -144,7 +144,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, ImageInfo *read_info; - (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path); + (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",path); sans_exception=AcquireExceptionInfo(); image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception); sans_exception=DestroyExceptionInfo(sans_exception); @@ -152,7 +152,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, return(image); read_info=CloneImageInfo(image_info); if (path != (const char *) NULL) - (void) CopyMagickString(read_info->filename,path,MaxTextExtent); + (void) CopyMagickString(read_info->filename,path,MagickPathExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) @@ -174,7 +174,7 @@ static Image *SparseColorOption(const Image *image, const SparseColorMethod method,const char *arguments,ExceptionInfo *exception) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -1160,7 +1160,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, */ char *canonical_page, - page[MaxTextExtent]; + page[MagickPathExtent]; const char *image_option; @@ -1184,10 +1184,10 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, canonical_page=GetPageGeometry(arg1); flags=ParseAbsoluteGeometry(canonical_page,&geometry); canonical_page=DestroyString(canonical_page); - (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu", + (void) FormatLocaleString(page,MagickPathExtent,"%lux%lu", (unsigned long) geometry.width,(unsigned long) geometry.height); if (((flags & XValue) != 0) || ((flags & YValue) != 0)) - (void) FormatLocaleString(page,MaxTextExtent,"%lux%lu%+ld%+ld", + (void) FormatLocaleString(page,MagickPathExtent,"%lux%lu%+ld%+ld", (unsigned long) geometry.width,(unsigned long) geometry.height, (long) geometry.x,(long) geometry.y); (void) SetImageOption(_image_info,option+1,page); @@ -1787,7 +1787,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if (LocaleCompare("annotate",option+1) == 0) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; SetGeometryInfo(&geometry_info); flags=ParseGeometry(arg1,&geometry_info); @@ -1796,7 +1796,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; (void) CloneString(&_draw_info->text,arg2); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+f%+f", geometry_info.xi,geometry_info.psi); (void) CloneString(&_draw_info->geometry,geometry); _draw_info->affine.sx=cos(DegreesToRadians( @@ -2646,7 +2646,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if (LocaleCompare("level-colors",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -2813,7 +2813,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if (LocaleCompare("morphology",option+1) == 0) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -3017,7 +3017,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, profile_info=CloneImageInfo(_image_info); (void) CopyMagickString(profile_info->filename,arg1, - MaxTextExtent); + MagickPathExtent); profile=FileToStringInfo(profile_info->filename,~0UL,_exception); if (profile != (StringInfo *) NULL) { @@ -4261,8 +4261,8 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, assert(arg1 != (const char *) NULL); length=strlen(arg1); token=(char *) NULL; - if (~length >= (MaxTextExtent-1)) - token=(char *) AcquireQuantumMemory(length+MaxTextExtent, + if (~length >= (MagickPathExtent-1)) + token=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*token)); if (token == (char *) NULL) break; @@ -4355,20 +4355,20 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, if ( new_images != (Image *) NULL ) { char - result[MaxTextExtent]; + result[MagickPathExtent]; - (void) FormatLocaleString(result,MaxTextExtent,"%lf",similarity); + (void) FormatLocaleString(result,MagickPathExtent,"%lf",similarity); (void) SetImageProperty(new_images,"subimage:similarity",result, _exception); - (void) FormatLocaleString(result,MaxTextExtent,"%+ld", + (void) FormatLocaleString(result,MagickPathExtent,"%+ld", (long) offset.x); (void) SetImageProperty(new_images,"subimage:x",result, _exception); - (void) FormatLocaleString(result,MaxTextExtent,"%+ld", + (void) FormatLocaleString(result,MagickPathExtent,"%+ld", (long) offset.y); (void) SetImageProperty(new_images,"subimage:y",result, _exception); - (void) FormatLocaleString(result,MaxTextExtent,"%lux%lu%+ld%+ld", + (void) FormatLocaleString(result,MagickPathExtent,"%lux%lu%+ld%+ld", (unsigned long) offset.width,(unsigned long) offset.height, (long) offset.x,(long) offset.y); (void) SetImageProperty(new_images,"subimage:offset",result, @@ -4604,7 +4604,7 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, if (LocaleCompare("write",option+1) == 0) { /* Note: arguments do not have percent escapes expanded */ char - key[MaxTextExtent]; + key[MagickPathExtent]; Image *write_images; @@ -4619,7 +4619,7 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, CLIWandExceptArgBreak(OptionError,"NoImagesForWrite",option,arg1); } - (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",arg1); + (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",arg1); (void) DeleteImageRegistry(key); write_images=_images; if (IfPlusOp) diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c index 1eb9fb63f..d47127672 100644 --- a/MagickWand/pixel-iterator.c +++ b/MagickWand/pixel-iterator.c @@ -67,7 +67,7 @@ struct _PixelIterator id; char - name[MaxTextExtent]; + name[MagickPathExtent]; ExceptionInfo *exception; @@ -168,7 +168,7 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator) iterator->name); (void) ResetMagickMemory(clone_iterator,0,sizeof(*clone_iterator)); clone_iterator->id=AcquireWandId(); - (void) FormatLocaleString(clone_iterator->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(clone_iterator->name,MagickPathExtent,"%s-%.20g", PixelIteratorId,(double) clone_iterator->id); clone_iterator->exception=AcquireExceptionInfo(); InheritException(clone_iterator->exception,iterator->exception); @@ -322,7 +322,7 @@ WandExport PixelIterator *NewPixelIterator(MagickWand *wand) GetExceptionMessage(errno)); (void) ResetMagickMemory(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); - (void) FormatLocaleString(iterator->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(iterator->name,MagickPathExtent,"%s-%.20g", PixelIteratorId,(double) iterator->id); iterator->exception=exception; iterator->view=view; @@ -441,7 +441,7 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand, wand->name); (void) ResetMagickMemory(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); - (void) FormatLocaleString(iterator->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(iterator->name,MagickPathExtent,"%s-%.20g", PixelIteratorId,(double) iterator->id); iterator->exception=exception; iterator->view=view; @@ -553,7 +553,7 @@ WandExport char *PixelGetIteratorException(const PixelIterator *iterator, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name); assert(severity != (ExceptionType *) NULL); *severity=iterator->exception->severity; - description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent, + description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent, sizeof(*description)); if (description == (char *) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", @@ -561,14 +561,14 @@ WandExport char *PixelGetIteratorException(const PixelIterator *iterator, *description='\0'; if (iterator->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( - iterator->exception->severity,iterator->exception->reason),MaxTextExtent); + iterator->exception->severity,iterator->exception->reason),MagickPathExtent); if (iterator->exception->description != (char *) NULL) { - (void) ConcatenateMagickString(description," (",MaxTextExtent); + (void) ConcatenateMagickString(description," (",MagickPathExtent); (void) ConcatenateMagickString(description,GetLocaleExceptionMessage( iterator->exception->severity,iterator->exception->description), - MaxTextExtent); - (void) ConcatenateMagickString(description,")",MaxTextExtent); + MagickPathExtent); + (void) ConcatenateMagickString(description,")",MagickPathExtent); } return(description); } diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index b5fc8eabe..6a0c47b93 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -66,7 +66,7 @@ struct _PixelWand id; char - name[MaxTextExtent]; + name[MagickPathExtent]; ExceptionInfo *exception; @@ -154,7 +154,7 @@ WandExport PixelWand *ClonePixelWand(const PixelWand *wand) wand->name); (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); - (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(clone_wand->name,MagickPathExtent,"%s-%.20g", PixelWandId,(double) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); @@ -406,7 +406,7 @@ WandExport PixelWand *NewPixelWand(void) GetExceptionMessage(errno)); (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); - (void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",PixelWandId, + (void) FormatLocaleString(wand->name,MagickPathExtent,"%s-%.20g",PixelWandId, (double) wand->id); wand->exception=AcquireExceptionInfo(); GetPixelInfo((Image *) NULL,&wand->pixel); @@ -741,21 +741,21 @@ WandExport char *PixelGetColorAsString(const PixelWand *wand) WandExport char *PixelGetColorAsNormalizedString(const PixelWand *wand) { char - color[2*MaxTextExtent]; + color[2*MagickPathExtent]; assert(wand != (const PixelWand *) NULL); assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatLocaleString(color,MaxTextExtent,"%g,%g,%g", + (void) FormatLocaleString(color,MagickPathExtent,"%g,%g,%g", (double) (QuantumScale*wand->pixel.red), (double) (QuantumScale*wand->pixel.green), (double) (QuantumScale*wand->pixel.blue)); if (wand->pixel.colorspace == CMYKColorspace) - (void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g", + (void) FormatLocaleString(color+strlen(color),MagickPathExtent,",%g", (double) (QuantumScale*wand->pixel.black)); if (wand->pixel.alpha_trait != UndefinedPixelTrait) - (void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g", + (void) FormatLocaleString(color+strlen(color),MagickPathExtent,",%g", (double) (QuantumScale*wand->pixel.alpha)); return(ConstantString(color)); } @@ -890,7 +890,7 @@ WandExport char *PixelGetException(const PixelWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); assert(severity != (ExceptionType *) NULL); *severity=wand->exception->severity; - description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent, + description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent, sizeof(*description)); if (description == (char *) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", @@ -898,13 +898,13 @@ WandExport char *PixelGetException(const PixelWand *wand, *description='\0'; if (wand->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( - wand->exception->severity,wand->exception->reason),MaxTextExtent); + wand->exception->severity,wand->exception->reason),MagickPathExtent); if (wand->exception->description != (char *) NULL) { - (void) ConcatenateMagickString(description," (",MaxTextExtent); + (void) ConcatenateMagickString(description," (",MagickPathExtent); (void) ConcatenateMagickString(description,GetLocaleExceptionMessage( - wand->exception->severity,wand->exception->description),MaxTextExtent); - (void) ConcatenateMagickString(description,")",MaxTextExtent); + wand->exception->severity,wand->exception->description),MagickPathExtent); + (void) ConcatenateMagickString(description,")",MagickPathExtent); } return(description); } diff --git a/MagickWand/script-token.c b/MagickWand/script-token.c index c841bc475..9da504904 100644 --- a/MagickWand/script-token.c +++ b/MagickWand/script-token.c @@ -337,8 +337,8 @@ WandExport ScriptTokenInfo * DestroyScriptTokenInfo(ScriptTokenInfo *token_info) #define SaveChar(c) \ { \ if ((size_t) offset >= (token_info->length-1)) { \ - if ( token_info->length >= MaxTextExtent ) \ - token_info->length += MaxTextExtent; \ + if ( token_info->length >= MagickPathExtent ) \ + token_info->length += MagickPathExtent; \ else \ token_info->length *= 4; \ token_info->token = (char *) \ diff --git a/MagickWand/script-token.h b/MagickWand/script-token.h index 606253aa0..b0b894ef0 100644 --- a/MagickWand/script-token.h +++ b/MagickWand/script-token.h @@ -31,7 +31,7 @@ typedef enum { TokenStatusMemoryFailed } TokenStatus; -/* Initial length is MaxTextExtent/64 => 64 (divisor is a power of 4) +/* Initial length is MagickPathExtent/64 => 64 (divisor is a power of 4) most tokens are never larger than this, so no need to waste memory! Also no CLI option is larger than about 40 characters! */ diff --git a/MagickWand/stream.c b/MagickWand/stream.c index b9e18dcdb..579d5d65a 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -291,7 +291,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, filename=argv[i]; if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1))) filename=argv[++i]; - (void) CopyMagickString(image_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(image_info->filename,filename,MagickPathExtent); images=StreamImage(image_info,stream_info,exception); status&=(images != (Image *) NULL) && (exception->severity < ErrorException); @@ -580,7 +580,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, { if (LocaleCompare("map",option+1) == 0) { - (void) CopyMagickString(argv[i]+1,"san",MaxTextExtent); + (void) CopyMagickString(argv[i]+1,"san",MagickPathExtent); if (*option == '+') break; i++; diff --git a/MagickWand/tests/script-token-test.c b/MagickWand/tests/script-token-test.c index 0f4d371cf..489b6cf15 100644 --- a/MagickWand/tests/script-token-test.c +++ b/MagickWand/tests/script-token-test.c @@ -58,7 +58,7 @@ #include /* Defines to replace MagickWand / MagickCore defintions */ -#define MaxTextExtent 4096 +#define MagickPathExtent 4096 #define MagickFalse 0 #define MagickTrue 1 #define MagickBooleanType int diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index c163313b6..4b4530984 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -65,7 +65,7 @@ struct _WandView id; char - name[MaxTextExtent], + name[MagickPathExtent], *description; RectangleInfo @@ -133,7 +133,7 @@ WandExport WandView *CloneWandView(const WandView *wand_view) wand_view->name); (void) ResetMagickMemory(clone_view,0,sizeof(*clone_view)); clone_view->id=AcquireWandId(); - (void) FormatLocaleString(clone_view->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(clone_view->name,MagickPathExtent,"%s-%.20g", WandViewId,(double) clone_view->id); clone_view->description=ConstantString(wand_view->description); clone_view->image=CloneImage(wand_view->image,0,0,MagickTrue, @@ -422,7 +422,7 @@ WandExport char *GetWandViewException(const WandView *wand_view, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand_view->name); assert(severity != (ExceptionType *) NULL); *severity=wand_view->exception->severity; - description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent, + description=(char *) AcquireQuantumMemory(2UL*MagickPathExtent, sizeof(*description)); if (description == (char *) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", @@ -431,14 +431,14 @@ WandExport char *GetWandViewException(const WandView *wand_view, if (wand_view->exception->reason != (char *) NULL) (void) CopyMagickString(description,GetLocaleExceptionMessage( wand_view->exception->severity,wand_view->exception->reason), - MaxTextExtent); + MagickPathExtent); if (wand_view->exception->description != (char *) NULL) { - (void) ConcatenateMagickString(description," (",MaxTextExtent); + (void) ConcatenateMagickString(description," (",MagickPathExtent); (void) ConcatenateMagickString(description,GetLocaleExceptionMessage( wand_view->exception->severity,wand_view->exception->description), - MaxTextExtent); - (void) ConcatenateMagickString(description,")",MaxTextExtent); + MagickPathExtent); + (void) ConcatenateMagickString(description,")",MagickPathExtent); } return(description); } @@ -756,7 +756,7 @@ WandExport WandView *NewWandView(MagickWand *wand) GetExceptionMessage(errno)); (void) ResetMagickMemory(wand_view,0,sizeof(*wand_view)); wand_view->id=AcquireWandId(); - (void) FormatLocaleString(wand_view->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(wand_view->name,MagickPathExtent,"%s-%.20g", WandViewId,(double) wand_view->id); wand_view->description=ConstantString("WandView"); wand_view->wand=wand; @@ -818,7 +818,7 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x, GetExceptionMessage(errno)); (void) ResetMagickMemory(wand_view,0,sizeof(*wand_view)); wand_view->id=AcquireWandId(); - (void) FormatLocaleString(wand_view->name,MaxTextExtent,"%s-%.20g", + (void) FormatLocaleString(wand_view->name,MagickPathExtent,"%s-%.20g", WandViewId,(double) wand_view->id); wand_view->description=ConstantString("WandView"); exception=AcquireExceptionInfo(); diff --git a/MagickWand/wandcli.c b/MagickWand/wandcli.c index b312e110f..94b60a5d3 100644 --- a/MagickWand/wandcli.c +++ b/MagickWand/wandcli.c @@ -97,7 +97,7 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info, However some parts may be given fro man external source! */ cli_wand->wand.id=AcquireWandId(); - (void) FormatLocaleString(cli_wand->wand.name,MaxTextExtent, + (void) FormatLocaleString(cli_wand->wand.name,MagickPathExtent, "%s-%.20g","MagickWandCLI", (double) cli_wand->wand.id); cli_wand->wand.images=NewImageList(); if ( image_info == (ImageInfo *) NULL) @@ -273,7 +273,7 @@ WandExport MagickBooleanType CLILogEvent(MagickCLI *cli_wand, const size_t line,const char *format,...) { char - new_format[MaxTextExtent]; + new_format[MagickPathExtent]; MagickBooleanType status; @@ -286,10 +286,10 @@ WandExport MagickBooleanType CLILogEvent(MagickCLI *cli_wand, list, but that does not appear to be possible! So we do some pre-formating of the location info here. */ - (void) FormatLocaleString(new_format,MaxTextExtent,cli_wand->location, + (void) FormatLocaleString(new_format,MagickPathExtent,cli_wand->location, cli_wand->filename, cli_wand->line, cli_wand->column); - (void) ConcatenateMagickString(new_format," ",MaxTextExtent); - (void) ConcatenateMagickString(new_format,format,MaxTextExtent); + (void) ConcatenateMagickString(new_format," ",MagickPathExtent); + (void) ConcatenateMagickString(new_format,format,MagickPathExtent); va_start(operands,format); status=LogMagickEventList(type,module,function,line,new_format,operands); @@ -318,7 +318,7 @@ WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand, const ExceptionType severity,const char *tag,const char *format,...) { char - new_format[MaxTextExtent]; + new_format[MagickPathExtent]; size_t len; @@ -334,11 +334,11 @@ WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand, list, but that does not appear to be possible! So we do some pre-formating of the location info here. */ - (void) CopyMagickString(new_format,format,MaxTextExtent); - (void) ConcatenateMagickString(new_format," ",MaxTextExtent); + (void) CopyMagickString(new_format,format,MagickPathExtent); + (void) ConcatenateMagickString(new_format," ",MagickPathExtent); len=strlen(new_format); - (void) FormatLocaleString(new_format+len,MaxTextExtent-len,cli_wand->location, + (void) FormatLocaleString(new_format+len,MagickPathExtent-len,cli_wand->location, cli_wand->filename, cli_wand->line, cli_wand->column); va_start(operands,format); diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 165a7f95e..6ab79f49b 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -113,11 +113,11 @@ extern "C" { #define InheritPerlException(exception,perl_exception) \ { \ char \ - message[MaxTextExtent]; \ + message[MagickPathExtent]; \ \ if ((exception)->severity != UndefinedException) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"Exception %d: %s%s%s%s",\ + (void) FormatLocaleString(message,MagickPathExtent,"Exception %d: %s%s%s%s",\ (exception)->severity, (exception)->reason ? \ GetLocaleExceptionMessage((exception)->severity,(exception)->reason) : \ "Unknown", (exception)->description ? " (" : "", \ @@ -986,7 +986,7 @@ static struct PackageInfo *GetPackageInfo(pTHX_ void *reference, struct PackageInfo *package_info,ExceptionInfo *exception) { char - message[MaxTextExtent]; + message[MagickPathExtent]; struct PackageInfo *clone_info; @@ -994,7 +994,7 @@ static struct PackageInfo *GetPackageInfo(pTHX_ void *reference, SV *sv; - (void) FormatLocaleString(message,MaxTextExtent,"%s::package%s%p", + (void) FormatLocaleString(message,MagickPathExtent,"%s::package%s%p", PackageName,XS_VERSION,reference); sv=perl_get_sv(message,(TRUE | 0x02)); if (sv == (SV *) NULL) @@ -1469,10 +1469,10 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, { if (info) (void) CopyMagickString(info->image_info->filename,SvPV(sval,na), - MaxTextExtent); + MagickPathExtent); for ( ; image; image=image->next) (void) CopyMagickString(image->filename,SvPV(sval,na), - MaxTextExtent); + MagickPathExtent); break; } if (LocaleCompare(attribute,"file") == 0) @@ -1668,10 +1668,10 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, if (LocaleCompare(attribute,"magick") == 0) { if (info) - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, "%s:",SvPV(sval,na)); for ( ; image; image=image->next) - (void) CopyMagickString(image->magick,SvPV(sval,na),MaxTextExtent); + (void) CopyMagickString(image->magick,SvPV(sval,na),MagickPathExtent); break; } if (LocaleCompare(attribute,"map-limit") == 0) @@ -2675,11 +2675,11 @@ Average(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "average-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "average-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -2876,7 +2876,7 @@ ChannelFx(ref,...) char *attribute, - expression[MaxTextExtent]; + expression[MagickPathExtent]; ChannelType channel, @@ -2934,9 +2934,9 @@ ChannelFx(ref,...) Get options. */ channel=DefaultChannels; - (void) CopyMagickString(expression,"u",MaxTextExtent); + (void) CopyMagickString(expression,"u",MagickPathExtent); if (items == 2) - (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MaxTextExtent); + (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MagickPathExtent); else for (i=2; i < items; i+=2) { @@ -2971,7 +2971,7 @@ ChannelFx(ref,...) if (LocaleCompare(attribute,"expression") == 0) { (void) CopyMagickString(expression,SvPV(ST(i),na), - MaxTextExtent); + MagickPathExtent); break; } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", @@ -3565,11 +3565,11 @@ ComplexImages(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "complex-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "complex-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -3749,7 +3749,7 @@ DESTROY(ref) case SVt_PVAV: { char - message[MaxTextExtent]; + message[MagickPathExtent]; const SV *key; @@ -3769,7 +3769,7 @@ DESTROY(ref) /* Array (AV *) reference */ - (void) FormatLocaleString(message,MaxTextExtent,"package%s%p", + (void) FormatLocaleString(message,MagickPathExtent,"package%s%p", XS_VERSION,reference); hv=gv_stashpv(PackageName, FALSE); if (!hv) @@ -4022,11 +4022,11 @@ EvaluateImages(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "evaluate-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "evaluate-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -4064,46 +4064,46 @@ Features(ref,...) { #define ChannelFeatures(channel,direction) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].angular_second_moment[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].contrast[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].contrast[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].variance_sum_of_squares[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].inverse_difference_moment[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_average[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_variance[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].difference_variance[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].difference_entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].measure_of_correlation_1[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].measure_of_correlation_2[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].maximum_correlation_coefficient[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ } @@ -4113,7 +4113,7 @@ Features(ref,...) char *attribute, - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelFeatures *channel_features; @@ -4333,11 +4333,11 @@ Flatten(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "flatten-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "flatten-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -4378,7 +4378,7 @@ Fx(ref,...) char *attribute, - expression[MaxTextExtent]; + expression[MagickPathExtent]; ChannelType channel, @@ -4436,9 +4436,9 @@ Fx(ref,...) Get options. */ channel=DefaultChannels; - (void) CopyMagickString(expression,"u",MaxTextExtent); + (void) CopyMagickString(expression,"u",MagickPathExtent); if (items == 2) - (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MaxTextExtent); + (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MagickPathExtent); else for (i=2; i < items; i+=2) { @@ -4473,7 +4473,7 @@ Fx(ref,...) if (LocaleCompare(attribute,"expression") == 0) { (void) CopyMagickString(expression,SvPV(ST(i),na), - MaxTextExtent); + MagickPathExtent); break; } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", @@ -4540,7 +4540,7 @@ Get(ref,...) { char *attribute, - color[MaxTextExtent]; + color[MagickPathExtent]; const char *value; @@ -4645,7 +4645,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->background_color.red, (double) image->background_color.green, (double) image->background_color.blue, @@ -4693,7 +4693,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.blue_primary.x, image->chromaticity.blue_primary.y); s=newSVpv(color,0); @@ -4704,7 +4704,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->border_color.red, (double) image->border_color.green, (double) image->border_color.blue, @@ -4716,7 +4716,7 @@ Get(ref,...) if (LocaleCompare(attribute,"bounding-box") == 0) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; RectangleInfo page; @@ -4724,7 +4724,7 @@ Get(ref,...) if (image == (Image *) NULL) break; page=GetImageBoundingBox(image,exception); - (void) FormatLocaleString(geometry,MaxTextExtent, + (void) FormatLocaleString(geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) page.width,(double) page.height,(double) page.x,(double) page.y); s=newSVpv(geometry,0); @@ -4839,7 +4839,7 @@ Get(ref,...) (void) items; if (j > (ssize_t) image->colors) j%=image->colors; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->colormap[j].red, (double) image->colormap[j].green, (double) image->colormap[j].blue, @@ -4882,11 +4882,11 @@ Get(ref,...) if (LocaleCompare(attribute,"density") == 0) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; if (image == (Image *) NULL) break; - (void) FormatLocaleString(geometry,MaxTextExtent,"%.15gx%.15g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.15gx%.15g", image->resolution.x,image->resolution.y); s=newSVpv(geometry,0); PUSHs(s ? sv_2mortal(s) : &sv_undef); @@ -5078,7 +5078,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.green_primary.x, image->chromaticity.green_primary.y); s=newSVpv(color,0); @@ -5141,7 +5141,7 @@ Get(ref,...) if (image != (Image *) NULL) { char - key[MaxTextExtent]; + key[MagickPathExtent]; MagickBooleanType status; @@ -5149,7 +5149,7 @@ Get(ref,...) static ssize_t id = 0; - (void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(key,MagickPathExtent,"%.20g\n",(double) id); status=SetImageRegistry(ImageRegistryType,key,image, exception); @@ -5162,7 +5162,7 @@ Get(ref,...) if (LocaleNCompare(attribute,"index",5) == 0) { char - name[MaxTextExtent]; + name[MagickPathExtent]; int items; @@ -5189,7 +5189,7 @@ Get(ref,...) p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception); if (p != (const Quantum *) NULL) { - (void) FormatLocaleString(name,MaxTextExtent,QuantumFormat, + (void) FormatLocaleString(name,MagickPathExtent,QuantumFormat, GetPixelIndex(image,p)); s=newSVpv(name,0); PUSHs(s ? sv_2mortal(s) : &sv_undef); @@ -5312,7 +5312,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->matte_color.red, (double) image->matte_color.green, (double) image->matte_color.blue, @@ -5400,9 +5400,9 @@ Get(ref,...) if (image != (Image *) NULL) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; - (void) FormatLocaleString(geometry,MaxTextExtent, + (void) FormatLocaleString(geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width, (double) image->page.height,(double) image->page.x,(double) image->page.y); @@ -5428,7 +5428,7 @@ Get(ref,...) if (LocaleNCompare(attribute,"pixel",5) == 0) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; int items; @@ -5448,12 +5448,12 @@ Get(ref,...) (void) items; p=GetVirtualPixels(image,x,y,1,1,exception); if (image->colorspace != CMYKColorspace) - (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat "," + (void) FormatLocaleString(tuple,MagickPathExtent,QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat, GetPixelRed(image,p),GetPixelGreen(image,p), GetPixelBlue(image,p),GetPixelAlpha(image,p)); else - (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat "," + (void) FormatLocaleString(tuple,MagickPathExtent,QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat,GetPixelRed(image,p),GetPixelGreen(image,p), GetPixelBlue(image,p),GetPixelBlack(image,p), @@ -5521,7 +5521,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.red_primary.x, image->chromaticity.red_primary.y); s=newSVpv(color,0); @@ -5624,7 +5624,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->transparent_color.red, (double) image->transparent_color.green, (double) image->transparent_color.blue, @@ -5725,7 +5725,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.white_point.x, image->chromaticity.white_point.y); s=newSVpv(color,0); @@ -6283,7 +6283,7 @@ Histogram(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; PixelInfo *histogram; @@ -6341,25 +6341,25 @@ Histogram(ref,...) EXTEND(sp,6*count); for (i=0; i < (ssize_t) number_colors; i++) { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].red); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].green); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].blue); PUSHs(sv_2mortal(newSVpv(message,0))); if (image->colorspace == CMYKColorspace) { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].black); PUSHs(sv_2mortal(newSVpv(message,0))); } - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].alpha); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) histogram[i].count); PUSHs(sv_2mortal(newSVpv(message,0))); } @@ -6840,7 +6840,7 @@ ImageToBlob(ref,...) PPCODE: { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; ExceptionInfo *exception; @@ -6892,11 +6892,11 @@ ImageToBlob(ref,...) for (i=2; i < items; i+=2) SetAttribute(aTHX_ package_info,image,SvPV(ST(i-1),na),ST(i),exception); (void) CopyMagickString(filename,package_info->image_info->filename, - MaxTextExtent); + MagickPathExtent); scene=0; for (next=image; next; next=next->next) { - (void) CopyMagickString(next->filename,filename,MaxTextExtent); + (void) CopyMagickString(next->filename,filename,MagickPathExtent); next->scene=scene++; } SetImageInfo(package_info->image_info,(unsigned int) @@ -7559,7 +7559,7 @@ Mogrify(ref,...) char attribute_flag[MaxArguments], - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelType channel, @@ -7733,7 +7733,7 @@ Mogrify(ref,...) { if (SvTYPE(sv) != SVt_RV) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",pp->method); ThrowPerlException(exception,OptionError,message,SvPV(sv,na)); goto continue_outer_loop; @@ -7793,7 +7793,7 @@ Mogrify(ref,...) al->integer_reference=ParseChannelOption(SvPV(sv,na)); if ((al->integer_reference < 0) && ((al->integer_reference=SvIV(sv)) <= 0)) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",pp->method); ThrowPerlException(exception,OptionError,message,SvPV(sv,na)); goto continue_outer_loop; @@ -7821,7 +7821,7 @@ Mogrify(ref,...) { default: { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) ix); + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) ix); ThrowPerlException(exception,OptionError, "UnrecognizedPerlMagickMethod",message); goto PerlException; @@ -8465,9 +8465,9 @@ Mogrify(ref,...) if ((attribute_flag[9] != 0) || (attribute_flag[10] != 0)) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; - (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+f%+f", (double) argument_list[9].real_reference+draw_info->affine.tx, (double) argument_list[10].real_reference+draw_info->affine.ty); (void) CloneString(&draw_info->geometry,geometry); @@ -8561,7 +8561,7 @@ Mogrify(ref,...) case 35: /* Composite */ { char - composite_geometry[MaxTextExtent]; + composite_geometry[MagickPathExtent]; Image *composite_image, @@ -8750,7 +8750,7 @@ Mogrify(ref,...) /* Composite two images (normal composition). */ - (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); @@ -9062,7 +9062,7 @@ Mogrify(ref,...) argument_list[4].real_reference=1.0; if (attribute_flag[0] == 0) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "%.15g,%.15g,%.15g",(double) argument_list[2].real_reference, (double) argument_list[3].real_reference, (double) argument_list[4].real_reference); @@ -9139,7 +9139,7 @@ Mogrify(ref,...) case 43: /* Modulate */ { char - modulate[MaxTextExtent]; + modulate[MagickPathExtent]; geometry_info.rho=100.0; geometry_info.sigma=100.0; @@ -9171,7 +9171,7 @@ Mogrify(ref,...) geometry_info.rho=argument_list[6].real_reference; SetImageArtifact(image,"modulate:colorspace","HWB"); } - (void) FormatLocaleString(modulate,MaxTextExtent,"%.15g,%.15g,%.15g", + (void) FormatLocaleString(modulate,MagickPathExtent,"%.15g,%.15g,%.15g", geometry_info.rho,geometry_info.sigma,geometry_info.xi); (void) ModulateImage(image,modulate,exception); break; @@ -11892,7 +11892,7 @@ Mosaic(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); (void) CopyMagickString(info->image_info->filename,image->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -12072,7 +12072,7 @@ Ping(ref,...) for (i=0; i < n; i++) { (void) CopyMagickString(package_info->image_info->filename,list[i], - MaxTextExtent); + MagickPathExtent); image=PingImage(package_info->image_info,exception); if (image == (Image *) NULL) break; @@ -12319,7 +12319,7 @@ QueryColorname(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; @@ -12392,7 +12392,7 @@ QueryFont(ref,...) { char *name, - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; @@ -12460,7 +12460,7 @@ QueryFont(ref,...) else PUSHs(sv_2mortal(newSVpv(CommandOptionToMnemonic(MagickStretchOptions, type_info->stretch),0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) type_info->weight); PUSHs(sv_2mortal(newSVpv(message,0))); if (type_info->encoding == (char *) NULL) @@ -12869,7 +12869,7 @@ QueryFontMetrics(ref,...) if (draw_info->geometry == (char *) NULL) { draw_info->geometry=AcquireString((char *) NULL); - (void) FormatLocaleString(draw_info->geometry,MaxTextExtent, + (void) FormatLocaleString(draw_info->geometry,MagickPathExtent, "%.15g,%.15g",x,y); } status=GetTypeMetrics(image,draw_info,&metrics,exception); @@ -13242,7 +13242,7 @@ QueryMultilineFontMetrics(ref,...) if (draw_info->geometry == (char *) NULL) { draw_info->geometry=AcquireString((char *) NULL); - (void) FormatLocaleString(draw_info->geometry,MaxTextExtent, + (void) FormatLocaleString(draw_info->geometry,MagickPathExtent, "%.15g,%.15g",x,y); } status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); @@ -13316,7 +13316,7 @@ QueryFormat(ref,...) if (items == 1) { char - format[MaxTextExtent]; + format[MagickPathExtent]; const MagickInfo **format_list; @@ -13328,7 +13328,7 @@ QueryFormat(ref,...) EXTEND(sp,types); for (i=0; i < (ssize_t) types; i++) { - (void) CopyMagickString(format,format_list[i]->name,MaxTextExtent); + (void) CopyMagickString(format,format_list[i]->name,MagickPathExtent); LocaleLower(format); PUSHs(sv_2mortal(newSVpv(format,0))); } @@ -13869,9 +13869,9 @@ SetPixel(ref,...) if (SvTYPE(ST(i)) != SVt_RV) { char - message[MaxTextExtent]; + message[MagickPathExtent]; - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",attribute); ThrowPerlException(exception,OptionError,message, SvPV(ST(i),na)); @@ -14186,28 +14186,28 @@ Statistics(ref,...) { #define ChannelStatistics(channel) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \ (double) channel_statistics[channel].depth); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].minima/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].maxima/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].mean/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].standard_deviation/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].kurtosis); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].skewness); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].entropy); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ } @@ -14216,7 +14216,7 @@ Statistics(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelStatistics *channel_statistics; @@ -14524,7 +14524,7 @@ Write(ref,...) PPCODE: { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; ExceptionInfo *exception; @@ -14577,11 +14577,11 @@ Write(ref,...) SetAttribute(aTHX_ package_info,image,SvPV(ST(i-1),na),ST(i), exception); (void) CopyMagickString(filename,package_info->image_info->filename, - MaxTextExtent); + MagickPathExtent); scene=0; for (next=image; next; next=next->next) { - (void) CopyMagickString(next->filename,filename,MaxTextExtent); + (void) CopyMagickString(next->filename,filename,MagickPathExtent); next->scene=scene++; } *package_info->image_info->magick='\0'; diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in index a87f09a71..57cee8c0f 100644 --- a/PerlMagick/quantum/quantum.xs.in +++ b/PerlMagick/quantum/quantum.xs.in @@ -113,11 +113,11 @@ extern "C" { #define InheritPerlException(exception,perl_exception) \ { \ char \ - message[MaxTextExtent]; \ + message[MagickPathExtent]; \ \ if ((exception)->severity != UndefinedException) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"Exception %d: %s%s%s%s",\ + (void) FormatLocaleString(message,MagickPathExtent,"Exception %d: %s%s%s%s",\ (exception)->severity, (exception)->reason ? \ GetLocaleExceptionMessage((exception)->severity,(exception)->reason) : \ "Unknown", (exception)->description ? " (" : "", \ @@ -986,7 +986,7 @@ static struct PackageInfo *GetPackageInfo(pTHX_ void *reference, struct PackageInfo *package_info,ExceptionInfo *exception) { char - message[MaxTextExtent]; + message[MagickPathExtent]; struct PackageInfo *clone_info; @@ -994,7 +994,7 @@ static struct PackageInfo *GetPackageInfo(pTHX_ void *reference, SV *sv; - (void) FormatLocaleString(message,MaxTextExtent,"%s::package%s%p", + (void) FormatLocaleString(message,MagickPathExtent,"%s::package%s%p", PackageName,XS_VERSION,reference); sv=perl_get_sv(message,(TRUE | 0x02)); if (sv == (SV *) NULL) @@ -1469,10 +1469,10 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, { if (info) (void) CopyMagickString(info->image_info->filename,SvPV(sval,na), - MaxTextExtent); + MagickPathExtent); for ( ; image; image=image->next) (void) CopyMagickString(image->filename,SvPV(sval,na), - MaxTextExtent); + MagickPathExtent); break; } if (LocaleCompare(attribute,"file") == 0) @@ -1668,10 +1668,10 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, if (LocaleCompare(attribute,"magick") == 0) { if (info) - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, "%s:",SvPV(sval,na)); for ( ; image; image=image->next) - (void) CopyMagickString(image->magick,SvPV(sval,na),MaxTextExtent); + (void) CopyMagickString(image->magick,SvPV(sval,na),MagickPathExtent); break; } if (LocaleCompare(attribute,"map-limit") == 0) @@ -2675,11 +2675,11 @@ Average(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "average-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "average-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -2876,7 +2876,7 @@ ChannelFx(ref,...) char *attribute, - expression[MaxTextExtent]; + expression[MagickPathExtent]; ChannelType channel, @@ -2934,9 +2934,9 @@ ChannelFx(ref,...) Get options. */ channel=DefaultChannels; - (void) CopyMagickString(expression,"u",MaxTextExtent); + (void) CopyMagickString(expression,"u",MagickPathExtent); if (items == 2) - (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MaxTextExtent); + (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MagickPathExtent); else for (i=2; i < items; i+=2) { @@ -2971,7 +2971,7 @@ ChannelFx(ref,...) if (LocaleCompare(attribute,"expression") == 0) { (void) CopyMagickString(expression,SvPV(ST(i),na), - MaxTextExtent); + MagickPathExtent); break; } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", @@ -3565,11 +3565,11 @@ ComplexImages(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "complex-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "complex-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -3749,7 +3749,7 @@ DESTROY(ref) case SVt_PVAV: { char - message[MaxTextExtent]; + message[MagickPathExtent]; const SV *key; @@ -3769,7 +3769,7 @@ DESTROY(ref) /* Array (AV *) reference */ - (void) FormatLocaleString(message,MaxTextExtent,"package%s%p", + (void) FormatLocaleString(message,MagickPathExtent,"package%s%p", XS_VERSION,reference); hv=gv_stashpv(PackageName, FALSE); if (!hv) @@ -4022,11 +4022,11 @@ EvaluateImages(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "evaluate-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "evaluate-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -4064,46 +4064,46 @@ Features(ref,...) { #define ChannelFeatures(channel,direction) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].angular_second_moment[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].contrast[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].contrast[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].variance_sum_of_squares[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].inverse_difference_moment[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_average[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_variance[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].sum_entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].difference_variance[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].difference_entropy[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].measure_of_correlation_1[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].measure_of_correlation_2[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_features[channel].maximum_correlation_coefficient[direction]); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ } @@ -4113,7 +4113,7 @@ Features(ref,...) char *attribute, - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelFeatures *channel_features; @@ -4333,11 +4333,11 @@ Flatten(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); info=GetPackageInfo(aTHX_ (void *) av,info,exception); - (void) FormatLocaleString(info->image_info->filename,MaxTextExtent, - "flatten-%.*s",(int) (MaxTextExtent-9), + (void) FormatLocaleString(info->image_info->filename,MagickPathExtent, + "flatten-%.*s",(int) (MagickPathExtent-9), ((p=strrchr(image->filename,'/')) ? p+1 : image->filename)); (void) CopyMagickString(image->filename,info->image_info->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -4378,7 +4378,7 @@ Fx(ref,...) char *attribute, - expression[MaxTextExtent]; + expression[MagickPathExtent]; ChannelType channel, @@ -4436,9 +4436,9 @@ Fx(ref,...) Get options. */ channel=DefaultChannels; - (void) CopyMagickString(expression,"u",MaxTextExtent); + (void) CopyMagickString(expression,"u",MagickPathExtent); if (items == 2) - (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MaxTextExtent); + (void) CopyMagickString(expression,(char *) SvPV(ST(1),na),MagickPathExtent); else for (i=2; i < items; i+=2) { @@ -4473,7 +4473,7 @@ Fx(ref,...) if (LocaleCompare(attribute,"expression") == 0) { (void) CopyMagickString(expression,SvPV(ST(i),na), - MaxTextExtent); + MagickPathExtent); break; } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", @@ -4540,7 +4540,7 @@ Get(ref,...) { char *attribute, - color[MaxTextExtent]; + color[MagickPathExtent]; const char *value; @@ -4645,7 +4645,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->background_color.red, (double) image->background_color.green, (double) image->background_color.blue, @@ -4693,7 +4693,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.blue_primary.x, image->chromaticity.blue_primary.y); s=newSVpv(color,0); @@ -4704,7 +4704,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->border_color.red, (double) image->border_color.green, (double) image->border_color.blue, @@ -4716,7 +4716,7 @@ Get(ref,...) if (LocaleCompare(attribute,"bounding-box") == 0) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; RectangleInfo page; @@ -4724,7 +4724,7 @@ Get(ref,...) if (image == (Image *) NULL) break; page=GetImageBoundingBox(image,exception); - (void) FormatLocaleString(geometry,MaxTextExtent, + (void) FormatLocaleString(geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) page.width,(double) page.height,(double) page.x,(double) page.y); s=newSVpv(geometry,0); @@ -4839,7 +4839,7 @@ Get(ref,...) (void) items; if (j > (ssize_t) image->colors) j%=image->colors; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->colormap[j].red, (double) image->colormap[j].green, (double) image->colormap[j].blue, @@ -4882,11 +4882,11 @@ Get(ref,...) if (LocaleCompare(attribute,"density") == 0) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; if (image == (Image *) NULL) break; - (void) FormatLocaleString(geometry,MaxTextExtent,"%.15gx%.15g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.15gx%.15g", image->resolution.x,image->resolution.y); s=newSVpv(geometry,0); PUSHs(s ? sv_2mortal(s) : &sv_undef); @@ -5078,7 +5078,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.green_primary.x, image->chromaticity.green_primary.y); s=newSVpv(color,0); @@ -5141,7 +5141,7 @@ Get(ref,...) if (image != (Image *) NULL) { char - key[MaxTextExtent]; + key[MagickPathExtent]; MagickBooleanType status; @@ -5149,7 +5149,7 @@ Get(ref,...) static ssize_t id = 0; - (void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(key,MagickPathExtent,"%.20g\n",(double) id); status=SetImageRegistry(ImageRegistryType,key,image, exception); @@ -5162,7 +5162,7 @@ Get(ref,...) if (LocaleNCompare(attribute,"index",5) == 0) { char - name[MaxTextExtent]; + name[MagickPathExtent]; int items; @@ -5189,7 +5189,7 @@ Get(ref,...) p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception); if (p != (const Quantum *) NULL) { - (void) FormatLocaleString(name,MaxTextExtent,QuantumFormat, + (void) FormatLocaleString(name,MagickPathExtent,QuantumFormat, GetPixelIndex(image,p)); s=newSVpv(name,0); PUSHs(s ? sv_2mortal(s) : &sv_undef); @@ -5312,7 +5312,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->matte_color.red, (double) image->matte_color.green, (double) image->matte_color.blue, @@ -5400,9 +5400,9 @@ Get(ref,...) if (image != (Image *) NULL) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; - (void) FormatLocaleString(geometry,MaxTextExtent, + (void) FormatLocaleString(geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width, (double) image->page.height,(double) image->page.x,(double) image->page.y); @@ -5428,7 +5428,7 @@ Get(ref,...) if (LocaleNCompare(attribute,"pixel",5) == 0) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; int items; @@ -5448,12 +5448,12 @@ Get(ref,...) (void) items; p=GetVirtualPixels(image,x,y,1,1,exception); if (image->colorspace != CMYKColorspace) - (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat "," + (void) FormatLocaleString(tuple,MagickPathExtent,QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat, GetPixelRed(image,p),GetPixelGreen(image,p), GetPixelBlue(image,p),GetPixelAlpha(image,p)); else - (void) FormatLocaleString(tuple,MaxTextExtent,QuantumFormat "," + (void) FormatLocaleString(tuple,MagickPathExtent,QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat "," QuantumFormat,GetPixelRed(image,p),GetPixelGreen(image,p), GetPixelBlue(image,p),GetPixelBlack(image,p), @@ -5521,7 +5521,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.red_primary.x, image->chromaticity.red_primary.y); s=newSVpv(color,0); @@ -5624,7 +5624,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent, + (void) FormatLocaleString(color,MagickPathExtent, "%.20g,%.20g,%.20g,%.20g",(double) image->transparent_color.red, (double) image->transparent_color.green, (double) image->transparent_color.blue, @@ -5725,7 +5725,7 @@ Get(ref,...) { if (image == (Image *) NULL) break; - (void) FormatLocaleString(color,MaxTextExtent,"%.15g,%.15g", + (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g", image->chromaticity.white_point.x, image->chromaticity.white_point.y); s=newSVpv(color,0); @@ -6283,7 +6283,7 @@ Histogram(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; PixelInfo *histogram; @@ -6341,25 +6341,25 @@ Histogram(ref,...) EXTEND(sp,6*count); for (i=0; i < (ssize_t) number_colors; i++) { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].red); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].green); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].blue); PUSHs(sv_2mortal(newSVpv(message,0))); if (image->colorspace == CMYKColorspace) { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].black); PUSHs(sv_2mortal(newSVpv(message,0))); } - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", histogram[i].alpha); PUSHs(sv_2mortal(newSVpv(message,0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) histogram[i].count); PUSHs(sv_2mortal(newSVpv(message,0))); } @@ -6840,7 +6840,7 @@ ImageToBlob(ref,...) PPCODE: { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; ExceptionInfo *exception; @@ -6892,11 +6892,11 @@ ImageToBlob(ref,...) for (i=2; i < items; i+=2) SetAttribute(aTHX_ package_info,image,SvPV(ST(i-1),na),ST(i),exception); (void) CopyMagickString(filename,package_info->image_info->filename, - MaxTextExtent); + MagickPathExtent); scene=0; for (next=image; next; next=next->next) { - (void) CopyMagickString(next->filename,filename,MaxTextExtent); + (void) CopyMagickString(next->filename,filename,MagickPathExtent); next->scene=scene++; } SetImageInfo(package_info->image_info,(unsigned int) @@ -7559,7 +7559,7 @@ Mogrify(ref,...) char attribute_flag[MaxArguments], - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelType channel, @@ -7733,7 +7733,7 @@ Mogrify(ref,...) { if (SvTYPE(sv) != SVt_RV) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",pp->method); ThrowPerlException(exception,OptionError,message,SvPV(sv,na)); goto continue_outer_loop; @@ -7793,7 +7793,7 @@ Mogrify(ref,...) al->integer_reference=ParseChannelOption(SvPV(sv,na)); if ((al->integer_reference < 0) && ((al->integer_reference=SvIV(sv)) <= 0)) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",pp->method); ThrowPerlException(exception,OptionError,message,SvPV(sv,na)); goto continue_outer_loop; @@ -7821,7 +7821,7 @@ Mogrify(ref,...) { default: { - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) ix); + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) ix); ThrowPerlException(exception,OptionError, "UnrecognizedPerlMagickMethod",message); goto PerlException; @@ -8465,9 +8465,9 @@ Mogrify(ref,...) if ((attribute_flag[9] != 0) || (attribute_flag[10] != 0)) { char - geometry[MaxTextExtent]; + geometry[MagickPathExtent]; - (void) FormatLocaleString(geometry,MaxTextExtent,"%+f%+f", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+f%+f", (double) argument_list[9].real_reference+draw_info->affine.tx, (double) argument_list[10].real_reference+draw_info->affine.ty); (void) CloneString(&draw_info->geometry,geometry); @@ -8561,7 +8561,7 @@ Mogrify(ref,...) case 35: /* Composite */ { char - composite_geometry[MaxTextExtent]; + composite_geometry[MagickPathExtent]; Image *composite_image, @@ -8750,7 +8750,7 @@ Mogrify(ref,...) /* Composite two images (normal composition). */ - (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); @@ -9062,7 +9062,7 @@ Mogrify(ref,...) argument_list[4].real_reference=1.0; if (attribute_flag[0] == 0) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "%.15g,%.15g,%.15g",(double) argument_list[2].real_reference, (double) argument_list[3].real_reference, (double) argument_list[4].real_reference); @@ -9139,7 +9139,7 @@ Mogrify(ref,...) case 43: /* Modulate */ { char - modulate[MaxTextExtent]; + modulate[MagickPathExtent]; geometry_info.rho=100.0; geometry_info.sigma=100.0; @@ -9171,7 +9171,7 @@ Mogrify(ref,...) geometry_info.rho=argument_list[6].real_reference; SetImageArtifact(image,"modulate:colorspace","HWB"); } - (void) FormatLocaleString(modulate,MaxTextExtent,"%.15g,%.15g,%.15g", + (void) FormatLocaleString(modulate,MagickPathExtent,"%.15g,%.15g,%.15g", geometry_info.rho,geometry_info.sigma,geometry_info.xi); (void) ModulateImage(image,modulate,exception); break; @@ -11890,7 +11890,7 @@ Mosaic(ref) av_push(av,sv_bless(rv,hv)); SvREFCNT_dec(sv); (void) CopyMagickString(info->image_info->filename,image->filename, - MaxTextExtent); + MagickPathExtent); SetImageInfo(info->image_info,0,exception); exception=DestroyExceptionInfo(exception); SvREFCNT_dec(perl_exception); @@ -12070,7 +12070,7 @@ Ping(ref,...) for (i=0; i < n; i++) { (void) CopyMagickString(package_info->image_info->filename,list[i], - MaxTextExtent); + MagickPathExtent); image=PingImage(package_info->image_info,exception); if (image == (Image *) NULL) break; @@ -12317,7 +12317,7 @@ QueryColorname(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; @@ -12390,7 +12390,7 @@ QueryFont(ref,...) { char *name, - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; @@ -12458,7 +12458,7 @@ QueryFont(ref,...) else PUSHs(sv_2mortal(newSVpv(CommandOptionToMnemonic(MagickStretchOptions, type_info->stretch),0))); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) type_info->weight); PUSHs(sv_2mortal(newSVpv(message,0))); if (type_info->encoding == (char *) NULL) @@ -12867,7 +12867,7 @@ QueryFontMetrics(ref,...) if (draw_info->geometry == (char *) NULL) { draw_info->geometry=AcquireString((char *) NULL); - (void) FormatLocaleString(draw_info->geometry,MaxTextExtent, + (void) FormatLocaleString(draw_info->geometry,MagickPathExtent, "%.15g,%.15g",x,y); } status=GetTypeMetrics(image,draw_info,&metrics,exception); @@ -13240,7 +13240,7 @@ QueryMultilineFontMetrics(ref,...) if (draw_info->geometry == (char *) NULL) { draw_info->geometry=AcquireString((char *) NULL); - (void) FormatLocaleString(draw_info->geometry,MaxTextExtent, + (void) FormatLocaleString(draw_info->geometry,MagickPathExtent, "%.15g,%.15g",x,y); } status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); @@ -13314,7 +13314,7 @@ QueryFormat(ref,...) if (items == 1) { char - format[MaxTextExtent]; + format[MagickPathExtent]; const MagickInfo **format_list; @@ -13326,7 +13326,7 @@ QueryFormat(ref,...) EXTEND(sp,types); for (i=0; i < (ssize_t) types; i++) { - (void) CopyMagickString(format,format_list[i]->name,MaxTextExtent); + (void) CopyMagickString(format,format_list[i]->name,MagickPathExtent); LocaleLower(format); PUSHs(sv_2mortal(newSVpv(format,0))); } @@ -13867,9 +13867,9 @@ SetPixel(ref,...) if (SvTYPE(ST(i)) != SVt_RV) { char - message[MaxTextExtent]; + message[MagickPathExtent]; - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",attribute); ThrowPerlException(exception,OptionError,message, SvPV(ST(i),na)); @@ -14184,28 +14184,28 @@ Statistics(ref,...) { #define ChannelStatistics(channel) \ { \ - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \ (double) channel_statistics[channel].depth); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].minima/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].maxima/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].mean/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].standard_deviation/scale); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].kurtosis); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].skewness); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ - (void) FormatLocaleString(message,MaxTextExtent,"%.15g", \ + (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \ channel_statistics[channel].entropy); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ } @@ -14214,7 +14214,7 @@ Statistics(ref,...) *av; char - message[MaxTextExtent]; + message[MagickPathExtent]; ChannelStatistics *channel_statistics; @@ -14522,7 +14522,7 @@ Write(ref,...) PPCODE: { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; ExceptionInfo *exception; @@ -14575,11 +14575,11 @@ Write(ref,...) SetAttribute(aTHX_ package_info,image,SvPV(ST(i-1),na),ST(i), exception); (void) CopyMagickString(filename,package_info->image_info->filename, - MaxTextExtent); + MagickPathExtent); scene=0; for (next=image; next; next=next->next) { - (void) CopyMagickString(next->filename,filename,MaxTextExtent); + (void) CopyMagickString(next->filename,filename,MagickPathExtent); next->scene=scene++; } *package_info->image_info->magick='\0'; diff --git a/coders/bgr.c b/coders/bgr.c index 7ed112b40..1c7a14012 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -1329,7 +1329,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, } if (image_info->interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); @@ -1452,7 +1452,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, } (void) CloseBlob(image); (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); diff --git a/coders/bmp.c b/coders/bmp.c index f555c1465..2569e094f 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -601,7 +601,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) /* OS/2 BMP image file. */ - (void) CopyMagickString(image->magick,"BMP2",MaxTextExtent); + (void) CopyMagickString(image->magick,"BMP2",MagickPathExtent); bmp_info.width=(ssize_t) ((short) ReadBlobLSBShort(image)); bmp_info.height=(ssize_t) ((short) ReadBlobLSBShort(image)); bmp_info.planes=ReadBlobLSBShort(image); @@ -758,7 +758,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) bmp_info.gamma_scale.z)/3.0; } else - (void) CopyMagickString(image->magick,"BMP3",MaxTextExtent); + (void) CopyMagickString(image->magick,"BMP3",MagickPathExtent); if (bmp_info.size > 108) { diff --git a/coders/braille.c b/coders/braille.c index 2ceabe19b..7212811cf 100644 --- a/coders/braille.c +++ b/coders/braille.c @@ -168,7 +168,7 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; const char *value; @@ -221,25 +221,25 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, value=GetImageProperty(image,"label",exception); if (value != (const char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent,"Title: %s\n", value); + (void) FormatLocaleString(buffer,MagickPathExtent,"Title: %s\n", value); (void) WriteBlobString(image,buffer); } if (image->page.x != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"X: %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"X: %.20g\n",(double) image->page.x); (void) WriteBlobString(image,buffer); } if (image->page.y != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"Y: %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"Y: %.20g\n",(double) image->page.y); (void) WriteBlobString(image,buffer); } - (void) FormatLocaleString(buffer,MaxTextExtent,"Width: %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"Width: %.20g\n",(double) (image->columns+(image->columns % 2))); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"Height: %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"Height: %.20g\n",(double) image->rows); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"\n"); diff --git a/coders/cals.c b/coders/cals.c index 550c96075..f5392ad72 100644 --- a/coders/cals.c +++ b/coders/cals.c @@ -144,9 +144,9 @@ static Image *ReadCALSImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - filename[MaxTextExtent], - header[MaxTextExtent], - message[MaxTextExtent]; + filename[MagickPathExtent], + header[MagickPathExtent], + message[MagickPathExtent]; FILE *file; @@ -263,21 +263,21 @@ static Image *ReadCALSImage(const ImageInfo *image_info, image=DestroyImage(image); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"group4:%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"group4:%s", filename); - (void) FormatLocaleString(message,MaxTextExtent,"%lux%lu",width,height); + (void) FormatLocaleString(message,MagickPathExtent,"%lux%lu",width,height); (void) CloneString(&read_info->size,message); - (void) FormatLocaleString(message,MaxTextExtent,"%lu",density); + (void) FormatLocaleString(message,MagickPathExtent,"%lu",density); (void) CloneString(&read_info->density,message); read_info->orientation=(OrientationType) orientation; image=ReadImage(read_info,exception); if (image != (Image *) NULL) { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); (void) CopyMagickString(image->magick_filename,image_info->filename, - MaxTextExtent); - (void) CopyMagickString(image->magick,"CALS",MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(image->magick,"CALS",MagickPathExtent); } read_info=DestroyImageInfo(read_info); (void) RelinquishUniqueFileResource(filename); @@ -552,8 +552,8 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info, Write CALS pixels. */ write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent); - (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent); + (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent); + (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent); group4_image=CloneImage(image,0,0,MagickTrue,exception); if (group4_image == (Image *) NULL) { diff --git a/coders/caption.c b/coders/caption.c index 4be097d13..9abb49257 100644 --- a/coders/caption.c +++ b/coders/caption.c @@ -95,7 +95,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, { char *caption, - geometry[MaxTextExtent], + geometry[MagickPathExtent], *property, *text; @@ -166,7 +166,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, exception); (void) CloneString(&draw_info->text,text); text=DestroyString(text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -182,7 +182,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, exception); (void) CloneString(&draw_info->text,text); text=DestroyString(text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -218,7 +218,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, exception); (void) CloneString(&draw_info->text,text); text=DestroyString(text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -244,7 +244,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, exception); (void) CloneString(&draw_info->text,text); text=DestroyString(text); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -272,7 +272,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, */ i=FormatMagickCaption(image,draw_info,split,&metrics,&caption,exception); (void) CloneString(&draw_info->text,caption); - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", draw_info->direction == RightToLeftDirection ? image->columns- metrics.bounds.x2 : -metrics.bounds.x1,draw_info->gravity == UndefinedGravity ? metrics.ascent : 0.0); @@ -281,9 +281,9 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, if (image_info->pointsize == 0.0) { char - pointsize[MaxTextExtent]; + pointsize[MagickPathExtent]; - (void) FormatLocaleString(pointsize,MaxTextExtent,"%.20g", + (void) FormatLocaleString(pointsize,MagickPathExtent,"%.20g", draw_info->pointsize); (void) SetImageProperty(image,"caption:pointsize",pointsize,exception); } diff --git a/coders/cin.c b/coders/cin.c index b2e094d69..3e2edbbba 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -382,7 +382,7 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) #define RGBColorType 3 char - property[MaxTextExtent]; + property[MagickPathExtent]; CINInfo cin; @@ -887,7 +887,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - timestamp[MaxTextExtent]; + timestamp[MagickPathExtent]; const char *value; @@ -989,7 +989,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, (void) memcpy(&local_time,localtime(&seconds),sizeof(local_time)); #endif (void) memset(timestamp,0,sizeof(timestamp)); - (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time); + (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time); (void) memset(cin.file.create_date,0,sizeof(cin.file.create_date)); (void) CopyMagickString(cin.file.create_date,timestamp,11); offset+=WriteBlob(image,sizeof(cin.file.create_date),(unsigned char *) @@ -1087,7 +1087,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, cin.origination.filename); seconds=time((time_t *) NULL); (void) memset(timestamp,0,sizeof(timestamp)); - (void) strftime(timestamp,MaxTextExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time); + (void) strftime(timestamp,MagickPathExtent,"%Y:%m:%d:%H:%M:%S%Z",&local_time); (void) memset(cin.origination.create_date,0, sizeof(cin.origination.create_date)); (void) CopyMagickString(cin.origination.create_date,timestamp,11); diff --git a/coders/cip.c b/coders/cip.c index 0badf22cd..c4fdd6780 100644 --- a/coders/cip.c +++ b/coders/cip.c @@ -161,7 +161,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; const char *value; @@ -199,30 +199,30 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"\n"); value=GetImageProperty(image,"label",exception); if (value != (const char *) NULL) - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",value); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",value); else { char - basename[MaxTextExtent]; + basename[MagickPathExtent]; GetPathComponent(image->filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n", basename); } (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g\n",(double) image->page.x); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g\n",(double) image->page.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n", (double) (image->columns+(image->columns % 2))); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n", (double) image->rows); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"2\n"); + (void) FormatLocaleString(buffer,MagickPathExtent,"2\n"); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,""); (void) TransformImageColorspace(image,sRGBColorspace,exception); @@ -238,7 +238,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+2))/QuantumRange) & 0x03) << 4) | (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+1))/QuantumRange) & 0x03) << 2) | (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+0))/QuantumRange) & 0x03) << 0)); - (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",byte); + (void) FormatLocaleString(buffer,MagickPathExtent,"%02x",byte); (void) WriteBlobString(image,buffer); p+=4; } @@ -250,7 +250,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,2)))/QuantumRange) & 0x03) << 4) | (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,1)))/QuantumRange) & 0x03) << 2) | (((size_t) (3*ClampToQuantum(GetPixelLuma(image,p+MagickMin(i,0)))/QuantumRange) & 0x03) << 0)); - (void) FormatLocaleString(buffer,MaxTextExtent,"%02x",~byte); + (void) FormatLocaleString(buffer,MagickPathExtent,"%02x",~byte); (void) WriteBlobString(image,buffer); } status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, diff --git a/coders/clip.c b/coders/clip.c index 59a3705c2..3931bcba8 100644 --- a/coders/clip.c +++ b/coders/clip.c @@ -108,7 +108,7 @@ static Image *ReadCLIPImage(const ImageInfo *image_info, assert(exception->signature == MagickSignature); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) @@ -232,11 +232,11 @@ static MagickBooleanType WriteCLIPImage(const ImageInfo *image_info, clip_image=GetImageMask(image,exception); if (clip_image == (Image *) NULL) return(MagickFalse); - (void) CopyMagickString(clip_image->filename,image->filename,MaxTextExtent); + (void) CopyMagickString(clip_image->filename,image->filename,MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"CLIP") == 0) - (void) FormatLocaleString(clip_image->filename,MaxTextExtent,"miff:%s", + (void) FormatLocaleString(clip_image->filename,MagickPathExtent,"miff:%s", write_info->filename); status=WriteImage(write_info,clip_image,exception); clip_image=DestroyImage(clip_image); diff --git a/coders/cmyk.c b/coders/cmyk.c index ee4f06341..824600990 100644 --- a/coders/cmyk.c +++ b/coders/cmyk.c @@ -1463,7 +1463,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } if (image_info->interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); @@ -1611,7 +1611,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } (void) CloseBlob(image); (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); diff --git a/coders/cut.c b/coders/cut.c index e7be764a0..af39e7531 100644 --- a/coders/cut.c +++ b/coders/cut.c @@ -399,11 +399,11 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception) } (void) CopyMagickString(clone_info->filename+i,".PAL",(size_t) - (MaxTextExtent-i)); + (MagickPathExtent-i)); if((clone_info->file=fopen_utf8(clone_info->filename,"rb"))==NULL) { (void) CopyMagickString(clone_info->filename+i,".pal",(size_t) - (MaxTextExtent-i)); + (MagickPathExtent-i)); if((clone_info->file=fopen_utf8(clone_info->filename,"rb"))==NULL) { clone_info->filename[i]='\0'; diff --git a/coders/dcm.c b/coders/dcm.c index fe65a80f7..f1b393240 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -2764,10 +2764,10 @@ static unsigned short ReadDCMShort(DCMStreamInfo *stream_info,Image *image) static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - explicit_vr[MaxTextExtent], - implicit_vr[MaxTextExtent], - magick[MaxTextExtent], - photometric[MaxTextExtent]; + explicit_vr[MagickPathExtent], + implicit_vr[MagickPathExtent], + magick[MagickPathExtent], + photometric[MagickPathExtent]; DCMStreamInfo *stream_info; @@ -2876,7 +2876,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Read DCM Medical image. */ - (void) CopyMagickString(photometric,"MONOCHROME1 ",MaxTextExtent); + (void) CopyMagickString(photometric,"MONOCHROME1 ",MagickPathExtent); bits_allocated=8; bytes_per_pixel=1; polarity=MagickFalse; @@ -2925,7 +2925,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; dicom_info[i].group < 0xffff; i++) if ((group == dicom_info[i].group) && (element == dicom_info[i].element)) break; - (void) CopyMagickString(implicit_vr,dicom_info[i].vr,MaxTextExtent); + (void) CopyMagickString(implicit_vr,dicom_info[i].vr,MagickPathExtent); count=ReadBlob(image,2,(unsigned char *) explicit_vr); if (count != 2) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); @@ -2939,7 +2939,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) use_explicit=((group == 0x0002) && (explicit_retry == MagickFalse)) || (explicit_file != MagickFalse) ? MagickTrue : MagickFalse; if ((use_explicit != MagickFalse) && (strncmp(implicit_vr,"xs",2) == 0)) - (void) CopyMagickString(implicit_vr,explicit_vr,MaxTextExtent); + (void) CopyMagickString(implicit_vr,explicit_vr,MagickPathExtent); if ((use_explicit == MagickFalse) || (strncmp(implicit_vr,"!!",2) == 0)) { offset=SeekBlob(image,(MagickOffsetType) -2,SEEK_CUR); @@ -3104,7 +3104,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) case 0x0010: { char - transfer_syntax[MaxTextExtent]; + transfer_syntax[MagickPathExtent]; /* Transfer Syntax. @@ -3123,7 +3123,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) *transfer_syntax='\0'; if (data != (unsigned char *) NULL) (void) CopyMagickString(transfer_syntax,(char *) data, - MaxTextExtent); + MagickPathExtent); if (image_info->verbose != MagickFalse) (void) FormatLocaleFile(stdout,"transfer_syntax=%s\n", (const char *) transfer_syntax); @@ -3193,7 +3193,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Photometric interpretation. */ - for (i=0; i < (ssize_t) MagickMin(length,MaxTextExtent-1); i++) + for (i=0; i < (ssize_t) MagickMin(length,MagickPathExtent-1); i++) photometric[i]=(char) data[i]; photometric[i]='\0'; polarity=LocaleCompare(photometric,"MONOCHROME1 ") == 0 ? @@ -3547,7 +3547,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) for (scene=0; scene < (ssize_t) number_scenes; scene++) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; const char *property; @@ -3593,10 +3593,10 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) fputc(c,file); } (void) fclose(file); - (void) FormatLocaleString(read_info->filename,MaxTextExtent, + (void) FormatLocaleString(read_info->filename,MagickPathExtent, "jpeg:%s",filename); if (image->compression == JPEG2000Compression) - (void) FormatLocaleString(read_info->filename,MaxTextExtent, + (void) FormatLocaleString(read_info->filename,MagickPathExtent, "j2k:%s",filename); jpeg_image=ReadImage(read_info,exception); if (jpeg_image != (Image *) NULL) diff --git a/coders/dds.c b/coders/dds.c index 83e562eab..663f52838 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -2683,7 +2683,7 @@ static void WriteDDSInfo(Image *image, const size_t pixelFormat, const size_t compression, const size_t mipmaps) { char - software[MaxTextExtent]; + software[MagickPathExtent]; register ssize_t i; @@ -2723,7 +2723,7 @@ static void WriteDDSInfo(Image *image, const size_t pixelFormat, (void) WriteBlobLSBLong(image,0x00); (void) WriteBlobLSBLong(image,(unsigned int) mipmaps+1); (void) ResetMagickMemory(software,0,sizeof(software)); - (void) CopyMagickString(software,"IMAGEMAGICK",MaxTextExtent); + (void) CopyMagickString(software,"IMAGEMAGICK",MagickPathExtent); (void) WriteBlob(image,44,(unsigned char *) software); (void) WriteBlobLSBLong(image,32); diff --git a/coders/debug.c b/coders/debug.c index 3c3bdb9de..48b12c659 100644 --- a/coders/debug.c +++ b/coders/debug.c @@ -165,9 +165,9 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - buffer[MaxTextExtent], - colorspace[MaxTextExtent], - tuple[MaxTextExtent]; + buffer[MagickPathExtent], + colorspace[MagickPathExtent], + tuple[MagickPathExtent]; ssize_t y; @@ -203,12 +203,12 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, do { (void) CopyMagickString(colorspace,CommandOptionToMnemonic( - MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent); + MagickColorspaceOptions,(ssize_t) image->colorspace),MagickPathExtent); LocaleLower(colorspace); image->depth=GetImageQuantumDepth(image,MagickTrue); if (image->alpha_trait != UndefinedPixelTrait) - (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) ConcatenateMagickString(colorspace,"a",MagickPathExtent); + (void) FormatLocaleString(buffer,MagickPathExtent, "# ImageMagick pixel debugging: %.20g,%.20g,%.20g,%s\n",(double) image->columns,(double) image->rows,(double) ((MagickOffsetType) GetQuantumRange(image->depth)),colorspace); @@ -221,29 +221,29 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, break; for (x=0; x < (ssize_t) image->columns; x++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g: ",(double) x,(double) y); (void) WriteBlobString(image,buffer); GetPixelInfoPixel(image,p,&pixel); - (void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ", + (void) FormatLocaleString(tuple,MagickPathExtent,"%.20g,%.20g,%.20g ", (double) pixel.red,(double) pixel.green,(double) pixel.blue); if (pixel.colorspace == CMYKColorspace) { char - black[MaxTextExtent]; + black[MagickPathExtent]; - (void) FormatLocaleString(black,MaxTextExtent,",%.20g ", + (void) FormatLocaleString(black,MagickPathExtent,",%.20g ", (double) pixel.black); - (void) ConcatenateMagickString(tuple,black,MaxTextExtent); + (void) ConcatenateMagickString(tuple,black,MagickPathExtent); } if (pixel.alpha_trait != UndefinedPixelTrait) { char - alpha[MaxTextExtent]; + alpha[MagickPathExtent]; - (void) FormatLocaleString(alpha,MaxTextExtent,",%.20g ", + (void) FormatLocaleString(alpha,MagickPathExtent,",%.20g ", (double) pixel.alpha); - (void) ConcatenateMagickString(tuple,alpha,MaxTextExtent); + (void) ConcatenateMagickString(tuple,alpha,MagickPathExtent); } (void) WriteBlobString(image,tuple); (void) WriteBlobString(image,"\n"); diff --git a/coders/djvu.c b/coders/djvu.c index e359ab3af..7720792d2 100644 --- a/coders/djvu.c +++ b/coders/djvu.c @@ -928,7 +928,7 @@ static Image *ReadDJVUImage(const ImageInfo *image_info, ModuleExport size_t RegisterDJVUImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; @@ -943,8 +943,8 @@ ModuleExport size_t RegisterDJVUImage(void) *version='\0'; #if defined(DJVU_LIBDJVU_VER_STRING) - (void) ConcatenateMagickString(version,"libdjvu ",MaxTextExtent); - (void) ConcatenateMagickString(version,DJVU_LIBDJVU_VER_STRING,MaxTextExtent); + (void) ConcatenateMagickString(version,"libdjvu ",MagickPathExtent); + (void) ConcatenateMagickString(version,DJVU_LIBDJVU_VER_STRING,MagickPathExtent); #endif entry=AcquireMagickInfo("DJVU","DJVU","Déjà vu"); #if defined(MAGICKCORE_DJVU_DELEGATE) diff --git a/coders/dng.c b/coders/dng.c index 8e8c41cbb..746806f58 100644 --- a/coders/dng.c +++ b/coders/dng.c @@ -131,14 +131,14 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) SetImageInfoBlob(read_info,(void *) NULL,0); (void) InvokeDelegate(read_info,image,"dng:decode",(char *) NULL,exception); image=DestroyImage(image); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.png", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.png", read_info->unique); sans_exception=AcquireExceptionInfo(); image=ReadImage(read_info,sans_exception); sans_exception=DestroyExceptionInfo(sans_exception); if (image == (Image *) NULL) { - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.ppm", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.ppm", read_info->unique); image=ReadImage(read_info,exception); } @@ -146,17 +146,17 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image != (Image *) NULL) { char - filename[MaxTextExtent], + filename[MagickPathExtent], *xml; ExceptionInfo *sans; - (void) CopyMagickString(image->magick,read_info->magick,MaxTextExtent); - (void) FormatLocaleString(filename,MaxTextExtent,"%s.ufraw", + (void) CopyMagickString(image->magick,read_info->magick,MagickPathExtent); + (void) FormatLocaleString(filename,MagickPathExtent,"%s.ufraw", read_info->unique); sans=AcquireExceptionInfo(); - xml=FileToString(filename,MaxTextExtent,sans); + xml=FileToString(filename,MagickPathExtent,sans); (void) RelinquishUniqueFileResource(filename); if (xml != (char *) NULL) { @@ -171,7 +171,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) { char *content, - property[MaxTextExtent]; + property[MagickPathExtent]; const char *tag; @@ -189,7 +189,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception) tag=GetXMLTreeTag(next); if (tag == (char *) NULL) tag="unknown"; - (void) FormatLocaleString(property,MaxTextExtent,"dng:%s",tag); + (void) FormatLocaleString(property,MagickPathExtent,"dng:%s",tag); content=ConstantString(GetXMLTreeContent(next)); StripString(content); if ((LocaleCompare(tag,"log") != 0) && diff --git a/coders/dot.c b/coders/dot.c index 30be265c5..d3aa8ea17 100644 --- a/coders/dot.c +++ b/coders/dot.c @@ -98,7 +98,7 @@ static GVC_t static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - command[MaxTextExtent]; + command[MagickPathExtent]; const char *option; @@ -131,9 +131,9 @@ static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception) return((Image *) NULL); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) CopyMagickString(read_info->magick,"SVG",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"SVG",MagickPathExtent); (void) AcquireUniqueFilename(read_info->filename); - (void) FormatLocaleString(command,MaxTextExtent,"-Tsvg -o%s %s", + (void) FormatLocaleString(command,MagickPathExtent,"-Tsvg -o%s %s", read_info->filename,image_info->filename); #if !defined(WITH_CGRAPH) graph=agread(GetBlobFileHandle(image)); diff --git a/coders/dpx.c b/coders/dpx.c index 218bfd995..64c26b249 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -640,7 +640,7 @@ static void TimeCodeToString(const size_t timestamp,char *code) shift=4*TimeFields; for (i=0; i <= TimeFields; i++) { - (void) FormatLocaleString(code,MaxTextExtent-strlen(code),"%x", + (void) FormatLocaleString(code,MagickPathExtent-strlen(code),"%x", (unsigned int) ((timestamp >> shift) & 0x0fU)); code++; if (((i % 2) != 0) && (i < TimeFields)) @@ -654,7 +654,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) { char magick[4], - value[MaxTextExtent]; + value[MagickPathExtent]; DPXInfo dpx; @@ -815,7 +815,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; i < 8; i++) { char - property[MaxTextExtent]; + property[MagickPathExtent]; dpx.image.image_element[i].data_sign=ReadBlobLong(image); offset+=4; @@ -831,7 +831,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) offset++; dpx.image.image_element[i].transfer_characteristic=(unsigned char) ReadBlobByte(image); - (void) FormatLocaleString(property,MaxTextExtent, + (void) FormatLocaleString(property,MagickPathExtent, "dpx:image.element[%lu].transfer-characteristic",(long) i); (void) FormatImageProperty(image,property,"%s", GetImageTransferCharacteristic((DPXTransferCharacteristic) diff --git a/coders/emf.c b/coders/emf.c index a5044a3a7..183bbce43 100644 --- a/coders/emf.c +++ b/coders/emf.c @@ -685,7 +685,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info, *p; wchar_t - fileName[MaxTextExtent]; + fileName[MagickPathExtent]; assert(image_info != (const ImageInfo *) NULL); assert(image_info->signature == MagickSignature); @@ -698,7 +698,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info, if (Gdiplus::GdiplusStartup(&token,&startup_input,NULL) != Gdiplus::Status::Ok) ThrowReaderException(CoderError, "GdiplusStartupFailed"); - MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,MaxTextExtent); + MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,MagickPathExtent); source=Gdiplus::Image::FromFile(fileName); if (source == (Gdiplus::Image *) NULL) { diff --git a/coders/ept.c b/coders/ept.c index 9bf8c4492..46e6abab1 100644 --- a/coders/ept.c +++ b/coders/ept.c @@ -230,20 +230,20 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) CloseBlob(image); image=DestroyImage(image); read_info=CloneImageInfo(image_info); - (void) CopyMagickString(read_info->magick,"EPS",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"EPS",MagickPathExtent); image=BlobToImage(read_info,ept_info.postscript,ept_info.postscript_length, exception); if (image == (Image *) NULL) { - (void) CopyMagickString(read_info->magick,"TIFF",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent); image=BlobToImage(read_info,ept_info.tiff,ept_info.tiff_length,exception); } read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); - (void) CopyMagickString(image->magick,"EPT",MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(image->magick,"EPT",MagickPathExtent); } ept_info.tiff=(unsigned char *) RelinquishMagickMemory(ept_info.tiff); ept_info.postscript=(unsigned char *) RelinquishMagickMemory( @@ -364,7 +364,7 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; EPTInfo ept_info; @@ -396,11 +396,11 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image, if (write_image == (Image *) NULL) return(MagickFalse); write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->magick,"EPS",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"EPS",MagickPathExtent); if (LocaleCompare(image_info->magick,"EPT2") == 0) - (void) CopyMagickString(write_info->magick,"EPS2",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"EPS2",MagickPathExtent); if (LocaleCompare(image_info->magick,"EPT3") == 0) - (void) CopyMagickString(write_info->magick,"EPS3",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"EPS3",MagickPathExtent); (void) ResetMagickMemory(&ept_info,0,sizeof(ept_info)); ept_info.magick=0xc6d3d0c5ul; ept_info.postscript=(unsigned char *) ImageToBlob(write_info,write_image, @@ -414,10 +414,10 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image, return(MagickFalse); write_info=CloneImageInfo(image_info); *write_info->magick='\0'; - (void) CopyMagickString(write_info->magick,"TIFF",MaxTextExtent); - (void) FormatLocaleString(filename,MaxTextExtent,"tiff:%s", + (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent); + (void) FormatLocaleString(filename,MagickPathExtent,"tiff:%s", write_info->filename); - (void) CopyMagickString(write_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(write_info->filename,filename,MagickPathExtent); (void) TransformImage(&write_image,(char *) NULL,"512x512>",exception); if ((write_image->storage_class == DirectClass) || (write_image->colors > 256)) diff --git a/coders/fax.c b/coders/fax.c index 9700cfe11..9edd24bbd 100644 --- a/coders/fax.c +++ b/coders/fax.c @@ -323,7 +323,7 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->magick,"FAX",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"FAX",MagickPathExtent); scene=0; do { diff --git a/coders/fits.c b/coders/fits.c index 2e7033239..8caf8589e 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -248,7 +248,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info, char *comment, keyword[9], - property[MaxTextExtent], + property[MagickPathExtent], value[73]; double @@ -384,7 +384,7 @@ static Image *ReadFITSImage(const ImageInfo *image_info, else fits_info.endian=LSBEndian; } - (void) FormatLocaleString(property,MaxTextExtent,"fits:%s",keyword); + (void) FormatLocaleString(property,MagickPathExtent,"fits:%s",keyword); (void) SetImageProperty(image,property,p,exception); } c=0; diff --git a/coders/fpx.c b/coders/fpx.c index 0526b9c69..40a4061d9 100644 --- a/coders/fpx.c +++ b/coders/fpx.c @@ -270,9 +270,9 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception) Note image label. */ label=(char *) NULL; - if (~summary_info.title.length >= (MaxTextExtent-1)) + if (~summary_info.title.length >= (MagickPathExtent-1)) label=(char *) AcquireQuantumMemory(summary_info.title.length+ - MaxTextExtent,sizeof(*label)); + MagickPathExtent,sizeof(*label)); if (label == (char *) NULL) { FPX_ClearSystem(); @@ -294,9 +294,9 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception) Note image comment. */ comments=(char *) NULL; - if (~summary_info.comments.length >= (MaxTextExtent-1)) + if (~summary_info.comments.length >= (MagickPathExtent-1)) comments=(char *) AcquireQuantumMemory(summary_info.comments.length+ - MaxTextExtent,sizeof(*comments)); + MagickPathExtent,sizeof(*comments)); if (comments == (char *) NULL) { FPX_ClearSystem(); @@ -905,13 +905,13 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image, summary_info.title_valid=MagickTrue; length=strlen(label); summary_info.title.length=length; - if (~length >= (MaxTextExtent-1)) + if (~length >= (MagickPathExtent-1)) summary_info.title.ptr=(unsigned char *) AcquireQuantumMemory( - length+MaxTextExtent,sizeof(*summary_info.title.ptr)); + length+MagickPathExtent,sizeof(*summary_info.title.ptr)); if (summary_info.title.ptr == (unsigned char *) NULL) ThrowWriterException(DelegateError,"UnableToSetImageTitle"); (void) CopyMagickString((char *) summary_info.title.ptr,label, - MaxTextExtent); + MagickPathExtent); } comment=GetImageProperty(image,"comment",exception); if (comment != (const char *) NULL) diff --git a/coders/gif.c b/coders/gif.c index 9af80a739..d0cab312c 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -981,7 +981,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) c, flag, *global_colormap, - header[MaxTextExtent], + header[MagickPathExtent], magick[12]; /* @@ -1115,7 +1115,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) else { char - name[MaxTextExtent]; + name[MagickPathExtent]; int block_length, @@ -1732,7 +1732,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, if ((image->gamma != 1.0f/2.2f)) { char - attributes[MaxTextExtent]; + attributes[MagickPathExtent]; ssize_t count; @@ -1746,7 +1746,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, (void) WriteBlobByte(image,(unsigned char) 0xff); (void) WriteBlobByte(image,(unsigned char) 0x0b); (void) WriteBlob(image,11,(unsigned char *) "ImageMagick"); - count=FormatLocaleString(attributes,MaxTextExtent,"gamma=%g", + count=FormatLocaleString(attributes,MagickPathExtent,"gamma=%g", image->gamma); (void) WriteBlobByte(image,(unsigned char) count); (void) WriteBlob(image,(size_t) count,(unsigned char *) attributes); @@ -1821,7 +1821,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, else { char - extension[MaxTextExtent]; + extension[MagickPathExtent]; /* Write generic extension. diff --git a/coders/gradient.c b/coders/gradient.c index 3ea5bd1bd..59d455fc1 100644 --- a/coders/gradient.c +++ b/coders/gradient.c @@ -96,7 +96,7 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - colorname[MaxTextExtent]; + colorname[MagickPathExtent]; Image *image; @@ -124,20 +124,20 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, assert(exception->signature == MagickSignature); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) CopyMagickString(colorname,image_info->filename,MaxTextExtent); + (void) CopyMagickString(colorname,image_info->filename,MagickPathExtent); (void) sscanf(image_info->filename,"%[^-]",colorname); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"xc:%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"xc:%s", colorname); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image == (Image *) NULL) return((Image *) NULL); (void) SetImageAlpha(image,(Quantum) TransparentAlpha,exception); - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); icc_color=MagickFalse; if (LocaleCompare(colorname,"icc") == 0) { - (void) ConcatenateMagickString(colorname,"-",MaxTextExtent); + (void) ConcatenateMagickString(colorname,"-",MagickPathExtent); (void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname+4); icc_color=MagickTrue; } @@ -148,9 +148,9 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, return((Image *) NULL); } (void) SetImageColorspace(image,start_color.colorspace,exception); - (void) CopyMagickString(colorname,"white",MaxTextExtent); + (void) CopyMagickString(colorname,"white",MagickPathExtent); if (GetPixelInfoIntensity(image,&start_color) > (QuantumRange/2.0)) - (void) CopyMagickString(colorname,"black",MaxTextExtent); + (void) CopyMagickString(colorname,"black",MagickPathExtent); if (icc_color == MagickFalse) (void) sscanf(image_info->filename,"%*[^-]-%[^-]",colorname); else diff --git a/coders/hdr.c b/coders/hdr.c index 4cc2f1c0d..23a2af8d4 100644 --- a/coders/hdr.c +++ b/coders/hdr.c @@ -135,10 +135,10 @@ static MagickBooleanType IsHDR(const unsigned char *magick, static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - format[MaxTextExtent], - keyword[MaxTextExtent], - tag[MaxTextExtent], - value[MaxTextExtent]; + format[MagickPathExtent], + keyword[MagickPathExtent], + tag[MagickPathExtent], + value[MagickPathExtent]; double gamma; @@ -217,7 +217,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Read comment-- any text between # and end-of-line. */ - length=MaxTextExtent; + length=MagickPathExtent; comment=AcquireString((char *) NULL); for (p=comment; comment != (char *) NULL; p++) { @@ -229,7 +229,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) *p='\0'; length<<=1; comment=(char *) ResizeQuantumMemory(comment,length+ - MaxTextExtent,sizeof(*comment)); + MagickPathExtent,sizeof(*comment)); if (comment == (char *) NULL) break; p=comment+strlen(comment); @@ -257,7 +257,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) p=keyword; do { - if ((size_t) (p-keyword) < (MaxTextExtent-1)) + if ((size_t) (p-keyword) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); } while (isalnum(c) || (c == '_')); @@ -276,7 +276,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) p=value; while ((c != '\n') && (c != '\0') && (c != EOF)) { - if ((size_t) (p-value) < (MaxTextExtent-1)) + if ((size_t) (p-value) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); } @@ -291,10 +291,10 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (LocaleCompare(keyword,"format") == 0) { - (void) CopyMagickString(format,value,MaxTextExtent); + (void) CopyMagickString(format,value,MagickPathExtent); break; } - (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword); + (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword); (void) SetImageProperty(image,tag,value,exception); break; } @@ -306,7 +306,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) image->gamma=StringToDouble(value,(char **) NULL); break; } - (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword); + (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword); (void) SetImageProperty(image,tag,value,exception); break; } @@ -339,7 +339,7 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) } break; } - (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword); + (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword); (void) SetImageProperty(image,tag,value,exception); break; } @@ -362,13 +362,13 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) } break; } - (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword); + (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword); (void) SetImageProperty(image,tag,value,exception); break; } default: { - (void) FormatLocaleString(tag,MaxTextExtent,"hdr:%s",keyword); + (void) FormatLocaleString(tag,MagickPathExtent,"hdr:%s",keyword); (void) SetImageProperty(image,tag,value,exception); break; } @@ -659,7 +659,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - header[MaxTextExtent]; + header[MagickPathExtent]; const char *property; @@ -704,38 +704,38 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image, /* Write header. */ - (void) ResetMagickMemory(header,' ',MaxTextExtent); - length=CopyMagickString(header,"#?RGBE\n",MaxTextExtent); + (void) ResetMagickMemory(header,' ',MagickPathExtent); + length=CopyMagickString(header,"#?RGBE\n",MagickPathExtent); (void) WriteBlob(image,length,(unsigned char *) header); property=GetImageProperty(image,"comment",exception); if ((property != (const char *) NULL) && (strchr(property,'\n') == (char *) NULL)) { - count=FormatLocaleString(header,MaxTextExtent,"#%s\n",property); + count=FormatLocaleString(header,MagickPathExtent,"#%s\n",property); (void) WriteBlob(image,(size_t) count,(unsigned char *) header); } property=GetImageProperty(image,"hdr:exposure",exception); if (property != (const char *) NULL) { - count=FormatLocaleString(header,MaxTextExtent,"EXPOSURE=%g\n", + count=FormatLocaleString(header,MagickPathExtent,"EXPOSURE=%g\n", strtod(property,(char **) NULL)); (void) WriteBlob(image,(size_t) count,(unsigned char *) header); } if (image->gamma != 0.0) { - count=FormatLocaleString(header,MaxTextExtent,"GAMMA=%g\n",image->gamma); + count=FormatLocaleString(header,MagickPathExtent,"GAMMA=%g\n",image->gamma); (void) WriteBlob(image,(size_t) count,(unsigned char *) header); } - count=FormatLocaleString(header,MaxTextExtent, + count=FormatLocaleString(header,MagickPathExtent, "PRIMARIES=%g %g %g %g %g %g %g %g\n", image->chromaticity.red_primary.x,image->chromaticity.red_primary.y, image->chromaticity.green_primary.x,image->chromaticity.green_primary.y, image->chromaticity.blue_primary.x,image->chromaticity.blue_primary.y, image->chromaticity.white_point.x,image->chromaticity.white_point.y); (void) WriteBlob(image,(size_t) count,(unsigned char *) header); - length=CopyMagickString(header,"FORMAT=32-bit_rle_rgbe\n\n",MaxTextExtent); + length=CopyMagickString(header,"FORMAT=32-bit_rle_rgbe\n\n",MagickPathExtent); (void) WriteBlob(image,length,(unsigned char *) header); - count=FormatLocaleString(header,MaxTextExtent,"-Y %.20g +X %.20g\n", + count=FormatLocaleString(header,MagickPathExtent,"-Y %.20g +X %.20g\n", (double) image->rows,(double) image->columns); (void) WriteBlob(image,(size_t) count,(unsigned char *) header); /* diff --git a/coders/histogram.c b/coders/histogram.c index b6937877a..cb7ad5c4d 100644 --- a/coders/histogram.c +++ b/coders/histogram.c @@ -175,7 +175,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info, #define HistogramDensity "256x200" char - filename[MaxTextExtent]; + filename[MagickPathExtent]; const char *option; @@ -367,11 +367,11 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info, Write Histogram image. */ (void) CopyMagickString(histogram_image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"HISTOGRAM") == 0) - (void) FormatLocaleString(histogram_image->filename,MaxTextExtent,"miff:%s", + (void) FormatLocaleString(histogram_image->filename,MagickPathExtent,"miff:%s", write_info->filename); status=WriteImage(write_info,histogram_image,exception); histogram_image=DestroyImage(histogram_image); diff --git a/coders/html.c b/coders/html.c index ea71c4492..69e1000ad 100644 --- a/coders/html.c +++ b/coders/html.c @@ -207,11 +207,11 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - basename[MaxTextExtent], - buffer[MaxTextExtent], - filename[MaxTextExtent], - mapname[MaxTextExtent], - url[MaxTextExtent]; + basename[MagickPathExtent], + buffer[MagickPathExtent], + filename[MagickPathExtent], + mapname[MagickPathExtent], + url[MagickPathExtent]; Image *next; @@ -256,23 +256,23 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, if (p != (char *) NULL) { p++; - (void) CopyMagickString(url,image_info->magick,MaxTextExtent); - (void) ConcatenateMagickString(url,":",MaxTextExtent); + (void) CopyMagickString(url,image_info->magick,MagickPathExtent); + (void) ConcatenateMagickString(url,":",MagickPathExtent); url[strlen(url)+p-image->filename]='\0'; (void) ConcatenateMagickString(url,image->filename, p-image->filename+2); - (void) CopyMagickString(image->filename,p,MaxTextExtent); + (void) CopyMagickString(image->filename,p,MagickPathExtent); } } /* Refer to image map file. */ - (void) CopyMagickString(filename,image->filename,MaxTextExtent); + (void) CopyMagickString(filename,image->filename,MagickPathExtent); AppendImageFormat("map",filename); GetPathComponent(filename,BasePath,basename); - (void) CopyMagickString(mapname,basename,MaxTextExtent); - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); - (void) CopyMagickString(filename,image->filename,MaxTextExtent); + (void) CopyMagickString(mapname,basename,MagickPathExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); + (void) CopyMagickString(filename,image->filename,MagickPathExtent); write_info=CloneImageInfo(image_info); *write_info->magick='\0'; write_info->adjoin=MagickTrue; @@ -301,24 +301,24 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, (void) WriteBlobString(image,"\n"); value=GetImageProperty(image,"label",exception); if (value != (const char *) NULL) - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n", value); else { GetPathComponent(filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%s\n",basename); } (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"\n"); (void) WriteBlobString(image,"\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"

%s

\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"

%s

\n", image->filename); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"
\n"); - (void) CopyMagickString(filename,image->filename,MaxTextExtent); + (void) CopyMagickString(filename,image->filename,MagickPathExtent); AppendImageFormat("png",filename); - (void) FormatLocaleString(buffer,MaxTextExtent,"\"Image\n",mapname, filename); (void) WriteBlobString(image,buffer); @@ -331,14 +331,14 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, /* Write an image map. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\n",mapname,mapname); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent," directory == (char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n", image->filename,(double) geometry.width-1,(double) geometry.height- 1); @@ -350,14 +350,14 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, (void) WriteBlobByte(image,(unsigned char) *p); else { - (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape=" + (void) FormatLocaleString(buffer,MagickPathExtent,"\" shape=" "\"rect\" coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n", (double) geometry.x,(double) geometry.y,(double) (geometry.x+ geometry.width-1),(double) (geometry.y+geometry.height-1)); (void) WriteBlobString(image,buffer); if (*(p+1) != '\0') { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " \n"); - (void) CopyMagickString(filename,image->filename,MaxTextExtent); + (void) CopyMagickString(filename,image->filename,MagickPathExtent); (void) WriteBlobString(image,"
\n"); (void) WriteBlobString(image,"\n"); (void) WriteBlobString(image,"\n"); @@ -377,19 +377,19 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, /* Write the image as PNG. */ - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); AppendImageFormat("png",image->filename); next=GetNextImageInList(image); image->next=NewImageList(); - (void) CopyMagickString(image->magick,"PNG",MaxTextExtent); + (void) CopyMagickString(image->magick,"PNG",MagickPathExtent); (void) WriteImage(write_info,image,exception); image->next=next; /* Determine image map filename. */ GetPathComponent(image->filename,BasePath,filename); - (void) ConcatenateMagickString(filename,"_map.shtml",MaxTextExtent); - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) ConcatenateMagickString(filename,"_map.shtml",MagickPathExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); } /* Open image map. @@ -407,14 +407,14 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, /* Write an image map. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\n",mapname,mapname); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent," directory == (char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%s\" shape=\"rect\" coords=\"0,0,%.20g,%.20g\" alt=\"\" />\n", image->filename,(double) geometry.width-1,(double) geometry.height-1); (void) WriteBlobString(image,buffer); @@ -425,14 +425,14 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, (void) WriteBlobByte(image,(unsigned char) *p); else { - (void) FormatLocaleString(buffer,MaxTextExtent,"\" shape=\"rect\"" + (void) FormatLocaleString(buffer,MagickPathExtent,"\" shape=\"rect\"" " coords=\"%.20g,%.20g,%.20g,%.20g\" alt=\"\" />\n", (double) geometry.x,(double) geometry.y,geometry.x+(double) geometry.width-1,geometry.y+(double) geometry.height-1); (void) WriteBlobString(image,buffer); if (*(p+1) != '\0') { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " \n"); (void) CloseBlob(image); - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); return(status); } diff --git a/coders/icon.c b/coders/icon.c index 0f3d00d43..94c31e6b8 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -367,7 +367,7 @@ static Image *ReadICONImage(const ImageInfo *image_info, if (count > 0) { read_info=CloneImageInfo(image_info); - (void) CopyMagickString(read_info->magick,"PNG",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"PNG",MagickPathExtent); icon_image=BlobToImage(read_info,png,length+16,exception); read_info=DestroyImageInfo(read_info); } @@ -976,7 +976,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, return(MagickFalse); } write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->filename,"PNG:",MaxTextExtent); + (void) CopyMagickString(write_info->filename,"PNG:",MagickPathExtent); /* Don't write any ancillary chunks except for gAMA */ (void) SetImageArtifact(write_image,"png:include-chunk","none,gama"); diff --git a/coders/info.c b/coders/info.c index bb3b3f20b..2ff094da8 100644 --- a/coders/info.c +++ b/coders/info.c @@ -186,7 +186,7 @@ static MagickBooleanType WriteINFOImage(const ImageInfo *image_info, if (format == (char *) NULL) { (void) CopyMagickString(image->filename,image->magick_filename, - MaxTextExtent); + MagickPathExtent); image->magick_columns=image->columns; image->magick_rows=image->rows; (void) IdentifyImage(image,GetBlobFileHandle(image), diff --git a/coders/inline.c b/coders/inline.c index 7df680101..c915686b8 100644 --- a/coders/inline.c +++ b/coders/inline.c @@ -260,7 +260,7 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info, { char *base64, - message[MaxTextExtent]; + message[MagickPathExtent]; const MagickInfo *magick_info; @@ -293,12 +293,12 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info, write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"INLINE") == 0) - (void) CopyMagickString(write_info->magick,image->magick,MaxTextExtent); + (void) CopyMagickString(write_info->magick,image->magick,MagickPathExtent); magick_info=GetMagickInfo(write_info->magick,exception); if ((magick_info == (const MagickInfo *) NULL) || (GetMagickMimeType(magick_info) == (const char *) NULL)) ThrowWriterException(CorruptImageError,"ImageTypeNotSupported"); - (void) CopyMagickString(image->filename,write_info->filename,MaxTextExtent); + (void) CopyMagickString(image->filename,write_info->filename,MagickPathExtent); blob_length=2048; write_image=CloneImage(image,0,0,MagickTrue,exception); if (write_image == (Image *) NULL) @@ -326,7 +326,7 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info, base64=DestroyString(base64); return(status); } - (void) FormatLocaleString(message,MaxTextExtent,"data:%s;base64,", + (void) FormatLocaleString(message,MagickPathExtent,"data:%s;base64,", GetMagickMimeType(magick_info)); (void) WriteBlobString(image,message); (void) WriteBlobString(image,base64); diff --git a/coders/jbig.c b/coders/jbig.c index e44ae5e1a..015751a41 100644 --- a/coders/jbig.c +++ b/coders/jbig.c @@ -297,14 +297,14 @@ ModuleExport size_t RegisterJBIGImage(void) #define JBIGDescription "Joint Bi-level Image experts Group interchange format" char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(JBG_VERSION) - (void) CopyMagickString(version,JBG_VERSION,MaxTextExtent); + (void) CopyMagickString(version,JBG_VERSION,MagickPathExtent); #endif entry=AcquireMagickInfo("JBIG","BIE",JBIGDescription); #if defined(MAGICKCORE_JBIG_DELEGATE) diff --git a/coders/jnx.c b/coders/jnx.c index a64bc1399..0ca1d1889 100644 --- a/coders/jnx.c +++ b/coders/jnx.c @@ -99,7 +99,7 @@ typedef struct _JNXLevelInfo scale; unsigned short - copyright[MaxTextExtent]; + copyright[MagickPathExtent]; } JNXLevelInfo; /* @@ -212,7 +212,7 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ReadBlobLSBLong(image); j=0; while ((c=ReadBlobLSBShort(image)) != 0) - if (j < (MaxTextExtent-1)) + if (j < (MagickPathExtent-1)) jnx_level_info[i].copyright[j++]=c; jnx_level_info[i].copyright[j]=0; } @@ -297,14 +297,14 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile"); } read_info=CloneImageInfo(image_info); - (void) CopyMagickString(read_info->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"JPEG",MagickPathExtent); tile_image=BlobToImage(read_info,blob,tile_length+2,exception); read_info=DestroyImageInfo(read_info); blob=(unsigned char *) RelinquishMagickMemory(blob); offset=SeekBlob(image,restore_offset,SEEK_SET); if (tile_image == (Image *) NULL) continue; - (void) CopyMagickString(tile_image->magick,image->magick,MaxTextExtent); + (void) CopyMagickString(tile_image->magick,image->magick,MagickPathExtent); (void) FormatImageProperty(tile_image,"jnx:northeast","%.20g,%.20g", northeast.x,northeast.y); (void) FormatImageProperty(tile_image,"jnx:southwest","%.20g,%.20g", diff --git a/coders/jp2.c b/coders/jp2.c index ae64da84d..ba7d5a82e 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -533,14 +533,14 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) ModuleExport size_t RegisterJP2Image(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) - (void) FormatLocaleString(version,MaxTextExtent,"%s",opj_version()); + (void) FormatLocaleString(version,MagickPathExtent,"%s",opj_version()); #endif entry=AcquireMagickInfo("JP2","JP2","JPEG-2000 File Format Syntax"); if (*version != '\0') diff --git a/coders/jpeg.c b/coders/jpeg.c index cab17ad2b..12ed4ca9a 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -536,7 +536,7 @@ static boolean ReadICCProfile(j_decompress_ptr jpeg_info) static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info) { char - magick[MaxTextExtent]; + magick[MagickPathExtent]; ErrorManager *error_manager; @@ -642,7 +642,7 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info) static boolean ReadProfile(j_decompress_ptr jpeg_info) { char - name[MaxTextExtent]; + name[MagickPathExtent]; const StringInfo *previous_profile; @@ -683,7 +683,7 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info) return(TRUE); length-=2; marker=jpeg_info->unread_marker-JPEG_APP0; - (void) FormatLocaleString(name,MaxTextExtent,"APP%d",marker); + (void) FormatLocaleString(name,MagickPathExtent,"APP%d",marker); error_manager=(ErrorManager *) jpeg_info->client_data; exception=error_manager->exception; image=error_manager->image; @@ -703,7 +703,7 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info) { p=GetStringInfoDatum(profile); if ((length > 4) && (LocaleNCompare((char *) p,"exif",4) == 0)) - (void) CopyMagickString(name,"exif",MaxTextExtent); + (void) CopyMagickString(name,"exif",MagickPathExtent); if ((length > 5) && (LocaleNCompare((char *) p,"http:",5) == 0)) { ssize_t @@ -721,7 +721,7 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info) } if (j < (ssize_t) GetStringInfoLength(profile)) (void) DestroyStringInfo(SplitStringInfo(profile,(size_t) (j+1))); - (void) CopyMagickString(name,"xmp",MaxTextExtent); + (void) CopyMagickString(name,"xmp",MagickPathExtent); } } previous_profile=GetImageProfile(image,name); @@ -935,14 +935,14 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info, static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, Image *image,ExceptionInfo *exception) { char - sampling_factor[MaxTextExtent]; + sampling_factor[MagickPathExtent]; switch (jpeg_info->out_color_space) { case JCS_CMYK: { (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: CMYK"); - (void) FormatLocaleString(sampling_factor,MaxTextExtent, + (void) FormatLocaleString(sampling_factor,MagickPathExtent, "%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor, jpeg_info->comp_info[0].v_samp_factor, jpeg_info->comp_info[1].h_samp_factor, @@ -957,7 +957,7 @@ static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, { (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Colorspace: GRAYSCALE"); - (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d", + (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%dx%d", jpeg_info->comp_info[0].h_samp_factor, jpeg_info->comp_info[0].v_samp_factor); break; @@ -965,7 +965,7 @@ static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, case JCS_RGB: { (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: RGB"); - (void) FormatLocaleString(sampling_factor,MaxTextExtent, + (void) FormatLocaleString(sampling_factor,MagickPathExtent, "%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor, jpeg_info->comp_info[0].v_samp_factor, jpeg_info->comp_info[1].h_samp_factor, @@ -978,7 +978,7 @@ static void JPEGSetImageSamplingFactor(struct jpeg_decompress_struct *jpeg_info, { (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: %d", jpeg_info->out_color_space); - (void) FormatLocaleString(sampling_factor,MaxTextExtent, + (void) FormatLocaleString(sampling_factor,MagickPathExtent, "%dx%d,%dx%d,%dx%d,%dx%d",jpeg_info->comp_info[0].h_samp_factor, jpeg_info->comp_info[0].v_samp_factor, jpeg_info->comp_info[1].h_samp_factor, @@ -1000,7 +1000,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - value[MaxTextExtent]; + value[MagickPathExtent]; const char *option; @@ -1291,7 +1291,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, } JPEGSetImageQuality(&jpeg_info,image,exception); JPEGSetImageSamplingFactor(&jpeg_info,image,exception); - (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) jpeg_info.out_color_space); (void) SetImageProperty(image,"jpeg:colorspace",value,exception); if (image_info->ping != MagickFalse) @@ -1516,14 +1516,14 @@ ModuleExport size_t RegisterJPEGImage(void) #define JPEGDescription "Joint Photographic Experts Group JFIF format" char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(JPEG_LIB_VERSION) - (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION); + (void) FormatLocaleString(version,MagickPathExtent,"%d",JPEG_LIB_VERSION); #endif entry=AcquireMagickInfo("JPEG","JPE",JPEGDescription); #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION) @@ -2077,7 +2077,7 @@ static char **SamplingFactorToList(const char *text) for (p=text; *p != '\0'; p++) if (*p == ',') lines++; - textlist=(char **) AcquireQuantumMemory((size_t) lines+MaxTextExtent, + textlist=(char **) AcquireQuantumMemory((size_t) lines+MagickPathExtent, sizeof(*textlist)); if (textlist == (char **) NULL) ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText"); @@ -2087,7 +2087,7 @@ static char **SamplingFactorToList(const char *text) for (q=(char *) p; *q != '\0'; q++) if (*q == ',') break; - textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MaxTextExtent, + textlist[i]=(char *) AcquireQuantumMemory((size_t) (q-p)+MagickPathExtent, sizeof(*textlist[i])); if (textlist[i] == (char *) NULL) ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText"); diff --git a/coders/json.c b/coders/json.c index ce1bb5ed0..6091dd16f 100644 --- a/coders/json.c +++ b/coders/json.c @@ -472,9 +472,9 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, ExceptionInfo *exception) { char - color[MaxTextExtent], - format[MaxTextExtent], - key[MaxTextExtent]; + color[MagickPathExtent], + format[MagickPathExtent], + key[MagickPathExtent]; ChannelFeatures *channel_features; @@ -545,7 +545,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, if (LocaleCompare(image->magick_filename,image->filename) != 0) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; GetPathComponent(image->magick_filename,TailPath,filename); (void) FormatLocaleFile(file," Base filename: %s\n",filename); @@ -920,7 +920,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, if ((x < (ssize_t) image->columns) || (y < (ssize_t) image->rows)) { char - tuple[MaxTextExtent]; + tuple[MagickPathExtent]; PixelInfo pixel; @@ -943,9 +943,9 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, if (image->colors <= 1024) { char - color[MaxTextExtent], - hex[MaxTextExtent], - tuple[MaxTextExtent]; + color[MagickPathExtent], + hex[MagickPathExtent], + tuple[MagickPathExtent]; PixelInfo pixel; @@ -958,28 +958,28 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, for (i=0; i < (ssize_t) image->colors; i++) { pixel=(*p); - (void) CopyMagickString(tuple,"(",MaxTextExtent); + (void) CopyMagickString(tuple,"(",MagickPathExtent); ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance, tuple); - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance, tuple); - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance, tuple); if (pixel.colorspace == CMYKColorspace) { - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,BlackPixelChannel, X11Compliance,tuple); } if (pixel.alpha_trait != UndefinedPixelTrait) { - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,AlphaPixelChannel, X11Compliance,tuple); } - (void) ConcatenateMagickString(tuple,")",MaxTextExtent); + (void) ConcatenateMagickString(tuple,")",MagickPathExtent); (void) QueryColorname(image,&pixel,SVGCompliance,color, exception); GetColorTuple(&pixel,MagickTrue,hex); @@ -1149,7 +1149,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, property=GetNextImageProperty(image); } } - (void) FormatLocaleString(key,MaxTextExtent,"8BIM:1999,2998:#1"); + (void) FormatLocaleString(key,MagickPathExtent,"8BIM:1999,2998:#1"); value=GetImageProperty(image,key,exception); if (value != (const char *) NULL) { @@ -1270,8 +1270,8 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, length=(size_t) (GetStringInfoDatum(profile)[i++] << 8); length|=GetStringInfoDatum(profile)[i++]; attribute=(char *) NULL; - if (~length >= (MaxTextExtent-1)) - attribute=(char *) AcquireQuantumMemory(length+MaxTextExtent, + if (~length >= (MagickPathExtent-1)) + attribute=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*attribute)); if (attribute != (char *) NULL) { @@ -1336,16 +1336,16 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, } (void) FormatLocaleFile(file," Tainted: %s\n",CommandOptionToMnemonic( MagickBooleanOptions,(ssize_t) image->taint)); - (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MaxTextExtent, + (void) FormatMagickSize(GetBlobSize(image),MagickFalse,"B",MagickPathExtent, format); (void) FormatLocaleFile(file," Filesize: %s\n",format); (void) FormatMagickSize((MagickSizeType) image->columns*image->rows, - MagickFalse,"B",MaxTextExtent,format); + MagickFalse,"B",MagickPathExtent,format); if (strlen(format) > 1) format[strlen(format)-1]='\0'; (void) FormatLocaleFile(file," Number pixels: %s\n",format); (void) FormatMagickSize((MagickSizeType) ((double) image->columns*image->rows/ - elapsed_time+0.5),MagickFalse,"B",MaxTextExtent,format); + elapsed_time+0.5),MagickFalse,"B",MagickPathExtent,format); (void) FormatLocaleFile(file," Pixels per second: %s\n",format); (void) FormatLocaleFile(file," User time: %0.3fu\n",user_time); (void) FormatLocaleFile(file," Elapsed time: %lu:%02lu.%03lu\n", @@ -1382,7 +1382,7 @@ static MagickBooleanType WriteJSONImage(const ImageInfo *image_info, do { (void) CopyMagickString(image->filename,image->magick_filename, - MaxTextExtent); + MagickPathExtent); image->magick_columns=image->columns; image->magick_rows=image->rows; (void) EncodeImageAttributes(image,GetBlobFileHandle(image),exception); diff --git a/coders/label.c b/coders/label.c index 78f4fe851..800052930 100644 --- a/coders/label.c +++ b/coders/label.c @@ -90,7 +90,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - geometry[MaxTextExtent], + geometry[MagickPathExtent], *property; const char @@ -152,7 +152,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, */ for ( ; ; draw_info->pointsize*=2.0) { - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -173,7 +173,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, for (low=1.0; (high-low) > 0.5; ) { draw_info->pointsize=(low+high)/2.0; - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", -metrics.bounds.x1,metrics.ascent); if (draw_info->gravity == UndefinedGravity) (void) CloneString(&draw_info->geometry,geometry); @@ -227,7 +227,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info, /* Draw label. */ - (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", draw_info->direction == RightToLeftDirection ? image->columns- metrics.bounds.x2 : 0.0,draw_info->gravity == UndefinedGravity ? metrics.ascent : 0.0); @@ -236,9 +236,9 @@ static Image *ReadLABELImage(const ImageInfo *image_info, if (image_info->pointsize == 0.0) { char - pointsize[MaxTextExtent]; + pointsize[MagickPathExtent]; - (void) FormatLocaleString(pointsize,MaxTextExtent,"%.20g", + (void) FormatLocaleString(pointsize,MagickPathExtent,"%.20g", draw_info->pointsize); (void) SetImageProperty(image,"label:pointsize",pointsize,exception); } diff --git a/coders/magick.c b/coders/magick.c index b7b6b64ed..a046e246b 100644 --- a/coders/magick.c +++ b/coders/magick.c @@ -12977,8 +12977,8 @@ static const unsigned char typedef struct _MagickImageInfo { char - name[MaxTextExtent], - magick[MaxTextExtent]; + name[MagickPathExtent], + magick[MagickPathExtent]; const void *blob; @@ -13052,7 +13052,7 @@ static Image *ReadMAGICKImage(const ImageInfo *image_info, blob_info=CloneImageInfo(image_info); if (LocaleCompare(image_info->magick,"MAGICK") != 0) (void) CopyMagickString(blob_info->filename,image_info->magick, - MaxTextExtent); + MagickPathExtent); image=(Image *) NULL; blob=(const void *) NULL; extent=0; @@ -13060,7 +13060,7 @@ static Image *ReadMAGICKImage(const ImageInfo *image_info, if (LocaleCompare(blob_info->filename,MagickImageList[i].name) == 0) { (void) CopyMagickString(blob_info->magick,MagickImageList[i].magick, - MaxTextExtent); + MagickPathExtent); blob=MagickImageList[i].blob; extent=MagickImageList[i].extent; break; @@ -13207,7 +13207,7 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; Image *magick_image; @@ -13245,11 +13245,11 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info, ThrowWriterException(ResourceLimitError,exception->reason); write_info=CloneImageInfo(image_info); *write_info->filename='\0'; - (void) CopyMagickString(write_info->magick,"GIF",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"GIF",MagickPathExtent); length=(size_t) magick_image->columns*magick_image->rows; if (magick_image->storage_class == DirectClass) { - (void) CopyMagickString(write_info->magick,"PNM",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"PNM",MagickPathExtent); length*=3; } blob=ImageToBlob(write_info,magick_image,&length,exception); @@ -13261,7 +13261,7 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); (void) WriteBlobString(image,"/*\n"); - (void) FormatLocaleString(buffer,MaxTextExtent," %s (%s).\n", + (void) FormatLocaleString(buffer,MagickPathExtent," %s (%s).\n", image->filename,image->storage_class == DirectClass ? "PNM" : "GIF"); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"*/\n"); @@ -13272,11 +13272,11 @@ static MagickBooleanType WriteMAGICKImage(const ImageInfo *image_info, p=(char *) blob; for (i=0; i < (ssize_t) length ; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ",*p & 0xff); + (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ",*p & 0xff); (void) WriteBlobString(image,buffer); if (((i+1) % 12) == 0) { - (void) CopyMagickString(buffer,"\n ",MaxTextExtent); + (void) CopyMagickString(buffer,"\n ",MagickPathExtent); (void) WriteBlobString(image,buffer); } p++; diff --git a/coders/mask.c b/coders/mask.c index 036300763..41cd0dd40 100644 --- a/coders/mask.c +++ b/coders/mask.c @@ -110,7 +110,7 @@ static Image *ReadMASKImage(const ImageInfo *image_info, assert(exception->signature == MagickSignature); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) CopyMagickString(read_info->magick,"MIFF",MaxTextExtent); + (void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) @@ -297,11 +297,11 @@ static MagickBooleanType WriteMASKImage(const ImageInfo *image_info, mask_image=MaskImage(image,exception); if (mask_image == (Image *) NULL) return(MagickFalse); - (void) CopyMagickString(mask_image->filename,image->filename,MaxTextExtent); + (void) CopyMagickString(mask_image->filename,image->filename,MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"MASK") == 0) - (void) FormatLocaleString(mask_image->filename,MaxTextExtent,"miff:%s", + (void) FormatLocaleString(mask_image->filename,MagickPathExtent,"miff:%s", write_info->filename); status=WriteImage(write_info,mask_image,exception); mask_image=DestroyImage(mask_image); diff --git a/coders/matte.c b/coders/matte.c index 1894dcf2d..86540801a 100644 --- a/coders/matte.c +++ b/coders/matte.c @@ -210,7 +210,7 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info, } write_info=CloneImageInfo(image_info); if (LocaleCompare(write_info->magick,"MATTE") == 0) - (void) FormatLocaleString(matte_image->filename,MaxTextExtent, + (void) FormatLocaleString(matte_image->filename,MagickPathExtent, "MIFF:%s",image->filename); status=WriteImage(write_info,matte_image,exception); write_info=DestroyImageInfo(write_info); diff --git a/coders/meta.c b/coders/meta.c index b60564d1b..7b3e936c3 100644 --- a/coders/meta.c +++ b/coders/meta.c @@ -309,7 +309,7 @@ static ssize_t parse8BIM(Image *ifile, Image *ofile) recnum; int - inputlen = MaxTextExtent; + inputlen = MagickPathExtent; MagickOffsetType savedpos, @@ -371,7 +371,7 @@ static ssize_t parse8BIM(Image *ifile, Image *ofile) recnum = (unsigned int) StringToUnsignedLong(newstr); break; case 2: - name=(char *) AcquireQuantumMemory(strlen(newstr)+MaxTextExtent, + name=(char *) AcquireQuantumMemory(strlen(newstr)+MagickPathExtent, sizeof(*name)); if (name) (void) strcpy(name,newstr); @@ -605,7 +605,7 @@ static ssize_t parse8BIMW(Image *ifile, Image *ofile) recnum; int - inputlen = MaxTextExtent; + inputlen = MagickPathExtent; ssize_t savedolen = 0L, @@ -667,10 +667,10 @@ static ssize_t parse8BIMW(Image *ifile, Image *ofile) recnum=(unsigned int) StringToUnsignedLong(newstr); break; case 2: - name=(char *) AcquireQuantumMemory(strlen(newstr)+MaxTextExtent, + name=(char *) AcquireQuantumMemory(strlen(newstr)+MagickPathExtent, sizeof(*name)); if (name) - (void) CopyMagickString(name,newstr,strlen(newstr)+MaxTextExtent); + (void) CopyMagickString(name,newstr,strlen(newstr)+MagickPathExtent); break; } state++; @@ -1224,9 +1224,9 @@ static Image *ReadMETAImage(const ImageInfo *image_info, if (LocaleNCompare(image_info->magick,"APP1",4) == 0) { char - name[MaxTextExtent]; + name[MagickPathExtent]; - (void) FormatLocaleString(name,MaxTextExtent,"APP%d",1); + (void) FormatLocaleString(name,MagickPathExtent,"APP%d",1); buff=AcquireImage((ImageInfo *) NULL,exception); if (buff == (Image *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); @@ -1713,7 +1713,7 @@ iptc_find: static void formatString(Image *ofile, const char *s, int len) { char - temp[MaxTextExtent]; + temp[MagickPathExtent]; (void) WriteBlobByte(ofile,'"'); for (; len > 0; len--, s++) { @@ -1738,7 +1738,7 @@ static void formatString(Image *ofile, const char *s, int len) (void) WriteBlobByte(ofile,(unsigned char) *s); else { - (void) FormatLocaleString(temp,MaxTextExtent,"&#%d;", c & 255); + (void) FormatLocaleString(temp,MagickPathExtent,"&#%d;", c & 255); (void) WriteBlobString(ofile,temp); } break; @@ -1823,7 +1823,7 @@ static const tag_spec tags[] = { static int formatIPTC(Image *ifile, Image *ofile) { char - temp[MaxTextExtent]; + temp[MagickPathExtent]; unsigned int foundiptc, @@ -1902,7 +1902,7 @@ static int formatIPTC(Image *ifile, Image *ofile) } if (taglen < 0) return -1; /* make a buffer to hold the tag datand snag it from the input stream */ - str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MaxTextExtent), + str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MagickPathExtent), sizeof(*str)); if (str == (unsigned char *) NULL) { @@ -1919,10 +1919,10 @@ static int formatIPTC(Image *ifile, Image *ofile) /* now finish up by formatting this binary data into ASCII equivalent */ if (strlen((char *)readable) > 0) - (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=", + (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d#%s=", (unsigned int) dataset, (unsigned int) recnum, readable); else - (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=", + (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d=", (unsigned int) dataset,(unsigned int) recnum); (void) WriteBlobString(ofile,temp); formatString( ofile, (char *)str, taglen ); @@ -1957,7 +1957,7 @@ static int readWordFromBuffer(char **s, ssize_t *len) static int formatIPTCfromBuffer(Image *ofile, char *s, ssize_t len) { char - temp[MaxTextExtent]; + temp[MagickPathExtent]; unsigned int foundiptc, @@ -2034,7 +2034,7 @@ static int formatIPTCfromBuffer(Image *ofile, char *s, ssize_t len) if (taglen > 65535) return(-1); /* make a buffer to hold the tag datand snag it from the input stream */ - str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MaxTextExtent), + str=(unsigned char *) AcquireQuantumMemory((size_t) (taglen+MagickPathExtent), sizeof(*str)); if (str == (unsigned char *) NULL) { @@ -2052,10 +2052,10 @@ static int formatIPTCfromBuffer(Image *ofile, char *s, ssize_t len) /* now finish up by formatting this binary data into ASCII equivalent */ if (strlen((char *)readable) > 0) - (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d#%s=", + (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d#%s=", (unsigned int) dataset,(unsigned int) recnum, readable); else - (void) FormatLocaleString(temp,MaxTextExtent,"%d#%d=", + (void) FormatLocaleString(temp,MagickPathExtent,"%d#%d=", (unsigned int) dataset,(unsigned int) recnum); (void) WriteBlobString(ofile,temp); formatString( ofile, (char *)str, taglen ); @@ -2069,7 +2069,7 @@ static int formatIPTCfromBuffer(Image *ofile, char *s, ssize_t len) static int format8BIM(Image *ifile, Image *ofile) { char - temp[MaxTextExtent]; + temp[MagickPathExtent]; unsigned int foundOSType; @@ -2132,7 +2132,7 @@ static int format8BIM(Image *ifile, Image *ofile) return(-1); plen = (unsigned char) c; PString=(unsigned char *) AcquireQuantumMemory((size_t) (plen+ - MaxTextExtent),sizeof(*PString)); + MagickPathExtent),sizeof(*PString)); if (PString == (unsigned char *) NULL) { printf("MemoryAllocationFailed"); @@ -2178,10 +2178,10 @@ static int format8BIM(Image *ifile, Image *ofile) * ASCII equivalent */ if (strlen((const char *)PString) > 0) - (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d#%s=",ID, + (void) FormatLocaleString(temp,MagickPathExtent,"8BIM#%d#%s=",ID, PString); else - (void) FormatLocaleString(temp,MaxTextExtent,"8BIM#%d=",ID); + (void) FormatLocaleString(temp,MagickPathExtent,"8BIM#%d=",ID); (void) WriteBlobString(ofile,temp); if (ID == IPTC_ID) { diff --git a/coders/miff.c b/coders/miff.c index 2840f1197..87749e23e 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -399,8 +399,8 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, #endif char - id[MaxTextExtent], - keyword[MaxTextExtent], + id[MagickPathExtent], + keyword[MagickPathExtent], *options; const unsigned char @@ -506,7 +506,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, /* Decode image header; header terminates one character beyond a ':'. */ - length=MaxTextExtent; + length=MagickPathExtent; options=AcquireString((char *) NULL); quantum_format=UndefinedQuantumFormat; profiles=(LinkedListInfo *) NULL; @@ -526,7 +526,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, /* Read comment-- any text between { }. */ - length=MaxTextExtent; + length=MagickPathExtent; comment=AcquireString((char *) NULL); for (p=comment; comment != (char *) NULL; p++) { @@ -541,7 +541,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, *p='\0'; length<<=1; comment=(char *) ResizeQuantumMemory(comment,length+ - MaxTextExtent,sizeof(*comment)); + MagickPathExtent,sizeof(*comment)); if (comment == (char *) NULL) break; p=comment+strlen(comment); @@ -561,13 +561,13 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, /* Get the keyword. */ - length=MaxTextExtent; + length=MagickPathExtent; p=keyword; do { if (c == (int) '=') break; - if ((size_t) (p-keyword) < (MaxTextExtent-1)) + if ((size_t) (p-keyword) < (MagickPathExtent-1)) *p++=(char) c; c=ReadBlobByte(image); } while (c != EOF); @@ -588,7 +588,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, *p='\0'; length<<=1; options=(char *) ResizeQuantumMemory(options,length+ - MaxTextExtent,sizeof(*options)); + MagickPathExtent,sizeof(*options)); if (options == (char *) NULL) break; p=options+strlen(options); @@ -802,7 +802,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, { if (LocaleCompare(keyword,"id") == 0) { - (void) CopyMagickString(id,options,MaxTextExtent); + (void) CopyMagickString(id,options,MagickPathExtent); break; } if (LocaleCompare(keyword,"iterations") == 0) @@ -1092,20 +1092,20 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, /* Image directory. */ - length=MaxTextExtent; + length=MagickPathExtent; image->directory=AcquireString((char *) NULL); p=image->directory; do { *p='\0'; - if ((strlen(image->directory)+MaxTextExtent) >= length) + if ((strlen(image->directory)+MagickPathExtent) >= length) { /* Allocate more memory for the image directory. */ length<<=1; image->directory=(char *) ResizeQuantumMemory(image->directory, - length+MaxTextExtent,sizeof(*image->directory)); + length+MagickPathExtent,sizeof(*image->directory)); if (image->directory == (char *) NULL) ThrowReaderException(CorruptImageError,"UnableToReadImageData"); p=image->directory+strlen(image->directory); @@ -1648,20 +1648,20 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, ModuleExport size_t RegisterMIFFImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(MagickImageCoderSignatureText) - (void) CopyMagickString(version,MagickLibVersionText,MaxTextExtent); + (void) CopyMagickString(version,MagickLibVersionText,MagickPathExtent); #if defined(ZLIB_VERSION) - (void) ConcatenateMagickString(version," with Zlib ",MaxTextExtent); - (void) ConcatenateMagickString(version,ZLIB_VERSION,MaxTextExtent); + (void) ConcatenateMagickString(version," with Zlib ",MagickPathExtent); + (void) ConcatenateMagickString(version,ZLIB_VERSION,MagickPathExtent); #endif #if defined(MAGICKCORE_BZLIB_DELEGATE) - (void) ConcatenateMagickString(version," and BZlib",MaxTextExtent); + (void) ConcatenateMagickString(version," and BZlib",MagickPathExtent); #endif #endif entry=AcquireMagickInfo("MIFF","MIFF","Magick Image File Format"); @@ -1902,7 +1902,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, #endif char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; CompressionType compression; @@ -2041,63 +2041,63 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, Write MIFF header. */ (void) WriteBlobString(image,"id=ImageMagick version=1.0\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "class=%s colors=%.20g alpha-trait=%s\n",CommandOptionToMnemonic( MagickClassOptions,image->storage_class),(double) image->colors, CommandOptionToMnemonic(MagickPixelTraitOptions,(ssize_t) image->alpha_trait)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"columns=%.20g rows=%.20g " + (void) FormatLocaleString(buffer,MagickPathExtent,"columns=%.20g rows=%.20g " "depth=%.20g\n",(double) image->columns,(double) image->rows,(double) image->depth); (void) WriteBlobString(image,buffer); if (image->type != UndefinedType) { - (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"type=%s\n", CommandOptionToMnemonic(MagickTypeOptions,image->type)); (void) WriteBlobString(image,buffer); } if (image->colorspace != UndefinedColorspace) { - (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"colorspace=%s\n", CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace)); (void) WriteBlobString(image,buffer); } if (image->intensity != UndefinedPixelIntensityMethod) { - (void) FormatLocaleString(buffer,MaxTextExtent,"pixel-intensity=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"pixel-intensity=%s\n", CommandOptionToMnemonic(MagickPixelIntensityOptions, image->intensity)); (void) WriteBlobString(image,buffer); } if (image->endian != UndefinedEndian) { - (void) FormatLocaleString(buffer,MaxTextExtent,"endian=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"endian=%s\n", CommandOptionToMnemonic(MagickEndianOptions,image->endian)); (void) WriteBlobString(image,buffer); } if (compression != UndefinedCompression) { - (void) FormatLocaleString(buffer,MaxTextExtent,"compression=%s " + (void) FormatLocaleString(buffer,MagickPathExtent,"compression=%s " "quality=%.20g\n",CommandOptionToMnemonic(MagickCompressOptions, compression),(double) image->quality); (void) WriteBlobString(image,buffer); } if (image->units != UndefinedResolution) { - (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"units=%s\n", CommandOptionToMnemonic(MagickResolutionOptions,image->units)); (void) WriteBlobString(image,buffer); } if ((image->resolution.x != 0) || (image->resolution.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "resolution=%gx%g\n",image->resolution.x,image->resolution.y); (void) WriteBlobString(image,buffer); } if ((image->page.width != 0) || (image->page.height != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); (void) WriteBlobString(image,buffer); @@ -2105,13 +2105,13 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, else if ((image->page.x != 0) || (image->page.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"page=%+ld%+ld\n", (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } if ((image->tile_offset.x != 0) || (image->tile_offset.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"tile-offset=%+ld%+ld\n", (long) image->tile_offset.x,(long) image->tile_offset.y); (void) WriteBlobString(image,buffer); } @@ -2119,11 +2119,11 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, (GetPreviousImageInList(image) != (Image *) NULL)) { if (image->scene == 0) - (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g " + (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g " "delay=%.20g ticks-per-second=%.20g\n",(double) image->iterations, (double) image->delay,(double) image->ticks_per_second); else - (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g " + (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g " "iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double) image->scene,(double) image->iterations,(double) image->delay, (double) image->ticks_per_second); @@ -2133,50 +2133,50 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, { if (image->scene != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g\n", (double) image->scene); (void) WriteBlobString(image,buffer); } if (image->iterations != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g\n", (double) image->iterations); (void) WriteBlobString(image,buffer); } if (image->delay != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"delay=%.20g\n", (double) image->delay); (void) WriteBlobString(image,buffer); } if (image->ticks_per_second != UndefinedTicksPerSecond) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "ticks-per-second=%.20g\n",(double) image->ticks_per_second); (void) WriteBlobString(image,buffer); } } if (image->gravity != UndefinedGravity) { - (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"gravity=%s\n", CommandOptionToMnemonic(MagickGravityOptions,image->gravity)); (void) WriteBlobString(image,buffer); } if (image->dispose != UndefinedDispose) { - (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"dispose=%s\n", CommandOptionToMnemonic(MagickDisposeOptions,image->dispose)); (void) WriteBlobString(image,buffer); } if (image->rendering_intent != UndefinedIntent) { - (void) FormatLocaleString(buffer,MaxTextExtent,"rendering-intent=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"rendering-intent=%s\n", CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent)); (void) WriteBlobString(image,buffer); } if (image->gamma != 0.0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"gamma=%g\n", image->gamma); (void) WriteBlobString(image,buffer); } @@ -2185,7 +2185,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, /* Note chomaticity points. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary=%g," + (void) FormatLocaleString(buffer,MagickPathExtent,"red-primary=%g," "%g green-primary=%g,%g blue-primary=%g,%g\n", image->chromaticity.red_primary.x,image->chromaticity.red_primary.y, image->chromaticity.green_primary.x, @@ -2193,14 +2193,14 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, image->chromaticity.blue_primary.x, image->chromaticity.blue_primary.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "white-point=%g,%g\n",image->chromaticity.white_point.x, image->chromaticity.white_point.y); (void) WriteBlobString(image,buffer); } if (image->orientation != UndefinedOrientation) { - (void) FormatLocaleString(buffer,MaxTextExtent,"orientation=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"orientation=%s\n", CommandOptionToMnemonic(MagickOrientationOptions,image->orientation)); (void) WriteBlobString(image,buffer); } @@ -2222,7 +2222,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, profile=GetImageProfile(image,name); if (profile != (StringInfo *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "profile:%s=%.20g\n",name,(double) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); @@ -2232,7 +2232,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, } if (image->montage != (char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"montage=%s\n", image->montage); (void) WriteBlobString(image,buffer); } @@ -2243,7 +2243,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, property=GetNextImageProperty(image); while (property != (const char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s=",property); (void) WriteBlobString(image,buffer); value=GetImageProperty(image,property,exception); if (value != (const char *) NULL) diff --git a/coders/mpc.c b/coders/mpc.c index f555c6a32..8acd781f4 100644 --- a/coders/mpc.c +++ b/coders/mpc.c @@ -144,9 +144,9 @@ static MagickBooleanType IsMPC(const unsigned char *magick,const size_t length) static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - cache_filename[MaxTextExtent], - id[MaxTextExtent], - keyword[MaxTextExtent], + cache_filename[MagickPathExtent], + id[MagickPathExtent], + keyword[MagickPathExtent], *options; const unsigned char @@ -206,7 +206,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) image=DestroyImageList(image); return((Image *) NULL); } - (void) CopyMagickString(cache_filename,image->filename,MaxTextExtent); + (void) CopyMagickString(cache_filename,image->filename,MagickPathExtent); AppendImageFormat("cache",cache_filename); c=ReadBlobByte(image); if (c == EOF) @@ -223,7 +223,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) Decode image header; header terminates one character beyond a ':'. */ profiles=(LinkedListInfo *) NULL; - length=MaxTextExtent; + length=MagickPathExtent; options=AcquireString((char *) NULL); signature=GetMagickSignature((const StringInfo *) NULL); image->depth=8; @@ -241,7 +241,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Read comment-- any text between { }. */ - length=MaxTextExtent; + length=MagickPathExtent; comment=AcquireString((char *) NULL); for (p=comment; comment != (char *) NULL; p++) { @@ -256,7 +256,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) *p='\0'; length<<=1; comment=(char *) ResizeQuantumMemory(comment,length+ - MaxTextExtent,sizeof(*comment)); + MagickPathExtent,sizeof(*comment)); if (comment == (char *) NULL) break; p=comment+strlen(comment); @@ -276,13 +276,13 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Get the keyword. */ - length=MaxTextExtent; + length=MagickPathExtent; p=keyword; do { if (c == (int) '=') break; - if ((size_t) (p-keyword) < (MaxTextExtent-1)) + if ((size_t) (p-keyword) < (MagickPathExtent-1)) *p++=(char) c; c=ReadBlobByte(image); } while (c != EOF); @@ -303,7 +303,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) *p='\0'; length<<=1; options=(char *) ResizeQuantumMemory(options,length+ - MaxTextExtent,sizeof(*options)); + MagickPathExtent,sizeof(*options)); if (options == (char *) NULL) break; p=options+strlen(options); @@ -511,7 +511,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (LocaleCompare(keyword,"id") == 0) { - (void) CopyMagickString(id,options,MaxTextExtent); + (void) CopyMagickString(id,options,MagickPathExtent); break; } if (LocaleCompare(keyword,"iterations") == 0) @@ -778,20 +778,20 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Image directory. */ - length=MaxTextExtent; + length=MagickPathExtent; image->directory=AcquireString((char *) NULL); p=image->directory; do { *p='\0'; - if ((strlen(image->directory)+MaxTextExtent) >= length) + if ((strlen(image->directory)+MagickPathExtent) >= length) { /* Allocate more memory for the image directory. */ length<<=1; image->directory=(char *) ResizeQuantumMemory(image->directory, - length+MaxTextExtent,sizeof(*image->directory)); + length+MagickPathExtent,sizeof(*image->directory)); if (image->directory == (char *) NULL) ThrowReaderException(CorruptImageError,"UnableToReadImageData"); p=image->directory+strlen(image->directory); @@ -1058,8 +1058,8 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent], - cache_filename[MaxTextExtent]; + buffer[MagickPathExtent], + cache_filename[MagickPathExtent]; const char *property, @@ -1092,7 +1092,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); - (void) CopyMagickString(cache_filename,image->filename,MaxTextExtent); + (void) CopyMagickString(cache_filename,image->filename,MagickPathExtent); AppendImageFormat("cache",cache_filename); scene=0; offset=0; @@ -1106,66 +1106,66 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, (image->colors > (size_t) (GetQuantumRange(image->depth)+1))) (void) SetImageStorageClass(image,DirectClass,exception); (void) WriteBlobString(image,"id=MagickCache\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"magick-signature=%u\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"magick-signature=%u\n", GetMagickSignature((const StringInfo *) NULL)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "class=%s colors=%.20g alpha-trait=%s\n",CommandOptionToMnemonic( MagickClassOptions,image->storage_class),(double) image->colors, CommandOptionToMnemonic(MagickPixelTraitOptions,(ssize_t) image->alpha_trait)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "columns=%.20g rows=%.20g depth=%.20g\n",(double) image->columns, (double) image->rows,(double) image->depth); (void) WriteBlobString(image,buffer); if (image->type != UndefinedType) { - (void) FormatLocaleString(buffer,MaxTextExtent,"type=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"type=%s\n", CommandOptionToMnemonic(MagickTypeOptions,image->type)); (void) WriteBlobString(image,buffer); } if (image->colorspace != UndefinedColorspace) { - (void) FormatLocaleString(buffer,MaxTextExtent,"colorspace=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"colorspace=%s\n", CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace)); (void) WriteBlobString(image,buffer); } if (image->intensity != UndefinedPixelIntensityMethod) { - (void) FormatLocaleString(buffer,MaxTextExtent,"pixel-intensity=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"pixel-intensity=%s\n", CommandOptionToMnemonic(MagickPixelIntensityOptions, image->intensity)); (void) WriteBlobString(image,buffer); } if (image->endian != UndefinedEndian) { - (void) FormatLocaleString(buffer,MaxTextExtent,"endian=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"endian=%s\n", CommandOptionToMnemonic(MagickEndianOptions,image->endian)); (void) WriteBlobString(image,buffer); } if (image->compression != UndefinedCompression) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "compression=%s quality=%.20g\n",CommandOptionToMnemonic( MagickCompressOptions,image->compression),(double) image->quality); (void) WriteBlobString(image,buffer); } if (image->units != UndefinedResolution) { - (void) FormatLocaleString(buffer,MaxTextExtent,"units=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"units=%s\n", CommandOptionToMnemonic(MagickResolutionOptions,image->units)); (void) WriteBlobString(image,buffer); } if ((image->resolution.x != 0) || (image->resolution.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "resolution=%gx%g\n",image->resolution.x,image->resolution.y); (void) WriteBlobString(image,buffer); } if ((image->page.width != 0) || (image->page.height != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "page=%.20gx%.20g%+.20g%+.20g\n",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); (void) WriteBlobString(image,buffer); @@ -1173,13 +1173,13 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, else if ((image->page.x != 0) || (image->page.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent,"page=%+ld%+ld\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"page=%+ld%+ld\n", (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } if ((image->page.x != 0) || (image->page.y != 0)) { - (void) FormatLocaleString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"tile-offset=%+ld%+ld\n", (long) image->tile_offset.x,(long) image->tile_offset.y); (void) WriteBlobString(image,buffer); } @@ -1187,12 +1187,12 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, (GetPreviousImageInList(image) != (Image *) NULL)) { if (image->scene == 0) - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "iterations=%.20g delay=%.20g ticks-per-second=%.20g\n",(double) image->iterations,(double) image->delay,(double) image->ticks_per_second); else - (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g " + (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g " "iterations=%.20g delay=%.20g ticks-per-second=%.20g\n", (double) image->scene,(double) image->iterations,(double) image->delay,(double) image->ticks_per_second); @@ -1202,51 +1202,51 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, { if (image->scene != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"scene=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"scene=%.20g\n", (double) image->scene); (void) WriteBlobString(image,buffer); } if (image->iterations != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"iterations=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"iterations=%.20g\n", (double) image->iterations); (void) WriteBlobString(image,buffer); } if (image->delay != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"delay=%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"delay=%.20g\n", (double) image->delay); (void) WriteBlobString(image,buffer); } if (image->ticks_per_second != UndefinedTicksPerSecond) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "ticks-per-second=%.20g\n",(double) image->ticks_per_second); (void) WriteBlobString(image,buffer); } } if (image->gravity != UndefinedGravity) { - (void) FormatLocaleString(buffer,MaxTextExtent,"gravity=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"gravity=%s\n", CommandOptionToMnemonic(MagickGravityOptions,image->gravity)); (void) WriteBlobString(image,buffer); } if (image->dispose != UndefinedDispose) { - (void) FormatLocaleString(buffer,MaxTextExtent,"dispose=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"dispose=%s\n", CommandOptionToMnemonic(MagickDisposeOptions,image->dispose)); (void) WriteBlobString(image,buffer); } if (image->rendering_intent != UndefinedIntent) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "rendering-intent=%s\n",CommandOptionToMnemonic(MagickIntentOptions, image->rendering_intent)); (void) WriteBlobString(image,buffer); } if (image->gamma != 0.0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"gamma=%g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"gamma=%g\n", image->gamma); (void) WriteBlobString(image,buffer); } @@ -1255,7 +1255,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, /* Note chomaticity points. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"red-primary=" + (void) FormatLocaleString(buffer,MagickPathExtent,"red-primary=" "%g,%g green-primary=%g,%g blue-primary=%g,%g\n", image->chromaticity.red_primary.x,image->chromaticity.red_primary.y, image->chromaticity.green_primary.x, @@ -1263,14 +1263,14 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, image->chromaticity.blue_primary.x, image->chromaticity.blue_primary.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "white-point=%g,%g\n",image->chromaticity.white_point.x, image->chromaticity.white_point.y); (void) WriteBlobString(image,buffer); } if (image->orientation != UndefinedOrientation) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "orientation=%s\n",CommandOptionToMnemonic(MagickOrientationOptions, image->orientation)); (void) WriteBlobString(image,buffer); @@ -1292,7 +1292,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, profile=GetImageProfile(image,name); if (profile != (StringInfo *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "profile:%s=%.20g\n",name,(double) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); @@ -1302,7 +1302,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, } if (image->montage != (char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent,"montage=%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"montage=%s\n", image->montage); (void) WriteBlobString(image,buffer); } @@ -1310,7 +1310,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, property=GetNextImageProperty(image); while (property != (const char *) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s=",property); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s=",property); (void) WriteBlobString(image,buffer); value=GetImageProperty(image,property,exception); if (value != (const char *) NULL) diff --git a/coders/mpeg.c b/coders/mpeg.c index 0b736011f..12bc8dfc1 100644 --- a/coders/mpeg.c +++ b/coders/mpeg.c @@ -204,7 +204,7 @@ static Image *ReadMPEGImage(const ImageInfo *image_info, image=AcquireImage(image_info,exception); (void) InvokeDelegate(read_info,image,"mpeg:decode",(char *) NULL,exception); image=DestroyImage(image); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s.%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s.%s", read_info->unique,ReadMPEGIntermediateFormat); images=ReadImage(read_info,exception); (void) RelinquishUniqueFileResource(read_info->filename); @@ -437,8 +437,8 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, #define WriteMPEGIntermediateFormat "jpg" char - basename[MaxTextExtent], - filename[MaxTextExtent]; + basename[MagickPathExtent], + filename[MagickPathExtent]; double delay; @@ -493,7 +493,7 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, file=AcquireUniqueFileResource(basename); if (file != -1) file=close(file)-1; - (void) FormatLocaleString(coalesce_image->filename,MaxTextExtent,"%s", + (void) FormatLocaleString(coalesce_image->filename,MagickPathExtent,"%s", basename); count=0; write_info=CloneImageInfo(image_info); @@ -501,7 +501,7 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, for (p=coalesce_image; p != (Image *) NULL; p=GetNextImageInList(p)) { char - previous_image[MaxTextExtent]; + previous_image[MagickPathExtent]; blob=(unsigned char *) NULL; length=0; @@ -519,11 +519,11 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, Image *frame; - (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s", + (void) FormatLocaleString(p->filename,MagickPathExtent,"%s%.20g.%s", basename,(double) p->scene,WriteMPEGIntermediateFormat); - (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s", + (void) FormatLocaleString(filename,MagickPathExtent,"%s%.20g.%s", basename,(double) p->scene,WriteMPEGIntermediateFormat); - (void) FormatLocaleString(previous_image,MaxTextExtent, + (void) FormatLocaleString(previous_image,MagickPathExtent, "%s%.20g.%s",basename,(double) p->scene, WriteMPEGIntermediateFormat); frame=CloneImage(p,0,0,MagickTrue,exception); @@ -540,7 +540,7 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, } default: { - (void) FormatLocaleString(filename,MaxTextExtent,"%s%.20g.%s", + (void) FormatLocaleString(filename,MagickPathExtent,"%s%.20g.%s", basename,(double) p->scene,WriteMPEGIntermediateFormat); if (length > 0) status=BlobToFile(filename,blob,length,exception); @@ -570,14 +570,14 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, Convert JPEG to MPEG. */ (void) CopyMagickString(coalesce_image->magick_filename,basename, - MaxTextExtent); - (void) CopyMagickString(coalesce_image->filename,basename,MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(coalesce_image->filename,basename,MagickPathExtent); GetPathComponent(image_info->filename,ExtensionPath,coalesce_image->magick); if (*coalesce_image->magick == '\0') - (void) CopyMagickString(coalesce_image->magick,image->magick,MaxTextExtent); + (void) CopyMagickString(coalesce_image->magick,image->magick,MagickPathExtent); status=InvokeDelegate(write_info,coalesce_image,(char *) NULL,"mpeg:encode", exception); - (void) FormatLocaleString(write_info->filename,MaxTextExtent,"%s.%s", + (void) FormatLocaleString(write_info->filename,MagickPathExtent,"%s.%s", write_info->unique,coalesce_image->magick); status=CopyDelegateFile(write_info->filename,image->filename); (void) RelinquishUniqueFileResource(write_info->filename); @@ -591,11 +591,11 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, delay=100.0*p->delay/MagickMax(1.0*p->ticks_per_second,1.0); for (i=0; i < (ssize_t) MagickMax((1.0*delay+1.0)/3.0,1.0); i++) { - (void) FormatLocaleString(p->filename,MaxTextExtent,"%s%.20g.%s", + (void) FormatLocaleString(p->filename,MagickPathExtent,"%s%.20g.%s", basename,(double) count++,WriteMPEGIntermediateFormat); (void) RelinquishUniqueFileResource(p->filename); } - (void) CopyMagickString(p->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(p->filename,image_info->filename,MagickPathExtent); } (void) RelinquishUniqueFileResource(basename); coalesce_image=DestroyImageList(coalesce_image); diff --git a/coders/msl.c b/coders/msl.c index 871c77f61..94bfa2bd6 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -202,7 +202,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, ExceptionInfo *exception) { char - key[MaxTextExtent]; + key[MagickPathExtent]; ExceptionInfo *sans_exception; @@ -213,14 +213,14 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, ImageInfo *read_info; - (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path); + (void) FormatLocaleString(key,MagickPathExtent,"cache:%s",path); sans_exception=AcquireExceptionInfo(); image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception); sans_exception=DestroyExceptionInfo(sans_exception); if (image != (Image *) NULL) return(image); read_info=CloneImageInfo(image_info); - (void) CopyMagickString(read_info->filename,path,MaxTextExtent); + (void) CopyMagickString(read_info->filename,path,MagickPathExtent); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) @@ -613,7 +613,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, channel_mask; char - key[MaxTextExtent], + key[MagickPathExtent], *value; const char @@ -758,7 +758,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"annotate") == 0) { char - text[MaxTextExtent]; + text[MagickPathExtent]; /* Annotate image. @@ -1073,7 +1073,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } } - (void) FormatLocaleString(text,MaxTextExtent, + (void) FormatLocaleString(text,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double) geometry.height,(double) geometry.x,(double) geometry.y); CloneString(&draw_info->geometry,text); @@ -1368,7 +1368,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"colorize") == 0) { char - blend[MaxTextExtent]; + blend[MagickPathExtent]; Image *colorize_image; @@ -1386,7 +1386,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, break; } GetPixelInfo(msl_info->image[n],&target); - (void) CopyMagickString(blend,"100",MaxTextExtent); + (void) CopyMagickString(blend,"100",MagickPathExtent); if (attributes != (const xmlChar **) NULL) for (i=0; (attributes[i] != (const xmlChar *) NULL); i++) { @@ -1402,7 +1402,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"blend") == 0) { - (void) CopyMagickString(blend,value,MaxTextExtent); + (void) CopyMagickString(blend,value,MagickPathExtent); break; } ThrowMSLException(OptionError,"UnrecognizedAttribute", @@ -1744,7 +1744,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"composite") == 0) { char - composite_geometry[MaxTextExtent]; + composite_geometry[MagickPathExtent]; CompositeOperator compose; @@ -2065,7 +2065,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } image=msl_info->image[n]; - (void) FormatLocaleString(composite_geometry,MaxTextExtent, + (void) FormatLocaleString(composite_geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns, (double) composite_image->rows,(double) geometry.x,(double) geometry.y); @@ -2366,7 +2366,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"draw") == 0) { char - text[MaxTextExtent]; + text[MagickPathExtent]; /* Annotate image. @@ -2702,7 +2702,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } } - (void) FormatLocaleString(text,MaxTextExtent, + (void) FormatLocaleString(text,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double) geometry.height,(double) geometry.x,(double) geometry.y); CloneString(&draw_info->geometry,text); @@ -3181,7 +3181,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"gamma") == 0) { char - gamma[MaxTextExtent]; + gamma[MagickPathExtent]; PixelInfo pixel; @@ -3243,7 +3243,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"gamma") == 0) { - (void) CopyMagickString(gamma,value,MaxTextExtent); + (void) CopyMagickString(gamma,value,MagickPathExtent); break; } if (LocaleCompare(keyword,"green") == 0) @@ -3276,7 +3276,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } if (*gamma == '\0') - (void) FormatLocaleString(gamma,MaxTextExtent,"%g,%g,%g", + (void) FormatLocaleString(gamma,MagickPathExtent,"%g,%g,%g", (double) pixel.red,(double) pixel.green,(double) pixel.blue); (void) GammaImage(msl_info->image[n],strtod(gamma,(char **) NULL), msl_info->exception); @@ -3296,7 +3296,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { keyword=(const char *) attributes[i++]; CloneString(&value,(const char *) attributes[i]); - (void) CopyMagickString(key,value,MaxTextExtent); + (void) CopyMagickString(key,value,MagickPathExtent); switch (*keyword) { case 'H': @@ -3304,7 +3304,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"height") == 0) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", (double) msl_info->image[n]->rows); (void) SetImageProperty(msl_info->attributes[n],key,value, exception); @@ -3317,7 +3317,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"width") == 0) { - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", + (void) FormatLocaleString(value,MagickPathExtent,"%.20g", (double) msl_info->image[n]->columns); (void) SetImageProperty(msl_info->attributes[n],key,value, exception); @@ -3368,9 +3368,9 @@ static void MSLStartElement(void *context,const xmlChar *tag, *next_image; (void) CopyMagickString(msl_info->image_info[n]->filename, - "xc:",MaxTextExtent); + "xc:",MagickPathExtent); (void) ConcatenateMagickString(msl_info->image_info[n]-> - filename,value,MaxTextExtent); + filename,value,MagickPathExtent); next_image=ReadImage(msl_info->image_info[n],exception); CatchException(exception); if (next_image == (Image *) NULL) @@ -3496,7 +3496,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, { keyword=(const char *) attributes[i++]; CloneString(&value,(const char *) attributes[i]); - (void) CopyMagickString(key,value,MaxTextExtent); + (void) CopyMagickString(key,value,MagickPathExtent); switch (*keyword) { case 'B': @@ -3912,7 +3912,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"modulate") == 0) { char - modulate[MaxTextExtent]; + modulate[MagickPathExtent]; /* Modulate image. @@ -4027,7 +4027,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } } - (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g", + (void) FormatLocaleString(modulate,MagickPathExtent,"%g,%g,%g", geometry_info.rho,geometry_info.sigma,geometry_info.xi); (void) ModulateImage(msl_info->image[n],modulate, msl_info->exception); @@ -4397,8 +4397,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (profile_image == (Image *) NULL) { char - name[MaxTextExtent], - filename[MaxTextExtent]; + name[MagickPathExtent], + filename[MagickPathExtent]; register char *p; @@ -4406,8 +4406,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, StringInfo *profile; - (void) CopyMagickString(filename,keyword,MaxTextExtent); - (void) CopyMagickString(name,keyword,MaxTextExtent); + (void) CopyMagickString(filename,keyword,MagickPathExtent); + (void) CopyMagickString(name,keyword,MagickPathExtent); for (p=filename; *p != '\0'; p++) if ((*p == ':') && (IsPathDirectory(keyword) < 0) && (IsPathAccessible(keyword) == MagickFalse)) @@ -4561,7 +4561,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare((const char *) tag,"query-font-metrics") == 0) { char - text[MaxTextExtent]; + text[MagickPathExtent]; MagickBooleanType status; @@ -4877,7 +4877,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } } - (void) FormatLocaleString(text,MaxTextExtent, + (void) FormatLocaleString(text,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double) geometry.height,(double) geometry.x,(double) geometry.y); CloneString(&draw_info->geometry,text); @@ -5046,7 +5046,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, *image; (void) CopyMagickString(msl_info->image_info[n]->filename, - value,MaxTextExtent); + value,MagickPathExtent); image=ReadImage(msl_info->image_info[n],exception); CatchException(exception); if (image == (Image *) NULL) @@ -6113,7 +6113,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare(keyword, "page") == 0) { char - page[MaxTextExtent]; + page[MagickPathExtent]; const char *image_option; @@ -6129,10 +6129,10 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (image_option != (const char *) NULL) flags=ParseAbsoluteGeometry(image_option,&geometry); flags=ParseAbsoluteGeometry(value,&geometry); - (void) FormatLocaleString(page,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(page,MagickPathExtent,"%.20gx%.20g", (double) geometry.width,(double) geometry.height); if (((flags & XValue) != 0) || ((flags & YValue) != 0)) - (void) FormatLocaleString(page,MaxTextExtent, + (void) FormatLocaleString(page,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) geometry.width, (double) geometry.height,(double) geometry.x,(double) geometry.y); @@ -7291,7 +7291,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, if (LocaleCompare(keyword,"filename") == 0) { (void) CopyMagickString(msl_info->image[n]->filename,value, - MaxTextExtent); + MagickPathExtent); break; } (void) SetMSLAttributes(msl_info,keyword,value); @@ -7444,13 +7444,13 @@ static void MSLCharacters(void *context,const xmlChar *c,int length) msl_info=(MSLInfo *) context; if (msl_info->content != (char *) NULL) msl_info->content=(char *) ResizeQuantumMemory(msl_info->content, - strlen(msl_info->content)+length+MaxTextExtent, + strlen(msl_info->content)+length+MagickPathExtent, sizeof(*msl_info->content)); else { msl_info->content=(char *) NULL; - if (~length >= (MaxTextExtent-1)) - msl_info->content=(char *) AcquireQuantumMemory(length+MaxTextExtent, + if (~length >= (MagickPathExtent-1)) + msl_info->content=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*msl_info->content)); if (msl_info->content != (char *) NULL) *msl_info->content='\0'; @@ -7532,7 +7532,7 @@ static void MSLWarning(void *context,const char *format,...) { char *message, - reason[MaxTextExtent]; + reason[MagickPathExtent]; MSLInfo *msl_info; @@ -7552,7 +7552,7 @@ static void MSLWarning(void *context,const char *format,...) #if !defined(MAGICKCORE_HAVE_VSNPRINTF) (void) vsprintf(reason,format,operands); #else - (void) vsnprintf(reason,MaxTextExtent,format,operands); + (void) vsnprintf(reason,MagickPathExtent,format,operands); #endif message=GetExceptionMessage(errno); ThrowMSLException(CoderError,reason,message); @@ -7563,7 +7563,7 @@ static void MSLWarning(void *context,const char *format,...) static void MSLError(void *context,const char *format,...) { char - reason[MaxTextExtent]; + reason[MagickPathExtent]; MSLInfo *msl_info; @@ -7583,7 +7583,7 @@ static void MSLError(void *context,const char *format,...) #if !defined(MAGICKCORE_HAVE_VSNPRINTF) (void) vsprintf(reason,format,operands); #else - (void) vsnprintf(reason,MaxTextExtent,format,operands); + (void) vsnprintf(reason,MagickPathExtent,format,operands); #endif ThrowMSLException(DelegateFatalError,reason,"SAX error"); va_end(operands); @@ -7692,7 +7692,7 @@ static MagickBooleanType ProcessMSLScript(const ImageInfo *image_info, Image **image,ExceptionInfo *exception) { char - message[MaxTextExtent]; + message[MagickPathExtent]; Image *msl_image; @@ -8063,7 +8063,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword, } if (LocaleCompare(keyword,"filename") == 0) { - (void) CopyMagickString(image_info->filename,value,MaxTextExtent); + (void) CopyMagickString(image_info->filename,value,MagickPathExtent); break; } ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword); @@ -8102,7 +8102,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword, { if (LocaleCompare(keyword,"magick") == 0) { - (void) CopyMagickString(image_info->magick,value,MaxTextExtent); + (void) CopyMagickString(image_info->magick,value,MagickPathExtent); break; } if (LocaleCompare(keyword,"mattecolor") == 0) diff --git a/coders/mtv.c b/coders/mtv.c index 0e925b630..335f870b4 100644 --- a/coders/mtv.c +++ b/coders/mtv.c @@ -95,7 +95,7 @@ static MagickBooleanType static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; Image *image; @@ -324,7 +324,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; MagickBooleanType status; @@ -375,7 +375,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, /* Initialize raster file header. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n",(double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); for (y=0; y < (ssize_t) image->rows; y++) diff --git a/coders/mvg.c b/coders/mvg.c index 3ae33fd96..5e90e478f 100644 --- a/coders/mvg.c +++ b/coders/mvg.c @@ -157,7 +157,7 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((image->columns == 0) || (image->rows == 0)) { char - primitive[MaxTextExtent]; + primitive[MagickPathExtent]; register char *p; diff --git a/coders/pango.c b/coders/pango.c index 1ba0e08bb..c3de44913 100644 --- a/coders/pango.c +++ b/coders/pango.c @@ -490,14 +490,14 @@ static Image *ReadPANGOImage(const ImageInfo *image_info, ModuleExport size_t RegisterPANGOImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(PANGO_VERSION_STRING) - (void) FormatLocaleString(version,MaxTextExtent,"Pangocairo %s", + (void) FormatLocaleString(version,MagickPathExtent,"Pangocairo %s", PANGO_VERSION_STRING); #endif entry=AcquireMagickInfo("PANGO","PANGO","Pango Markup Language"); diff --git a/coders/pattern.c b/coders/pattern.c index cad1be4ce..b5967781f 100644 --- a/coders/pattern.c +++ b/coders/pattern.c @@ -844,8 +844,8 @@ static const unsigned char typedef struct _PatternInfo { char - name[MaxTextExtent], - magick[MaxTextExtent]; + name[MagickPathExtent], + magick[MagickPathExtent]; const void *blob; @@ -971,7 +971,7 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info, if (LocaleCompare(blob_info->filename,PatternImageList[i].name) == 0) { (void) CopyMagickString(blob_info->magick,PatternImageList[i].magick, - MaxTextExtent); + MagickPathExtent); blob=PatternImageList[i].blob; extent=PatternImageList[i].extent; break; diff --git a/coders/pcd.c b/coders/pcd.c index 298b426f4..c603d3c52 100644 --- a/coders/pcd.c +++ b/coders/pcd.c @@ -407,7 +407,7 @@ static Image *OverviewImage(const ImageInfo *image_info,Image *image, } montage_info=CloneMontageInfo(image_info,(MontageInfo *) NULL); (void) CopyMagickString(montage_info->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); montage_image=MontageImageList(image_info,montage_info,image,exception); montage_info=DestroyMontageInfo(montage_info); if (montage_image == (Image *) NULL) @@ -636,9 +636,9 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception) { progress_monitor=SetImageProgressMonitor(image, (MagickProgressMonitor) NULL,image->client_data); - (void) FormatLocaleString(image->filename,MaxTextExtent, + (void) FormatLocaleString(image->filename,MagickPathExtent, "images/img%04ld.pcd",(long) j); - (void) FormatLocaleString(image->magick_filename,MaxTextExtent, + (void) FormatLocaleString(image->magick_filename,MagickPathExtent, "images/img%04ld.pcd",(long) j); image->scene=(size_t) j; image->columns=width; diff --git a/coders/pcl.c b/coders/pcl.c index 81163c145..ef757f3bc 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -151,12 +151,12 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) #define RenderPCLText " Rendering PCL... " char - command[MaxTextExtent], + command[MagickPathExtent], *density, - filename[MaxTextExtent], - geometry[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], *options, - input_filename[MaxTextExtent]; + input_filename[MagickPathExtent]; const char *option; @@ -261,7 +261,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) */ *p++=(char) c; if ((c != (int) '/') && (c != '\n') && - ((size_t) (p-command) < (MaxTextExtent-1))) + ((size_t) (p-command) < (MagickPathExtent-1))) continue; *p='\0'; p=command; @@ -312,7 +312,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char *) NULL) (void) ParseAbsoluteGeometry(image_info->page,&page); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double) + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",(double) page.width,(double) page.height); if (image_info->monochrome != MagickFalse) delegate_info=GetDelegateInfo("pcl:mono",(char *) NULL,exception); @@ -329,11 +329,11 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ParseAbsoluteGeometry(image_info->page,&page); density=AcquireString(""); options=AcquireString(""); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x, + (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",image->resolution.x, image->resolution.y); page.width=(size_t) floor(page.width*image->resolution.x/delta.x+0.5); page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5); - (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) + (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double) page.width,(double) page.height); image=DestroyImage(image); read_info=CloneImageInfo(image_info); @@ -341,10 +341,10 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) if (read_info->number_scenes != 0) { if (read_info->number_scenes != 1) - (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g", + (void) FormatLocaleString(options,MagickPathExtent,"-dLastPage=%.20g", (double) (read_info->scene+read_info->number_scenes)); else - (void) FormatLocaleString(options,MaxTextExtent, + (void) FormatLocaleString(options,MagickPathExtent, "-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1, (double) (read_info->scene+read_info->number_scenes)); read_info->number_scenes=0; @@ -353,11 +353,11 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) } option=GetImageOption(image_info,"authenticate"); if (option != (const char *) NULL) - (void) FormatLocaleString(options+strlen(options),MaxTextExtent, + (void) FormatLocaleString(options+strlen(options),MagickPathExtent, " -sPCLPassword=%s",option); - (void) CopyMagickString(filename,read_info->filename,MaxTextExtent); + (void) CopyMagickString(filename,read_info->filename,MagickPathExtent); (void) AcquireUniqueFilename(read_info->filename); - (void) FormatLocaleString(command,MaxTextExtent, + (void) FormatLocaleString(command,MagickPathExtent, GetDelegateCommands(delegate_info), read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options, @@ -386,7 +386,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) } do { - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); image->page=page; next_image=SyncNextImageInList(image); if (next_image != (Image *) NULL) @@ -663,7 +663,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; CompressionType compression; @@ -731,10 +731,10 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) WriteBlobString(image,"\033E"); /* printer reset */ (void) WriteBlobString(image,"\033*r3F"); /* set presentation mode */ - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*r%.20gs%.20gT", + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*r%.20gs%.20gT", (double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*t%.20gR",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*t%.20gR",(double) density); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"\033&l0E"); /* top margin 0 */ @@ -775,7 +775,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, (void) WriteBlobByte(image,8); /* bits per blue component */ for (i=0; i < (ssize_t) image->colors; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\033*v%da%db%dc%.20gI", ScaleQuantumToChar(image->colormap[i].red), ScaleQuantumToChar(image->colormap[i].green), @@ -784,7 +784,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, } for (one=1; i < (ssize_t) (one << bits_per_pixel); i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*v%.20gI", + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*v%.20gI", (double) i); (void) WriteBlobString(image,buffer); } @@ -810,7 +810,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b0M"); + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b0M"); (void) WriteBlobString(image,buffer); break; } @@ -825,7 +825,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, } (void) ResetMagickMemory(compress_pixels,0,(length+256)* sizeof(*compress_pixels)); - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b2M"); + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b2M"); (void) WriteBlobString(image,buffer); break; } @@ -851,7 +851,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, } (void) ResetMagickMemory(previous_pixels,0,(length+1)* sizeof(*previous_pixels)); - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b3M"); + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b3M"); (void) WriteBlobString(image,buffer); break; } @@ -925,7 +925,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW", + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW", (double) length); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,length,pixels); @@ -934,7 +934,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, case RLECompression: { packets=PCLPackbitsCompressImage(length,pixels,compress_pixels); - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW", + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW", (double) packets); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,packets,compress_pixels); @@ -947,7 +947,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, previous_pixels[i]=(~pixels[i]); packets=PCLDeltaCompressImage(length,previous_pixels,pixels, compress_pixels); - (void) FormatLocaleString(buffer,MaxTextExtent,"\033*b%.20gW", + (void) FormatLocaleString(buffer,MagickPathExtent,"\033*b%.20gW", (double) packets); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,packets,compress_pixels); diff --git a/coders/pdb.c b/coders/pdb.c index d1dfaa46f..6ab2f97b9 100644 --- a/coders/pdb.c +++ b/coders/pdb.c @@ -568,16 +568,16 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) Read comment. */ c=ReadBlobByte(image); - length=MaxTextExtent; + length=MagickPathExtent; comment=AcquireString((char *) NULL); for (p=comment; c != EOF; p++) { - if ((size_t) (p-comment+MaxTextExtent) >= length) + if ((size_t) (p-comment+MagickPathExtent) >= length) { *p='\0'; length<<=1; - length+=MaxTextExtent; - comment=(char *) ResizeQuantumMemory(comment,length+MaxTextExtent, + length+=MagickPathExtent; + comment=(char *) ResizeQuantumMemory(comment,length+MagickPathExtent, sizeof(*comment)); if (comment == (char *) NULL) break; diff --git a/coders/pdf.c b/coders/pdf.c index 7376bdaf0..d6b0f0b47 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -263,7 +263,7 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose, { SetArgsStart(command,args_start); if (status == -101) /* quit */ - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "[ghostscript library %.2f]%s: %s",(double)revision.revision / 100, args_start,errors); else @@ -380,14 +380,14 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) #define PDFVersion "PDF-" char - command[MaxTextExtent], + command[MagickPathExtent], *density, - filename[MaxTextExtent], - geometry[MaxTextExtent], - input_filename[MaxTextExtent], - message[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], + input_filename[MagickPathExtent], + message[MagickPathExtent], *options, - postscript_filename[MaxTextExtent]; + postscript_filename[MagickPathExtent]; const char *option; @@ -525,7 +525,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) c=' '; *p++=(char) c; if ((c != (int) '/') && (c != (int) '%') && - ((size_t) (p-command) < (MaxTextExtent-1))) + ((size_t) (p-command) < (MagickPathExtent-1))) continue; *(--p)='\0'; p=command; @@ -543,8 +543,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) if (LocaleNCompare(SpotColor,command,strlen(SpotColor)) == 0) { char - name[MaxTextExtent], - property[MaxTextExtent], + name[MagickPathExtent], + property[MagickPathExtent], *value; register ssize_t @@ -553,12 +553,12 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Note spot names. */ - (void) FormatLocaleString(property,MaxTextExtent,"pdf:SpotColor-%.20g", + (void) FormatLocaleString(property,MagickPathExtent,"pdf:SpotColor-%.20g", (double) spotcolor++); i=0; for (c=ReadBlobByte(image); c != EOF; c=ReadBlobByte(image)) { - if ((isspace(c) != 0) || (c == '/') || ((i+1) == MaxTextExtent)) + if ((isspace(c) != 0) || (c == '/') || ((i+1) == MagickPathExtent)) break; name[i++]=(char) c; } @@ -628,7 +628,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Set PDF render geometry. */ - (void) FormatLocaleString(geometry,MaxTextExtent,"%gx%g%+.15g%+.15g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g%+.15g%+.15g", hires_bounds.x2-bounds.x1,hires_bounds.y2-hires_bounds.y1, hires_bounds.x1,hires_bounds.y1); (void) SetImageProperty(image,"pdf:HiResBoundingBox",geometry,exception); @@ -707,45 +707,45 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) } density=AcquireString(""); options=AcquireString(""); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",image->resolution.x, + (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",image->resolution.x, image->resolution.y); if ((image_info->page != (char *) NULL) || (fitPage != MagickFalse)) - (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) + (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double) page.width,(double) page.height); if (fitPage != MagickFalse) - (void) ConcatenateMagickString(options,"-dPSFitPage ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dPSFitPage ",MagickPathExtent); if (cmyk != MagickFalse) - (void) ConcatenateMagickString(options,"-dUseCIEColor ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dUseCIEColor ",MagickPathExtent); if (cropbox != MagickFalse) - (void) ConcatenateMagickString(options,"-dUseCropBox ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dUseCropBox ",MagickPathExtent); if (stop_on_error != MagickFalse) - (void) ConcatenateMagickString(options,"-dPDFSTOPONERROR ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dPDFSTOPONERROR ",MagickPathExtent); if (trimbox != MagickFalse) - (void) ConcatenateMagickString(options,"-dUseTrimBox ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dUseTrimBox ",MagickPathExtent); read_info=CloneImageInfo(image_info); *read_info->magick='\0'; if (read_info->number_scenes != 0) { char - pages[MaxTextExtent]; + pages[MagickPathExtent]; - (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g " + (void) FormatLocaleString(pages,MagickPathExtent,"-dFirstPage=%.20g " "-dLastPage=%.20g",(double) read_info->scene+1,(double) (read_info->scene+read_info->number_scenes)); - (void) ConcatenateMagickString(options,pages,MaxTextExtent); + (void) ConcatenateMagickString(options,pages,MagickPathExtent); read_info->number_scenes=0; if (read_info->scenes != (char *) NULL) *read_info->scenes='\0'; } option=GetImageOption(image_info,"authenticate"); if (option != (const char *) NULL) - (void) FormatLocaleString(options+strlen(options),MaxTextExtent, + (void) FormatLocaleString(options+strlen(options),MagickPathExtent, " -sPCLPassword=%s",option); - (void) CopyMagickString(filename,read_info->filename,MaxTextExtent); + (void) CopyMagickString(filename,read_info->filename,MagickPathExtent); (void) AcquireUniqueFilename(filename); (void) RelinquishUniqueFileResource(filename); - (void) ConcatenateMagickString(filename,"%d",MaxTextExtent); - (void) FormatLocaleString(command,MaxTextExtent, + (void) ConcatenateMagickString(filename,"%d",MagickPathExtent); + (void) FormatLocaleString(command,MagickPathExtent, GetDelegateCommands(delegate_info), read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options,filename, @@ -822,8 +822,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) } do { - (void) CopyMagickString(pdf_image->filename,filename,MaxTextExtent); - (void) CopyMagickString(pdf_image->magick,image->magick,MaxTextExtent); + (void) CopyMagickString(pdf_image->filename,filename,MagickPathExtent); + (void) CopyMagickString(pdf_image->magick,image->magick,MagickPathExtent); pdf_image->page=page; (void) CloneImageProfiles(pdf_image,image); (void) CloneImageProperties(pdf_image,image); @@ -973,11 +973,11 @@ static char *EscapeParenthesis(const char *text) escapes; static char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; escapes=0; p=buffer; - for (i=0; i < (ssize_t) MagickMin(strlen(text),(MaxTextExtent-escapes-1)); i++) + for (i=0; i < (ssize_t) MagickMin(strlen(text),(MagickPathExtent-escapes-1)); i++) { if ((text[i] == '(') || (text[i] == ')')) { @@ -1010,8 +1010,8 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info, status=MagickTrue; write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent); - (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent); + (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent); + (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent); group4_image=CloneImage(inject_image,0,0,MagickTrue,exception); if (group4_image == (Image *) NULL) return(MagickFalse); @@ -1078,11 +1078,11 @@ DisableMSCWarning(4310) RestoreMSCWarning char - basename[MaxTextExtent], - buffer[MaxTextExtent], - date[MaxTextExtent], + basename[MagickPathExtent], + buffer[MagickPathExtent], + date[MagickPathExtent], **labels, - page_geometry[MaxTextExtent]; + page_geometry[MagickPathExtent]; CompressionType compression; @@ -1189,7 +1189,7 @@ RestoreMSCWarning version=(size_t) MagickMax(version,4); if (LocaleCompare(image_info->magick,"PDFA") == 0) version=(size_t) MagickMax(version,6); - (void) FormatLocaleString(buffer,MaxTextExtent,"%%PDF-1.%.20g \n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%%PDF-1.%.20g \n",(double) version); (void) WriteBlobString(image,buffer); if (LocaleCompare(image_info->magick,"PDFA") == 0) @@ -1206,19 +1206,19 @@ RestoreMSCWarning */ xref[object++]=TellBlob(image); root_id=object; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); if (LocaleCompare(image_info->magick,"PDFA") != 0) - (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Pages %.20g 0 R\n",(double) object+1); else { - (void) FormatLocaleString(buffer,MaxTextExtent,"/Metadata %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Metadata %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Pages %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Pages %.20g 0 R\n", (double) object+2); } (void) WriteBlobString(image,buffer); @@ -1229,10 +1229,10 @@ RestoreMSCWarning if (LocaleCompare(image_info->magick,"PDFA") == 0) { char - create_date[MaxTextExtent], - modify_date[MaxTextExtent], - timestamp[MaxTextExtent], - xmp_profile[MaxTextExtent]; + create_date[MagickPathExtent], + modify_date[MagickPathExtent], + timestamp[MagickPathExtent], + xmp_profile[MagickPathExtent]; size_t version; @@ -1241,7 +1241,7 @@ RestoreMSCWarning Write XMP object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); @@ -1249,17 +1249,17 @@ RestoreMSCWarning *modify_date='\0'; value=GetImageProperty(image,"date:modify",exception); if (value != (const char *) NULL) - (void) CopyMagickString(modify_date,value,MaxTextExtent); + (void) CopyMagickString(modify_date,value,MagickPathExtent); *create_date='\0'; value=GetImageProperty(image,"date:create",exception); if (value != (const char *) NULL) - (void) CopyMagickString(create_date,value,MaxTextExtent); - (void) FormatMagickTime(time((time_t *) NULL),MaxTextExtent,timestamp); - i=FormatLocaleString(xmp_profile,MaxTextExtent,XMPProfile, + (void) CopyMagickString(create_date,value,MagickPathExtent); + (void) FormatMagickTime(time((time_t *) NULL),MagickPathExtent,timestamp); + i=FormatLocaleString(xmp_profile,MagickPathExtent,XMPProfile, XMPProfileMagick,modify_date,create_date,timestamp, GetMagickVersion(&version),EscapeParenthesis(basename), GetMagickVersion(&version)); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g\n",(double) i); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/Type /Metadata\n"); @@ -1273,12 +1273,12 @@ RestoreMSCWarning */ xref[object++]=TellBlob(image); pages_id=object; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /Pages\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Kids [ %.20g 0 R ",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Kids [ %.20g 0 R ",(double) object+1); (void) WriteBlobString(image,buffer); count=(ssize_t) (pages_id+ObjectsPerImage+1); @@ -1293,7 +1293,7 @@ RestoreMSCWarning kid_image=image; for ( ; GetNextImageInList(kid_image) != (Image *) NULL; count+=ObjectsPerImage) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 R ",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 R ",(double) count); (void) WriteBlobString(image,buffer); kid_image=GetNextImageInList(kid_image); @@ -1304,7 +1304,7 @@ RestoreMSCWarning ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); } (void) WriteBlobString(image,"]\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Count %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Count %.20g\n",(double) ((count-pages_id)/ObjectsPerImage)); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -1401,20 +1401,20 @@ RestoreMSCWarning resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0); } SetGeometry(image,&geometry); - (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g",(double) + (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g",(double) image->columns,(double) image->rows); if (image_info->page != (char *) NULL) - (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); + (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent); else if ((image->page.width != 0) && (image->page.height != 0)) - (void) FormatLocaleString(page_geometry,MaxTextExtent, + (void) FormatLocaleString(page_geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PDF") == 0)) - (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent); - (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent); + (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent); + (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent); (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); scale.x=(double) (geometry.width*delta.x)/resolution.x; @@ -1440,12 +1440,12 @@ RestoreMSCWarning Write Page object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /Page\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Parent %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Parent %.20g 0 R\n", (double) pages_id); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/Resources <<\n"); @@ -1455,30 +1455,30 @@ RestoreMSCWarning labels=StringToList(value); if (labels != (char **) NULL) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "/Font << /F%.20g %.20g 0 R >>\n",(double) image->scene,(double) object+4); (void) WriteBlobString(image,buffer); } - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "/XObject << /Im%.20g %.20g 0 R >>\n",(double) image->scene,(double) object+5); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/ProcSet %.20g 0 R >>\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/ProcSet %.20g 0 R >>\n", (double) object+3); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "/MediaBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x, 72.0*media_info.height/resolution.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "/CropBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x, 72.0*media_info.height/resolution.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Contents %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Contents %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Thumb %.20g 0 R\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Thumb %.20g 0 R\n",(double) object+8); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -1487,11 +1487,11 @@ RestoreMSCWarning Write Contents object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -1502,22 +1502,22 @@ RestoreMSCWarning for (i=0; labels[i] != (char *) NULL; i++) { (void) WriteBlobString(image,"BT\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/F%.20g %g Tf\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/F%.20g %g Tf\n", (double) image->scene,pointsize); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g Td\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g Td\n", (double) geometry.x,(double) (geometry.y+geometry.height+i*pointsize+ 12)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"(%s) Tj\n",labels[i]); + (void) FormatLocaleString(buffer,MagickPathExtent,"(%s) Tj\n",labels[i]); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"ET\n"); labels[i]=DestroyString(labels[i]); } - (void) FormatLocaleString(buffer,MaxTextExtent,"%g 0 0 %g %.20g %.20g cm\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%g 0 0 %g %.20g %.20g cm\n", scale.x,scale.y,(double) geometry.x,(double) geometry.y); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Im%.20g Do\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Im%.20g Do\n",(double) image->scene); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"Q\n"); @@ -1528,26 +1528,26 @@ RestoreMSCWarning Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* Write Procset object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); if ((image->storage_class == DirectClass) || (image->colors > 256)) - (void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MaxTextExtent); + (void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MagickPathExtent); else if ((compression == FaxCompression) || (compression == Group4Compression)) - (void) CopyMagickString(buffer,"[ /PDF /Text /ImageB",MaxTextExtent); + (void) CopyMagickString(buffer,"[ /PDF /Text /ImageB",MagickPathExtent); else - (void) CopyMagickString(buffer,"[ /PDF /Text /ImageI",MaxTextExtent); + (void) CopyMagickString(buffer,"[ /PDF /Text /ImageI",MagickPathExtent); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image," ]\n"); (void) WriteBlobString(image,"endobj\n"); @@ -1555,7 +1555,7 @@ RestoreMSCWarning Write Font object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); @@ -1563,7 +1563,7 @@ RestoreMSCWarning { (void) WriteBlobString(image,"/Type /Font\n"); (void) WriteBlobString(image,"/Subtype /Type1\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /F%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /F%.20g\n", (double) image->scene); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/BaseFont /Helvetica\n"); @@ -1576,91 +1576,91 @@ RestoreMSCWarning Write XObject object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /XObject\n"); (void) WriteBlobString(image,"/Subtype /Image\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Im%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /Im%.20g\n",(double) image->scene); (void) WriteBlobString(image,buffer); switch (compression) { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"ASCII85Decode"); break; } case JPEGCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"DCTDecode"); if (image->colorspace != CMYKColorspace) break; (void) WriteBlobString(image,buffer); (void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n", - MaxTextExtent); + MagickPathExtent); break; } case JPEG2000Compression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"JPXDecode"); if (image->colorspace != CMYKColorspace) break; (void) WriteBlobString(image,buffer); (void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n", - MaxTextExtent); + MagickPathExtent); break; } case LZWCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode"); break; } case ZipCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"FlateDecode"); break; } case FaxCompression: case Group4Compression: { (void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n", - MaxTextExtent); + MagickPathExtent); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << " + (void) FormatLocaleString(buffer,MagickPathExtent,"/DecodeParms [ << " "/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam, (double) image->columns,(double) image->rows); break; } default: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat, + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat, "RunLengthDecode"); break; } } (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double) image->columns); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n",(double) image->rows); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/ColorSpace %.20g 0 R\n", (double) object+2); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n", (compression == FaxCompression) || (compression == Group4Compression) ? 1 : 8); (void) WriteBlobString(image,buffer); if (image->alpha_trait != UndefinedPixelTrait) { - (void) FormatLocaleString(buffer,MaxTextExtent,"/SMask %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/SMask %.20g 0 R\n", (double) object+7); (void) WriteBlobString(image,buffer); } - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -2003,34 +2003,34 @@ RestoreMSCWarning Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* Write Colorspace object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); if (image->colorspace == CMYKColorspace) - (void) CopyMagickString(buffer,"/DeviceCMYK\n",MaxTextExtent); + (void) CopyMagickString(buffer,"/DeviceCMYK\n",MagickPathExtent); else if ((compression == FaxCompression) || (compression == Group4Compression) || ((image_info->type != TrueColorType) && (SetImageGray(image,exception) != MagickFalse))) - (void) CopyMagickString(buffer,"/DeviceGray\n",MaxTextExtent); + (void) CopyMagickString(buffer,"/DeviceGray\n",MagickPathExtent); else if ((image->storage_class == DirectClass) || (image->colors > 256) || (compression == JPEGCompression) || (compression == JPEG2000Compression)) - (void) CopyMagickString(buffer,"/DeviceRGB\n",MaxTextExtent); + (void) CopyMagickString(buffer,"/DeviceRGB\n",MagickPathExtent); else - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "[ /Indexed /DeviceRGB %.20g %.20g 0 R ]\n",(double) image->colors- 1,(double) object+3); (void) WriteBlobString(image,buffer); @@ -2045,7 +2045,7 @@ RestoreMSCWarning if (tile_image == (Image *) NULL) return(MagickFalse); xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); @@ -2053,72 +2053,72 @@ RestoreMSCWarning { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"ASCII85Decode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"ASCII85Decode"); break; } case JPEGCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"DCTDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"DCTDecode"); if (image->colorspace != CMYKColorspace) break; (void) WriteBlobString(image,buffer); (void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n", - MaxTextExtent); + MagickPathExtent); break; } case JPEG2000Compression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"JPXDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"JPXDecode"); if (image->colorspace != CMYKColorspace) break; (void) WriteBlobString(image,buffer); (void) CopyMagickString(buffer,"/Decode [1 0 1 0 1 0 1 0]\n", - MaxTextExtent); + MagickPathExtent); break; } case LZWCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode"); break; } case ZipCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"FlateDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"FlateDecode"); break; } case FaxCompression: case Group4Compression: { (void) CopyMagickString(buffer,"/Filter [ /CCITTFaxDecode ]\n", - MaxTextExtent); + MagickPathExtent); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/DecodeParms [ << " + (void) FormatLocaleString(buffer,MagickPathExtent,"/DecodeParms [ << " "/K %s /BlackIs1 false /Columns %.20g /Rows %.20g >> ]\n",CCITTParam, (double) tile_image->columns,(double) tile_image->rows); break; } default: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat, + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat, "RunLengthDecode"); break; } } (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double) tile_image->columns); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n",(double) tile_image->rows); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/ColorSpace %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/ColorSpace %.20g 0 R\n", (double) object-1); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n", (compression == FaxCompression) || (compression == Group4Compression) ? 1 : 8); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -2444,14 +2444,14 @@ RestoreMSCWarning Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); @@ -2465,7 +2465,7 @@ RestoreMSCWarning */ if (compression == NoCompression) (void) WriteBlobString(image,"/Filter [ /ASCII85Decode ]\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -2502,10 +2502,10 @@ RestoreMSCWarning Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); @@ -2513,7 +2513,7 @@ RestoreMSCWarning Write softmask object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); @@ -2523,48 +2523,48 @@ RestoreMSCWarning { (void) WriteBlobString(image,"/Type /XObject\n"); (void) WriteBlobString(image,"/Subtype /Image\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Name /Ma%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Name /Ma%.20g\n", (double) image->scene); (void) WriteBlobString(image,buffer); switch (compression) { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat, + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat, "ASCII85Decode"); break; } case LZWCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat,"LZWDecode"); + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat,"LZWDecode"); break; } case ZipCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat, + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat, "FlateDecode"); break; } default: { - (void) FormatLocaleString(buffer,MaxTextExtent,CFormat, + (void) FormatLocaleString(buffer,MagickPathExtent,CFormat, "RunLengthDecode"); break; } } (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Width %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Width %.20g\n",(double) image->columns); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Height %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Height %.20g\n", (double) image->rows); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/ColorSpace /DeviceGray\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/BitsPerComponent %d\n", (compression == FaxCompression) || (compression == Group4Compression) ? 1 : 8); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Length %.20g 0 R\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Length %.20g 0 R\n", (double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -2652,10 +2652,10 @@ RestoreMSCWarning Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); if (GetNextImageInList(image) == (Image *) NULL) @@ -2671,11 +2671,11 @@ RestoreMSCWarning */ xref[object++]=TellBlob(image); info_id=object; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g 0 obj\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g 0 obj\n",(double) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Title (%s)\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Title (%s)\n", EscapeParenthesis(basename)); (void) WriteBlobString(image,buffer); seconds=time((time_t *) NULL); @@ -2684,14 +2684,14 @@ RestoreMSCWarning #else (void) memcpy(&local_time,localtime(&seconds),sizeof(local_time)); #endif - (void) FormatLocaleString(date,MaxTextExtent,"D:%04d%02d%02d%02d%02d%02d", + (void) FormatLocaleString(date,MagickPathExtent,"D:%04d%02d%02d%02d%02d%02d", local_time.tm_year+1900,local_time.tm_mon+1,local_time.tm_mday, local_time.tm_hour,local_time.tm_min,local_time.tm_sec); - (void) FormatLocaleString(buffer,MaxTextExtent,"/CreationDate (%s)\n",date); + (void) FormatLocaleString(buffer,MagickPathExtent,"/CreationDate (%s)\n",date); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/ModDate (%s)\n",date); + (void) FormatLocaleString(buffer,MagickPathExtent,"/ModDate (%s)\n",date); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Producer (%s)\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/Producer (%s)\n", EscapeParenthesis(GetMagickVersion((size_t *) NULL))); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); @@ -2702,35 +2702,35 @@ RestoreMSCWarning offset=TellBlob(image)-xref[0]+ (LocaleCompare(image_info->magick,"PDFA") == 0 ? 6 : 0)+10; (void) WriteBlobString(image,"xref\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"0 %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"0 %.20g\n",(double) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"0000000000 65535 f \n"); for (i=0; i < (ssize_t) object; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%010lu 00000 n \n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%010lu 00000 n \n", (unsigned long) xref[i]); (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"trailer\n"); (void) WriteBlobString(image,"<<\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Size %.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Size %.20g\n",(double) object+1); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Info %.20g 0 R\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Info %.20g 0 R\n",(double) info_id); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"/Root %.20g 0 R\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"/Root %.20g 0 R\n",(double) root_id); (void) WriteBlobString(image,buffer); (void) SignatureImage(image,exception); - (void) FormatLocaleString(buffer,MaxTextExtent,"/ID [<%s> <%s>]\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"/ID [<%s> <%s>]\n", GetImageProperty(image,"signature",exception), GetImageProperty(image,"signature",exception)); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"startxref\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) offset); + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"%%EOF\n"); xref=(MagickOffsetType *) RelinquishMagickMemory(xref); diff --git a/coders/pes.c b/coders/pes.c index 38cea7c84..3c04932ec 100644 --- a/coders/pes.c +++ b/coders/pes.c @@ -421,7 +421,7 @@ static MagickBooleanType IsPES(const unsigned char *magick,const size_t length) static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -653,16 +653,16 @@ static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception) */ read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"svg:%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"svg:%s", filename); image=ReadImage(read_info,exception); if (image != (Image *) NULL) { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); (void) CopyMagickString(image->magick_filename,image_info->filename, - MaxTextExtent); - (void) CopyMagickString(image->magick,"PES",MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(image->magick,"PES",MagickPathExtent); } read_info=DestroyImageInfo(read_info); (void) RelinquishUniqueFileResource(filename); diff --git a/coders/pict.c b/coders/pict.c index bf7f0cd82..4f51eb393 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -806,7 +806,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - geometry[MaxTextExtent], + geometry[MagickPathExtent], header_ole[4]; Image @@ -1413,7 +1413,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info, { (void) RelinquishUniqueFileResource(read_info->filename); (void) CopyMagickString(image->filename,read_info->filename, - MaxTextExtent); + MagickPathExtent); ThrowFileException(exception,FileOpenError, "UnableToCreateTemporaryFile",image->filename); image=DestroyImageList(image); @@ -1448,7 +1448,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info, read_info=DestroyImageInfo(read_info); if (tile_image == (Image *) NULL) continue; - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g", (double) MagickMax(image->columns,tile_image->columns), (double) MagickMax(image->rows,tile_image->rows)); (void) SetImageExtent(image, @@ -1811,7 +1811,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, return(MagickFalse); } jpeg_info=CloneImageInfo(image_info); - (void) CopyMagickString(jpeg_info->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(jpeg_info->magick,"JPEG",MagickPathExtent); length=0; blob=(unsigned char *) ImageToBlob(jpeg_info,jpeg_image,&length, exception); diff --git a/coders/plasma.c b/coders/plasma.c index 77a8e02ca..05854429f 100644 --- a/coders/plasma.c +++ b/coders/plasma.c @@ -146,7 +146,7 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info, */ read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) FormatLocaleString(read_info->filename,MaxTextExtent, + (void) FormatLocaleString(read_info->filename,MagickPathExtent, "gradient:%s",image_info->filename); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); diff --git a/coders/png.c b/coders/png.c index 371918573..cf8cf8a38 100644 --- a/coders/png.c +++ b/coders/png.c @@ -1350,9 +1350,9 @@ static void png_get_data(png_structp png_ptr,png_bytep data,png_size_t length) if (check != length) { char - msg[MaxTextExtent]; + msg[MagickPathExtent]; - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "Expected %.20g bytes; found %.20g bytes",(double) length, (double) check); png_warning(png_ptr,msg); @@ -2335,12 +2335,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, /* Save bit-depth and color-type in case we later want to write a PNG00 */ { char - msg[MaxTextExtent]; + msg[MagickPathExtent]; - (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type); + (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_color_type); (void) SetImageProperty(image,"png:IHDR.color-type-orig",msg,exception); - (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth); + (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_bit_depth); (void) SetImageProperty(image,"png:IHDR.bit-depth-orig",msg,exception); } @@ -3043,43 +3043,43 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, /* Set some properties for reporting by "identify" */ { char - msg[MaxTextExtent]; + msg[MagickPathExtent]; /* encode ping_width, ping_height, ping_file_depth, ping_color_type, ping_interlace_method in value */ - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "%d, %d",(int) ping_width, (int) ping_height); (void) SetImageProperty(image,"png:IHDR.width,height",msg,exception); - (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_file_depth); + (void) FormatLocaleString(msg,MagickPathExtent,"%d",(int) ping_file_depth); (void) SetImageProperty(image,"png:IHDR.bit_depth",msg,exception); - (void) FormatLocaleString(msg,MaxTextExtent,"%d (%s)", + (void) FormatLocaleString(msg,MagickPathExtent,"%d (%s)", (int) ping_color_type, Magick_ColorType_from_PNG_ColorType((int)ping_color_type)); (void) SetImageProperty(image,"png:IHDR.color_type",msg,exception); if (ping_interlace_method == 0) { - (void) FormatLocaleString(msg,MaxTextExtent,"%d (Not interlaced)", + (void) FormatLocaleString(msg,MagickPathExtent,"%d (Not interlaced)", (int) ping_interlace_method); } else if (ping_interlace_method == 1) { - (void) FormatLocaleString(msg,MaxTextExtent,"%d (Adam7 method)", + (void) FormatLocaleString(msg,MagickPathExtent,"%d (Adam7 method)", (int) ping_interlace_method); } else { - (void) FormatLocaleString(msg,MaxTextExtent,"%d (Unknown method)", + (void) FormatLocaleString(msg,MagickPathExtent,"%d (Unknown method)", (int) ping_interlace_method); } (void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception); if (number_colors != 0) { - (void) FormatLocaleString(msg,MaxTextExtent,"%d", + (void) FormatLocaleString(msg,MagickPathExtent,"%d", (int) number_colors); (void) SetImageProperty(image,"png:PLTE.number_colors",msg, exception); @@ -3636,7 +3636,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, *value; length=text[i].text_length; - value=(char *) AcquireQuantumMemory(length+MaxTextExtent, + value=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*value)); if (value == (char *) NULL) { @@ -3789,12 +3789,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, /* Set more properties for identify to retrieve */ { char - msg[MaxTextExtent]; + msg[MagickPathExtent]; if (num_text_total != 0) { /* libpng doesn't tell us whether they were tEXt, zTXt, or iTXt */ - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "%d tEXt/zTXt/iTXt chunks were found", num_text_total); (void) SetImageProperty(image,"png:text",msg, exception); @@ -3802,7 +3802,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (num_raw_profiles != 0) { - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "%d were found", num_raw_profiles); (void) SetImageProperty(image,"png:text-encoded profiles",msg, exception); @@ -3810,7 +3810,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (ping_found_cHRM != MagickFalse) { - (void) FormatLocaleString(msg,MaxTextExtent,"%s", + (void) FormatLocaleString(msg,MagickPathExtent,"%s", "chunk was found (see Chromaticity, above)"); (void) SetImageProperty(image,"png:cHRM",msg, exception); @@ -3818,13 +3818,13 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (png_get_valid(ping,ping_info,PNG_INFO_bKGD)) { - (void) FormatLocaleString(msg,MaxTextExtent,"%s", + (void) FormatLocaleString(msg,MagickPathExtent,"%s", "chunk was found (see Background color, above)"); (void) SetImageProperty(image,"png:bKGD",msg, exception); } - (void) FormatLocaleString(msg,MaxTextExtent,"%s", + (void) FormatLocaleString(msg,MagickPathExtent,"%s", "chunk was found"); #if defined(PNG_iCCP_SUPPORTED) @@ -3840,7 +3840,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, #if defined(PNG_sRGB_SUPPORTED) if (ping_found_sRGB != MagickFalse) { - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "intent=%d (%s)", (int) intent, Magick_RenderingIntentString_from_PNG_RenderingIntent(intent)); @@ -3851,7 +3851,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (ping_found_gAMA != MagickFalse) { - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "gamma=%.8g (See Gamma, above)", file_gamma); (void) SetImageProperty(image,"png:gAMA",msg, @@ -3861,7 +3861,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, #if defined(PNG_pHYs_SUPPORTED) if (png_get_valid(ping,ping_info,PNG_INFO_pHYs)) { - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "x_res=%.10g, y_res=%.10g, units=%d", (double) x_resolution,(double) y_resolution, unit_type); (void) SetImageProperty(image,"png:pHYs",msg, @@ -3872,7 +3872,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, #if defined(PNG_oFFs_SUPPORTED) if (png_get_valid(ping,ping_info,PNG_INFO_oFFs)) { - (void) FormatLocaleString(msg,MaxTextExtent,"x_off=%.20g, y_off=%.20g", + (void) FormatLocaleString(msg,MagickPathExtent,"x_off=%.20g, y_off=%.20g", (double) image->page.x,(double) image->page.y); (void) SetImageProperty(image,"png:oFFs",msg, exception); @@ -3886,7 +3886,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if ((image->page.width != 0 && image->page.width != image->columns) || (image->page.height != 0 && image->page.height != image->rows)) { - (void) FormatLocaleString(msg,MaxTextExtent, + (void) FormatLocaleString(msg,MagickPathExtent, "width=%.20g, height=%.20g", (double) image->page.width,(double) image->page.height); (void) SetImageProperty(image,"png:vpAg",msg, @@ -3932,7 +3932,7 @@ static Image *ReadPNGImage(const ImageInfo *image_info,ExceptionInfo *exception) *mng_info; char - magic_number[MaxTextExtent]; + magic_number[MagickPathExtent]; ssize_t count; @@ -4175,7 +4175,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, for (;;) { char - type[MaxTextExtent]; + type[MagickPathExtent]; unsigned char *chunk; @@ -4193,7 +4193,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, break; type[0]='\0'; - (void) ConcatenateMagickString(type,"errr",MaxTextExtent); + (void) ConcatenateMagickString(type,"errr",MagickPathExtent); length=ReadBlobMSBLong(image); count=(unsigned int) ReadBlob(image,4,(unsigned char *) type); @@ -4600,7 +4600,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, " Reading jng_image from color_blob."); assert(color_image_info != (ImageInfo *) NULL); - (void) FormatLocaleString(color_image_info->filename,MaxTextExtent,"%s", + (void) FormatLocaleString(color_image_info->filename,MagickPathExtent,"%s", color_image->filename); color_image_info->ping=MagickFalse; /* To do: avoid this */ @@ -4663,7 +4663,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Reading alpha from alpha_blob."); - (void) FormatLocaleString(alpha_image_info->filename,MaxTextExtent, + (void) FormatLocaleString(alpha_image_info->filename,MagickPathExtent, "%s",alpha_image->filename); jng_image=ReadImage(alpha_image_info,exception); @@ -4788,7 +4788,7 @@ static Image *ReadJNGImage(const ImageInfo *image_info,ExceptionInfo *exception) *mng_info; char - magic_number[MaxTextExtent]; + magic_number[MagickPathExtent]; size_t count; @@ -4865,7 +4865,7 @@ static Image *ReadJNGImage(const ImageInfo *image_info,ExceptionInfo *exception) static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - page_geometry[MaxTextExtent]; + page_geometry[MagickPathExtent]; Image *image; @@ -4997,7 +4997,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (LocaleCompare(image_info->magick,"MNG") == 0) { char - magic_number[MaxTextExtent]; + magic_number[MagickPathExtent]; /* Verify MNG signature. */ count=(size_t) ReadBlob(image,8,(unsigned char *) magic_number); @@ -5038,7 +5038,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) do { char - type[MaxTextExtent]; + type[MagickPathExtent]; if (LocaleCompare(image_info->magick,"MNG") == 0) { @@ -5049,7 +5049,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) Read a new chunk. */ type[0]='\0'; - (void) ConcatenateMagickString(type,"errr",MaxTextExtent); + (void) ConcatenateMagickString(type,"errr",MagickPathExtent); length=ReadBlobMSBLong(image); count=(size_t) ReadBlob(image,4,(unsigned char *) type); @@ -5188,7 +5188,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) (mng_info->mng_height > 65535L)) ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit"); - (void) FormatLocaleString(page_geometry,MaxTextExtent, + (void) FormatLocaleString(page_geometry,MagickPathExtent, "%.20gx%.20g+0+0",(double) mng_info->mng_width,(double) mng_info->mng_height); @@ -7337,7 +7337,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) ModuleExport size_t RegisterPNGImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; @@ -7363,14 +7363,14 @@ ModuleExport size_t RegisterPNGImage(void) *version='\0'; #if defined(PNG_LIBPNG_VER_STRING) - (void) ConcatenateMagickString(version,"libpng ",MaxTextExtent); - (void) ConcatenateMagickString(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); + (void) ConcatenateMagickString(version,"libpng ",MagickPathExtent); + (void) ConcatenateMagickString(version,PNG_LIBPNG_VER_STRING,MagickPathExtent); if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) { - (void) ConcatenateMagickString(version,",",MaxTextExtent); + (void) ConcatenateMagickString(version,",",MagickPathExtent); (void) ConcatenateMagickString(version,png_get_libpng_ver(NULL), - MaxTextExtent); + MagickPathExtent); } #endif @@ -7426,13 +7426,13 @@ ModuleExport size_t RegisterPNGImage(void) *version='\0'; #if defined(ZLIB_VERSION) - (void) ConcatenateMagickString(version,"zlib ",MaxTextExtent); - (void) ConcatenateMagickString(version,ZLIB_VERSION,MaxTextExtent); + (void) ConcatenateMagickString(version,"zlib ",MagickPathExtent); + (void) ConcatenateMagickString(version,ZLIB_VERSION,MagickPathExtent); if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) { - (void) ConcatenateMagickString(version,",",MaxTextExtent); - (void) ConcatenateMagickString(version,zlib_version,MaxTextExtent); + (void) ConcatenateMagickString(version,",",MagickPathExtent); + (void) ConcatenateMagickString(version,zlib_version,MagickPathExtent); } #endif @@ -7687,7 +7687,7 @@ Magick_png_write_raw_profile(const ImageInfo *image_info,png_struct *ping, #endif text[0].key[0]='\0'; (void) ConcatenateMagickString(text[0].key, - "Raw profile type ",MaxTextExtent); + "Raw profile type ",MagickPathExtent); (void) ConcatenateMagickString(text[0].key,(const char *) profile_type,62); sp=profile_data; dp=text[0].text; @@ -7974,9 +7974,9 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, */ *im_vers='\0'; (void) ConcatenateMagickString(im_vers, - MagickLibVersionText,MaxTextExtent); + MagickLibVersionText,MagickPathExtent); (void) ConcatenateMagickString(im_vers, - MagickLibAddendum,MaxTextExtent); + MagickLibAddendum,MagickPathExtent); *libpng_vers='\0'; (void) ConcatenateMagickString(libpng_vers, @@ -12204,13 +12204,13 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, jpeg_image=SeparateImage(image,AlphaChannel,exception); if (jpeg_image == (Image *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent); jpeg_image->alpha_trait=UndefinedPixelTrait; jpeg_image->quality=jng_alpha_quality; jpeg_image_info->type=GrayscaleType; (void) SetImageType(jpeg_image,GrayscaleType,exception); (void) AcquireUniqueFilename(jpeg_image->filename); - (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent, + (void) FormatLocaleString(jpeg_image_info->filename,MagickPathExtent, "%s",jpeg_image->filename); } else @@ -12261,8 +12261,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Creating PNG blob."); - (void) CopyMagickString(jpeg_image_info->magick,"PNG",MaxTextExtent); - (void) CopyMagickString(jpeg_image->magick,"PNG",MaxTextExtent); + (void) CopyMagickString(jpeg_image_info->magick,"PNG",MagickPathExtent); + (void) CopyMagickString(jpeg_image->magick,"PNG",MagickPathExtent); jpeg_image_info->interlace=NoInterlace; /* Exclude all ancillary chunks */ @@ -12286,8 +12286,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MaxTextExtent); - (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MagickPathExtent); + (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent); jpeg_image_info->interlace=NoInterlace; if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -12609,10 +12609,10 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, jpeg_image=CloneImage(image,0,0,MagickTrue,exception); if (jpeg_image == (Image *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent); (void) AcquireUniqueFilename(jpeg_image->filename); - (void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,"%s", + (void) FormatLocaleString(jpeg_image_info->filename,MagickPathExtent,"%s", jpeg_image->filename); status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode, @@ -12631,8 +12631,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, jpeg_image_info->quality=jng_quality; jpeg_image->quality=jng_quality; - (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MaxTextExtent); - (void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent); + (void) CopyMagickString(jpeg_image_info->magick,"JPEG",MagickPathExtent); + (void) CopyMagickString(jpeg_image->magick,"JPEG",MagickPathExtent); if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), diff --git a/coders/pnm.c b/coders/pnm.c index d31bd475e..7793aa5b5 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -155,13 +155,13 @@ static int PNMComment(Image *image,ExceptionInfo *exception) */ comment=AcquireString(GetImageProperty(image,"comment",exception)); p=comment+strlen(comment); - extent=strlen(comment)+MaxTextExtent; + extent=strlen(comment)+MagickPathExtent; for (c='#'; (c != EOF) && (c != (int) '\n'); p++) { if ((size_t) (p-comment+1) >= extent) { extent<<=1; - comment=(char *) ResizeQuantumMemory(comment,extent+MaxTextExtent, + comment=(char *) ResizeQuantumMemory(comment,extent+MagickPathExtent, sizeof(*comment)); if (comment == (char *) NULL) break; @@ -296,7 +296,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((format == 'f') || (format == 'F')) { char - scale[MaxTextExtent]; + scale[MagickPathExtent]; (void) ReadBlobString(image,scale); quantum_scale=StringToDouble(scale,(char **) NULL); @@ -312,8 +312,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) else { char - keyword[MaxTextExtent], - value[MaxTextExtent]; + keyword[MagickPathExtent], + value[MagickPathExtent]; int c; @@ -341,7 +341,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) p=keyword; do { - if ((size_t) (p-keyword) < (MaxTextExtent-1)) + if ((size_t) (p-keyword) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); } while (isalnum(c)); @@ -353,7 +353,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) p=value; while (isalnum(c) || (c == '_')) { - if ((size_t) (p-value) < (MaxTextExtent-1)) + if ((size_t) (p-value) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); } @@ -1503,9 +1503,9 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], format, - magick[MaxTextExtent]; + magick[MagickPathExtent]; const char *value; @@ -1565,7 +1565,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, */ packet_size=3; quantum_type=RGBQuantum; - (void) CopyMagickString(magick,image_info->magick,MaxTextExtent); + (void) CopyMagickString(magick,image_info->magick,MagickPathExtent); max_value=GetQuantumRange(image->depth); switch (magick[1]) { @@ -1625,7 +1625,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, break; } } - (void) FormatLocaleString(buffer,MaxTextExtent,"P%c\n",format); + (void) FormatLocaleString(buffer,MagickPathExtent,"P%c\n",format); (void) WriteBlobString(image,buffer); value=GetImageProperty(image,"comment",exception); if (value != (const char *) NULL) @@ -1647,19 +1647,19 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, } if (format != '7') { - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n", (double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); } else { char - type[MaxTextExtent]; + type[MagickPathExtent]; /* PAM header. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "WIDTH %.20g\nHEIGHT %.20g\n",(double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); @@ -1670,14 +1670,14 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, case CMYKAQuantum: { packet_size=4; - (void) CopyMagickString(type,"CMYK",MaxTextExtent); + (void) CopyMagickString(type,"CMYK",MagickPathExtent); break; } case GrayQuantum: case GrayAlphaQuantum: { packet_size=1; - (void) CopyMagickString(type,"GRAYSCALE",MaxTextExtent); + (void) CopyMagickString(type,"GRAYSCALE",MagickPathExtent); break; } default: @@ -1686,22 +1686,22 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (image->alpha_trait != UndefinedPixelTrait) quantum_type=RGBAQuantum; packet_size=3; - (void) CopyMagickString(type,"RGB",MaxTextExtent); + (void) CopyMagickString(type,"RGB",MagickPathExtent); break; } } if (image->alpha_trait != UndefinedPixelTrait) { packet_size++; - (void) ConcatenateMagickString(type,"_ALPHA",MaxTextExtent); + (void) ConcatenateMagickString(type,"_ALPHA",MagickPathExtent); } if (image->depth > 32) image->depth=32; - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double) ((MagickOffsetType) GetQuantumRange(image->depth))); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"TUPLTYPE %s\nENDHDR\n", type); (void) WriteBlobString(image,buffer); } @@ -1790,14 +1790,14 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, { index=ClampToQuantum(GetPixelLuma(image,p)); if (image->depth <= 8) - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ", + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ", ScaleQuantumToChar(index)); else if (image->depth <= 16) - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ", + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ", ScaleQuantumToShort(index)); else - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ", + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ", ScaleQuantumToLong(index)); extent=(size_t) count; (void) strncpy((char *) q,buffer,extent); @@ -1856,18 +1856,18 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, for (x=0; x < (ssize_t) image->columns; x++) { if (image->depth <= 8) - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent, + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent, "%u %u %u ",ScaleQuantumToChar(GetPixelRed(image,p)), ScaleQuantumToChar(GetPixelGreen(image,p)), ScaleQuantumToChar(GetPixelBlue(image,p))); else if (image->depth <= 16) - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent, + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent, "%u %u %u ",ScaleQuantumToShort(GetPixelRed(image,p)), ScaleQuantumToShort(GetPixelGreen(image,p)), ScaleQuantumToShort(GetPixelBlue(image,p))); else - count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent, + count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent, "%u %u %u ",ScaleQuantumToLong(GetPixelRed(image,p)), ScaleQuantumToLong(GetPixelGreen(image,p)), ScaleQuantumToLong(GetPixelBlue(image,p))); @@ -1941,7 +1941,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, */ if (image->depth > 32) image->depth=32; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) ((MagickOffsetType) GetQuantumRange(image->depth))); (void) WriteBlobString(image,buffer); quantum_info=AcquireQuantumInfo(image_info,image); @@ -2058,7 +2058,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, (void) TransformImageColorspace(image,sRGBColorspace,exception); if (image->depth > 32) image->depth=32; - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) ((MagickOffsetType) GetQuantumRange(image->depth))); (void) WriteBlobString(image,buffer); quantum_info=AcquireQuantumInfo(image_info,image); diff --git a/coders/preview.c b/coders/preview.c index c9b65427a..df5cb4bf7 100644 --- a/coders/preview.c +++ b/coders/preview.c @@ -185,11 +185,11 @@ static MagickBooleanType WritePreviewImage(const ImageInfo *image_info, if (preview_image == (Image *) NULL) return(MagickFalse); (void) CopyMagickString(preview_image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"PREVIEW") == 0) - (void) FormatLocaleString(preview_image->filename,MaxTextExtent, + (void) FormatLocaleString(preview_image->filename,MagickPathExtent, "miff:%s",image_info->filename); status=WriteImage(write_info,preview_image,exception); preview_image=DestroyImage(preview_image); diff --git a/coders/ps.c b/coders/ps.c index 738569446..b972aaa7b 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -253,7 +253,7 @@ static MagickBooleanType InvokePostscriptDelegate( { SetArgsStart(command,args_start); if (status == -101) /* quit */ - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "[ghostscript library %.2f]%s: %s",(double)revision.revision / 100, args_start,errors); else @@ -413,14 +413,14 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) #define SpotColor "+ " char - command[MaxTextExtent], + command[MagickPathExtent], *density, - filename[MaxTextExtent], - geometry[MaxTextExtent], - input_filename[MaxTextExtent], - message[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], + input_filename[MagickPathExtent], + message[MagickPathExtent], *options, - postscript_filename[MaxTextExtent]; + postscript_filename[MagickPathExtent]; const char *option; @@ -593,7 +593,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) */ *p++=(char) c; if ((strchr("\n\r%",c) == (char *) NULL) && - ((size_t) (p-command) < (MaxTextExtent-1))) + ((size_t) (p-command) < (MagickPathExtent-1))) continue; *p='\0'; p=command; @@ -677,7 +677,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) GetStringInfoDatum(profile)[i]=(unsigned char) c; *p++=(char) c; if ((strchr("\n\r%",c) == (char *) NULL) && - ((size_t) (p-command) < (MaxTextExtent-1))) + ((size_t) (p-command) < (MagickPathExtent-1))) continue; *p='\0'; p=command; @@ -710,7 +710,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) (LocaleNCompare(SpotColor,command,strlen(SpotColor)) == 0)) { char - property[MaxTextExtent], + property[MagickPathExtent], *value; register char @@ -719,7 +719,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Note spot names. */ - (void) FormatLocaleString(property,MaxTextExtent,"ps:SpotColor-%.20g", + (void) FormatLocaleString(property,MagickPathExtent,"ps:SpotColor-%.20g", (double) (spotcolor++)); for (p=command; *p != '\0'; p++) if (isspace((int) (unsigned char) *p) != 0) @@ -784,7 +784,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Set Postscript render geometry. */ - (void) FormatLocaleString(geometry,MaxTextExtent,"%gx%g%+.15g%+.15g", + (void) FormatLocaleString(geometry,MagickPathExtent,"%gx%g%+.15g%+.15g", hires_bounds.x2-hires_bounds.x1,hires_bounds.y2-hires_bounds.y1, hires_bounds.x1,hires_bounds.y1); (void) SetImageProperty(image,"ps:HiResBoundingBox",geometry,exception); @@ -835,14 +835,14 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) } (void) CopyMagickString(command,"/setpagedevice {pop} bind 1 index where {" "dup wcheck {3 1 roll put} {pop def} ifelse} {def} ifelse\n" - "<>setpagedevice\n",MaxTextExtent); + "<>setpagedevice\n",MagickPathExtent); count=write(file,command,(unsigned int) strlen(command)); if (image_info->page == (char *) NULL) { char - translate_geometry[MaxTextExtent]; + translate_geometry[MagickPathExtent]; - (void) FormatLocaleString(translate_geometry,MaxTextExtent, + (void) FormatLocaleString(translate_geometry,MagickPathExtent, "%g %g translate\n",-bounds.x1,-bounds.y1); count=write(file,translate_geometry,(unsigned int) strlen(translate_geometry)); @@ -866,21 +866,21 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) } density=AcquireString(""); options=AcquireString(""); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g",resolution.x, + (void) FormatLocaleString(density,MagickPathExtent,"%gx%g",resolution.x, resolution.y); - (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) + (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double) page.width,(double) page.height); read_info=CloneImageInfo(image_info); *read_info->magick='\0'; if (read_info->number_scenes != 0) { char - pages[MaxTextExtent]; + pages[MagickPathExtent]; - (void) FormatLocaleString(pages,MaxTextExtent,"-dFirstPage=%.20g " + (void) FormatLocaleString(pages,MagickPathExtent,"-dFirstPage=%.20g " "-dLastPage=%.20g ",(double) read_info->scene+1,(double) (read_info->scene+read_info->number_scenes)); - (void) ConcatenateMagickString(options,pages,MaxTextExtent); + (void) ConcatenateMagickString(options,pages,MagickPathExtent); read_info->number_scenes=0; if (read_info->scenes != (char *) NULL) *read_info->scenes='\0'; @@ -890,15 +890,15 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) option=GetImageOption(image_info,"eps:use-cropbox"); if ((option == (const char *) NULL) || (IsStringTrue(option) != MagickFalse)) - (void) ConcatenateMagickString(options,"-dEPSCrop ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dEPSCrop ",MagickPathExtent); if (fitPage != MagickFalse) - (void) ConcatenateMagickString(options,"-dEPSFitPage ",MaxTextExtent); + (void) ConcatenateMagickString(options,"-dEPSFitPage ",MagickPathExtent); } - (void) CopyMagickString(filename,read_info->filename,MaxTextExtent); + (void) CopyMagickString(filename,read_info->filename,MagickPathExtent); (void) AcquireUniqueFilename(filename); (void) RelinquishUniqueFileResource(filename); - (void) ConcatenateMagickString(filename,"%d",MaxTextExtent); - (void) FormatLocaleString(command,MaxTextExtent, + (void) ConcatenateMagickString(filename,"%d",MagickPathExtent); + (void) FormatLocaleString(command,MagickPathExtent, GetDelegateCommands(delegate_info), read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options,filename, @@ -912,7 +912,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((status == MagickFalse) || (IsPostscriptRendered(read_info->filename) == MagickFalse)) { - (void) ConcatenateMagickString(command," -c showpage",MaxTextExtent); + (void) ConcatenateMagickString(command," -c showpage",MagickPathExtent); status=InvokePostscriptDelegate(read_info->verbose,command,message, exception); } @@ -985,9 +985,9 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) } do { - (void) CopyMagickString(postscript_image->filename,filename,MaxTextExtent); + (void) CopyMagickString(postscript_image->filename,filename,MagickPathExtent); (void) CopyMagickString(postscript_image->magick,image->magick, - MaxTextExtent); + MagickPathExtent); if (columns != 0) postscript_image->magick_columns=columns; if (rows != 0) @@ -1462,10 +1462,10 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, }; char - buffer[MaxTextExtent], - date[MaxTextExtent], + buffer[MagickPathExtent], + date[MagickPathExtent], **labels, - page_geometry[MaxTextExtent]; + page_geometry[MagickPathExtent]; CompressionType compression; @@ -1590,20 +1590,20 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, resolution.y=(double) ((size_t) (100.0*2.54*resolution.y+0.5)/100.0); } SetGeometry(image,&geometry); - (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g", (double) image->columns,(double) image->rows); if (image_info->page != (char *) NULL) - (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); + (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent); else if ((image->page.width != 0) && (image->page.height != 0)) - (void) FormatLocaleString(page_geometry,MaxTextExtent, + (void) FormatLocaleString(page_geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) - (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent); - (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent); + (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent); + (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent); (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); scale.x=(double) (geometry.width*delta.x)/resolution.x; @@ -1630,18 +1630,18 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, Output Postscript header. */ if (LocaleCompare(image_info->magick,"PS") == 0) - (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent); + (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent); else (void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n", - MaxTextExtent); + MagickPathExtent); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"%%Creator: (ImageMagick)\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: (%s)\n", image->filename); (void) WriteBlobString(image,buffer); timer=time((time_t *) NULL); - (void) FormatMagickTime(timer,MaxTextExtent,date); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatMagickTime(timer,MagickPathExtent,date); + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%CreationDate: (%s)\n",date); (void) WriteBlobString(image,buffer); bounds.x1=(double) geometry.x; @@ -1651,14 +1651,14 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, if ((image_info->adjoin != MagickFalse) && (GetNextImageInList(image) != (Image *) NULL)) (void) CopyMagickString(buffer,"%%%%BoundingBox: (atend)\n", - MaxTextExtent); + MagickPathExtent); else { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1, bounds.y1,bounds.x2,bounds.y2); } @@ -1669,14 +1669,14 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, /* Embed Photoshop profile. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%BeginPhotoshop: %.20g",(double) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++) { if ((i % 32) == 0) (void) WriteBlobString(image,"\n% "); - (void) FormatLocaleString(buffer,MaxTextExtent,"%02X", + (void) FormatLocaleString(buffer,MagickPathExtent,"%02X", (unsigned int) (GetStringInfoDatum(profile)[i] & 0xff)); (void) WriteBlobString(image,buffer); } @@ -1691,7 +1691,7 @@ RestoreMSCWarning Embed XML profile. */ (void) WriteBlobString(image,"\n%begin_xml_code\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\n%%begin_xml_packet: %.20g\n",(double) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); @@ -1714,7 +1714,7 @@ RestoreMSCWarning */ (void) WriteBlobString(image,"%%Orientation: Portrait\n"); (void) WriteBlobString(image,"%%PageOrder: Ascend\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Pages: %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Pages: %.20g\n", image_info->adjoin != MagickFalse ? (double) GetImageListLength(image) : 1.0); (void) WriteBlobString(image,buffer); @@ -1747,7 +1747,7 @@ RestoreMSCWarning /* Dump image as bitmap. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginPreview: %.20g %.20g %.20g %.20g\n%% ",(double) preview_image->columns,(double) preview_image->rows,1.0, (double) ((((preview_image->columns+7) >> 3)*preview_image->rows+ @@ -1809,7 +1809,7 @@ RestoreMSCWarning */ for (s=PostscriptProlog; *s != (char *) NULL; s++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*s); (void) WriteBlobString(image,buffer); } value=GetImageProperty(image,"label",exception); @@ -1818,13 +1818,13 @@ RestoreMSCWarning { (void) WriteBlobString(image," /label 512 string def\n"); (void) WriteBlobString(image," currentfile label readline pop\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " 0 y %g add moveto label show pop\n",j*pointsize+12); (void) WriteBlobString(image,buffer); } for (s=PostscriptEpilog; *s != (char *) NULL; s++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*s); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*s); (void) WriteBlobString(image,buffer); } if (LocaleCompare(image_info->magick,"PS") == 0) @@ -1832,10 +1832,10 @@ RestoreMSCWarning (void) WriteBlobString(image,"} bind def\n"); (void) WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n", (double) (page++)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x, (double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double) (geometry.height+text_size)); @@ -1857,7 +1857,7 @@ RestoreMSCWarning /* Output image data. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n", (double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); labels=(char **) NULL; @@ -1868,7 +1868,7 @@ RestoreMSCWarning { for (i=0; labels[i] != (char *) NULL; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%s \n", labels[i]); (void) WriteBlobString(image,buffer); labels[i]=DestroyString(labels[i]); @@ -1890,7 +1890,7 @@ RestoreMSCWarning /* Dump image as grayscale. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g %.20g\n1\n1\n1\n8\n",(double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); @@ -1938,7 +1938,7 @@ RestoreMSCWarning /* Dump image as bitmap. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g %.20g\n1\n1\n1\n1\n",(double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); @@ -2004,7 +2004,7 @@ RestoreMSCWarning /* Dump DirectClass image. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n0\n%d\n", (double) image->columns,(double) image->rows, compression == RLECompression ? 1 : 0); (void) WriteBlobString(image,buffer); @@ -2131,7 +2131,7 @@ RestoreMSCWarning /* Dump PseudoClass image. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g %.20g\n%d\n%d\n0\n",(double) image->columns,(double) image->rows,image->storage_class == PseudoClass ? 1 : 0, compression == RLECompression ? 1 : 0); @@ -2139,12 +2139,12 @@ RestoreMSCWarning /* Dump number of colors and colormap. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) image->colors); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) image->colors; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%02X%02X%02X\n", ScaleQuantumToChar(ClampToQuantum(image->colormap[i].red)), ScaleQuantumToChar(ClampToQuantum(image->colormap[i].green)), ScaleQuantumToChar(ClampToQuantum(image->colormap[i].blue))); @@ -2267,11 +2267,11 @@ RestoreMSCWarning (void) WriteBlobString(image,"%%Trailer\n"); if (page > 2) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2-0.5),floor(bounds.y2-0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,bounds.x2, bounds.y2); (void) WriteBlobString(image,buffer); diff --git a/coders/ps2.c b/coders/ps2.c index cbbde50c4..e4ae54775 100644 --- a/coders/ps2.c +++ b/coders/ps2.c @@ -203,8 +203,8 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info, status=MagickTrue; write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent); - (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent); + (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent); + (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent); group4_image=CloneImage(inject_image,0,0,MagickTrue,exception); if (group4_image == (Image *) NULL) return(MagickFalse); @@ -378,9 +378,9 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, }; char - buffer[MaxTextExtent], - date[MaxTextExtent], - page_geometry[MaxTextExtent], + buffer[MagickPathExtent], + date[MagickPathExtent], + page_geometry[MagickPathExtent], **labels; CompressionType @@ -517,20 +517,20 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0; } SetGeometry(image,&geometry); - (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g", (double) image->columns,(double) image->rows); if (image_info->page != (char *) NULL) - (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); + (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent); else if ((image->page.width != 0) && (image->page.height != 0)) - (void) FormatLocaleString(page_geometry,MaxTextExtent, + (void) FormatLocaleString(page_geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) - (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent); - (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent); + (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent); + (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent); (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); scale.x=(double) (geometry.width*delta.x)/resolution.x; @@ -557,18 +557,18 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, Output Postscript header. */ if (LocaleCompare(image_info->magick,"PS2") == 0) - (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent); + (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent); else (void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n", - MaxTextExtent); + MagickPathExtent); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"%%Creator: (ImageMagick)\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: (%s)\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: (%s)\n", image->filename); (void) WriteBlobString(image,buffer); timer=time((time_t *) NULL); - (void) FormatMagickTime(timer,MaxTextExtent,date); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatMagickTime(timer,MagickPathExtent,date); + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%CreationDate: (%s)\n",date); (void) WriteBlobString(image,buffer); bounds.x1=(double) geometry.x; @@ -578,14 +578,14 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, if ((image_info->adjoin != MagickFalse) && (GetNextImageInList(image) != (Image *) NULL)) (void) CopyMagickString(buffer,"%%BoundingBox: (atend)\n", - MaxTextExtent); + MagickPathExtent); else { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1, bounds.y1,bounds.x2,bounds.y2); } @@ -602,9 +602,9 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"%%Orientation: Portrait\n"); (void) WriteBlobString(image,"%%PageOrder: Ascend\n"); if (image_info->adjoin == MagickFalse) - (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent); + (void) CopyMagickString(buffer,"%%Pages: 1\n",MagickPathExtent); else - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%Pages: %.20g\n",(double) GetImageListLength(image)); (void) WriteBlobString(image,buffer); } @@ -623,31 +623,31 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, { case NoCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,*q, + (void) FormatLocaleString(buffer,MagickPathExtent,*q, "/ASCII85Decode filter"); break; } case JPEGCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,*q, + (void) FormatLocaleString(buffer,MagickPathExtent,*q, "/DCTDecode filter"); break; } case LZWCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent,*q, + (void) FormatLocaleString(buffer,MagickPathExtent,*q, "/LZWDecode filter"); break; } case FaxCompression: case Group4Compression: { - (void) FormatLocaleString(buffer,MaxTextExtent,*q," "); + (void) FormatLocaleString(buffer,MagickPathExtent,*q," "); break; } default: { - (void) FormatLocaleString(buffer,MaxTextExtent,*q, + (void) FormatLocaleString(buffer,MagickPathExtent,*q, "/RunLengthDecode filter"); break; } @@ -661,13 +661,13 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, { (void) WriteBlobString(image," /label 512 string def\n"); (void) WriteBlobString(image," currentfile label readline pop\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " 0 y %g add moveto label show pop\n",j*pointsize+12); (void) WriteBlobString(image,buffer); } for (q=PostscriptEpilog; *q; q++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s\n",*q); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s\n",*q); (void) WriteBlobString(image,buffer); } if (LocaleCompare(image_info->magick,"PS2") == 0) @@ -675,10 +675,10 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"} bind def\n"); (void) WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n", (double) page++); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x, (double) geometry.y,geometry.x+(double) geometry.width,geometry.y+(double) (geometry.height+text_size)); @@ -697,7 +697,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, if (LocaleCompare(image_info->magick,"PS2") != 0) (void) WriteBlobString(image,"userdict begin\n"); start=TellBlob(image); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",0L, compression == NoCompression ? "ASCII" : "Binary"); (void) WriteBlobString(image,buffer); @@ -706,7 +706,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, /* Output image data. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n", (double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); labels=(char **) NULL; @@ -717,7 +717,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, { for (i=0; labels[i] != (char *) NULL; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%s \n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%s \n", labels[i]); (void) WriteBlobString(image,buffer); labels[i]=DestroyString(labels[i]); @@ -731,16 +731,16 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, ((image_info->type != TrueColorType) && (SetImageGray(image,exception) != MagickFalse))) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n1\n%d\n", (double) image->columns,(double) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n", (int) ((compression != FaxCompression) && (compression != Group4Compression))); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"0\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n", (compression == FaxCompression) || (compression == Group4Compression) ? 1 : 8); (void) WriteBlobString(image,buffer); @@ -847,11 +847,11 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, if ((image->storage_class == DirectClass) || (image->colors > 256) || (compression == JPEGCompression) || (image->alpha_trait != UndefinedPixelTrait)) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n0\n%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n0\n%d\n", (double) image->columns,(double) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n", (int) (compression == NoCompression)); (void) WriteBlobString(image,buffer); switch (compression) @@ -997,19 +997,19 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, /* Dump number of colors and colormap. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n1\n%d\n", (double) image->columns,(double) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n", (int) (compression == NoCompression)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n",(double) image->colors); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) image->colors; i++) { - (void) FormatLocaleString(buffer,MaxTextExtent,"%02X%02X%02X\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%02X%02X%02X\n", ScaleQuantumToChar(image->colormap[i].red), ScaleQuantumToChar(image->colormap[i].green), ScaleQuantumToChar(image->colormap[i].blue)); @@ -1099,7 +1099,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, offset=SeekBlob(image,start,SEEK_SET); if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "Binary"); (void) WriteBlobString(image,buffer); @@ -1119,11 +1119,11 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"%%Trailer\n"); if (page > 1) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %.20g %.20g %.20g %.20g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1, bounds.x2,bounds.y2); (void) WriteBlobString(image,buffer); diff --git a/coders/ps3.c b/coders/ps3.c index cb11b4c40..ed26efac4 100644 --- a/coders/ps3.c +++ b/coders/ps3.c @@ -218,8 +218,8 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info, status=MagickTrue; write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->filename,"GROUP4:",MaxTextExtent); - (void) CopyMagickString(write_info->magick,"GROUP4",MaxTextExtent); + (void) CopyMagickString(write_info->filename,"GROUP4:",MagickPathExtent); + (void) CopyMagickString(write_info->magick,"GROUP4",MagickPathExtent); group4_image=CloneImage(inject_image,0,0,MagickTrue,exception); if (group4_image == (Image *) NULL) return(MagickFalse); @@ -431,7 +431,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, Image *image,const CompressionType compression,ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; Image *mask_image; @@ -470,7 +470,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, start=TellBlob(image); if (start < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",0L,compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); @@ -485,7 +485,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, case NoCompression: default: { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "currentfile %.20g %.20g "PS3_NoCompression" ByteStreamDecodeFilter\n", (double) image->columns,(double) image->rows); break; @@ -493,28 +493,28 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, case FaxCompression: case Group4Compression: { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "currentfile %.20g %.20g "PS3_FaxCompression" ByteStreamDecodeFilter\n", (double) image->columns,(double) image->rows); break; } case LZWCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "currentfile %.20g %.20g "PS3_LZWCompression" ByteStreamDecodeFilter\n", (double) image->columns,(double) image->rows); break; } case RLECompression: { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "currentfile %.20g %.20g "PS3_RLECompression" ByteStreamDecodeFilter\n", (double) image->columns,(double) image->rows); break; } case ZipCompression: { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "currentfile %.20g %.20g "PS3_ZipCompression" ByteStreamDecodeFilter\n", (double) image->columns,(double) image->rows); break; @@ -600,7 +600,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, offset=SeekBlob(image,start,SEEK_SET); if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); @@ -808,10 +808,10 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, }; char - buffer[MaxTextExtent], - date[MaxTextExtent], + buffer[MagickPathExtent], + date[MagickPathExtent], **labels, - page_geometry[MaxTextExtent]; + page_geometry[MagickPathExtent]; CompressionType compression; @@ -957,20 +957,20 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, resolution.y=(size_t) (100.0*2.54*resolution.y+0.5)/100.0; } SetGeometry(image,&geometry); - (void) FormatLocaleString(page_geometry,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(page_geometry,MagickPathExtent,"%.20gx%.20g", (double) image->columns,(double) image->rows); if (image_info->page != (char *) NULL) - (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); + (void) CopyMagickString(page_geometry,image_info->page,MagickPathExtent); else if ((image->page.width != 0) && (image->page.height != 0)) - (void) FormatLocaleString(page_geometry,MaxTextExtent, + (void) FormatLocaleString(page_geometry,MagickPathExtent, "%.20gx%.20g%+.20g%+.20g",(double) image->page.width,(double) image->page.height,(double) image->page.x,(double) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) - (void) CopyMagickString(page_geometry,PSPageGeometry,MaxTextExtent); - (void) ConcatenateMagickString(page_geometry,">",MaxTextExtent); + (void) CopyMagickString(page_geometry,PSPageGeometry,MagickPathExtent); + (void) ConcatenateMagickString(page_geometry,">",MagickPathExtent); (void) ParseMetaGeometry(page_geometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); scale.x=(double) (geometry.width*delta.x)/resolution.x; @@ -998,20 +998,20 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, Postscript header on the first page. */ if (LocaleCompare(image_info->magick,"PS3") == 0) - (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MaxTextExtent); + (void) CopyMagickString(buffer,"%!PS-Adobe-3.0\n",MagickPathExtent); else (void) CopyMagickString(buffer,"%!PS-Adobe-3.0 EPSF-3.0\n", - MaxTextExtent); + MagickPathExtent); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%Creator: ImageMagick %s\n",MagickLibVersionText); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Title: %s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Title: %s\n", image->filename); (void) WriteBlobString(image,buffer); timer=time((time_t *) NULL); - (void) FormatMagickTime(timer,MaxTextExtent,date); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatMagickTime(timer,MagickPathExtent,date); + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%CreationDate: %s\n",date); (void) WriteBlobString(image,buffer); bounds.x1=(double) geometry.x; @@ -1026,11 +1026,11 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, } else { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %g %g %g %g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1, bounds.y1,bounds.x2,bounds.y2); (void) WriteBlobString(image,buffer); @@ -1060,9 +1060,9 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"%%Orientation: Portrait\n"); (void) WriteBlobString(image,"%%PageOrder: Ascend\n"); if (image_info->adjoin == MagickFalse) - (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent); + (void) CopyMagickString(buffer,"%%Pages: 1\n",MagickPathExtent); else - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%Pages: %.20g\n",(double) GetImageListLength(image)); (void) WriteBlobString(image,buffer); } @@ -1091,7 +1091,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, { (void) WriteBlobString(image, " currentfile buffer readline pop token pop\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " 0 y %g add moveto show pop\n",i*pointsize+12); (void) WriteBlobString(image,buffer); } @@ -1106,13 +1106,13 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, } (void)WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatLocaleString(buffer,MaxTextExtent,"%%%%Page: 1 %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%%%%Page: 1 %.20g\n", (double) page); (void) WriteBlobString(image,buffer); /* Page bounding box. */ - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%PageBoundingBox: %.20g %.20g %.20g %.20g\n",(double) geometry.x, (double) geometry.y,geometry.x+(double) geometry.width,geometry.y+ (double) (geometry.height+text_size)); @@ -1180,7 +1180,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, start=TellBlob(image); if (start < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",0L, compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); @@ -1191,7 +1191,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, /* Translate, scale, and font point size. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%g %g\n%g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%g %g\n%g\n", (double) geometry.x,(double) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); /* @@ -1239,7 +1239,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, /* Image columns, rows, and color space. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g %.20g\n%s\n", (double) image->columns,(double) image->rows,image->colorspace == CMYKColorspace ? PS3_CMYKColorspace : PS3_RGBColorspace); (void) WriteBlobString(image,buffer); @@ -1314,7 +1314,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, /* 1 bit or 8 bit components? */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%d\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%d\n", SetImageMonochrome(image,exception) != MagickFalse ? 1 : 8); (void) WriteBlobString(image,buffer); /* @@ -1491,7 +1491,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, /* Number of colors in color map. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g\n", (double) image->colors); (void) WriteBlobString(image,buffer); /* @@ -1578,7 +1578,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, offset=SeekBlob(image,start,SEEK_SET); if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); @@ -1601,11 +1601,11 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,"%%Trailer\n"); if (page > 1) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%BoundingBox: %g %g %g %g\n",ceil(bounds.x1-0.5), ceil(bounds.y1-0.5),floor(bounds.x2+0.5),floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1,bounds.y1,bounds.x2, bounds.y2); (void) WriteBlobString(image,buffer); diff --git a/coders/psd.c b/coders/psd.c index 50c1ef9da..5e130abb6 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -566,7 +566,7 @@ static void ParseImageResourceBlocks(Image *image, case 0x03ed: { char - value[MaxTextExtent]; + value[MagickPathExtent]; unsigned short resolution; @@ -576,14 +576,14 @@ static void ParseImageResourceBlocks(Image *image, */ p=PushShortPixel(MSBEndian,p,&resolution); image->resolution.x=(double) resolution; - (void) FormatLocaleString(value,MaxTextExtent,"%g",image->resolution.x); + (void) FormatLocaleString(value,MagickPathExtent,"%g",image->resolution.x); (void) SetImageProperty(image,"tiff:XResolution",value,exception); p=PushShortPixel(MSBEndian,p,&short_sans); p=PushShortPixel(MSBEndian,p,&short_sans); p=PushShortPixel(MSBEndian,p,&short_sans); p=PushShortPixel(MSBEndian,p,&resolution); image->resolution.y=(double) resolution; - (void) FormatLocaleString(value,MaxTextExtent,"%g",image->resolution.y); + (void) FormatLocaleString(value,MagickPathExtent,"%g",image->resolution.y); (void) SetImageProperty(image,"tiff:YResolution",value,exception); p=PushShortPixel(MSBEndian,p,&short_sans); p=PushShortPixel(MSBEndian,p,&short_sans); @@ -1110,7 +1110,7 @@ static MagickStatusType ReadPSDLayer(Image *image,const PSDInfo *psd_info, LayerInfo* layer_info,ExceptionInfo *exception) { char - message[MaxTextExtent]; + message[MagickPathExtent]; MagickStatusType status; @@ -1137,13 +1137,13 @@ static MagickStatusType ReadPSDLayer(Image *image,const PSDInfo *psd_info, /* Set up some hidden attributes for folks that need them. */ - (void) FormatLocaleString(message,MaxTextExtent,"%.20gld", + (void) FormatLocaleString(message,MagickPathExtent,"%.20gld", (double) layer_info->page.x); (void) SetImageArtifact(layer_info->image,"psd:layer.x",message); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g", + (void) FormatLocaleString(message,MagickPathExtent,"%.20g", (double) layer_info->page.y); (void) SetImageArtifact(layer_info->image,"psd:layer.y",message); - (void) FormatLocaleString(message,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) layer_info->opacity); (void) SetImageArtifact(layer_info->image,"psd:layer.opacity",message); (void) SetImageProperty(layer_info->image,"label",(char *) layer_info->name, @@ -2744,12 +2744,12 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image, if (property == (const char *) NULL) { char - layer_name[MaxTextExtent]; + layer_name[MagickPathExtent]; (void) WriteBlobMSBLong(image,16); (void) WriteBlobMSBLong(image,0); (void) WriteBlobMSBLong(image,0); - (void) FormatLocaleString(layer_name,MaxTextExtent,"L%04ld",(long) + (void) FormatLocaleString(layer_name,MagickPathExtent,"L%04ld",(long) layer_count++); WritePascalString(image,layer_name,4); } diff --git a/coders/pwp.c b/coders/pwp.c index 23d18519e..e6e5555e2 100644 --- a/coders/pwp.c +++ b/coders/pwp.c @@ -153,7 +153,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception) count; unsigned char - magick[MaxTextExtent]; + magick[MagickPathExtent]; /* Open image file. @@ -221,7 +221,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception) next_image=ReadImage(read_info,exception); if (next_image == (Image *) NULL) break; - (void) FormatLocaleString(next_image->filename,MaxTextExtent, + (void) FormatLocaleString(next_image->filename,MagickPathExtent, "slide_%02ld.sfw",(long) next_image->scene); if (image == (Image *) NULL) image=next_image; diff --git a/coders/rgb.c b/coders/rgb.c index 67ecdc06e..28835421c 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -1327,7 +1327,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, } if (image_info->interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); @@ -1449,7 +1449,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, } (void) CloseBlob(image); (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,6,6); diff --git a/coders/sfw.c b/coders/sfw.c index ff7e8e221..5f7fa0c09 100644 --- a/coders/sfw.c +++ b/coders/sfw.c @@ -314,7 +314,7 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception) buffer=(unsigned char *) RelinquishMagickMemory(buffer); read_info=DestroyImageInfo(read_info); (void) CopyMagickString(image->filename,read_info->filename, - MaxTextExtent); + MagickPathExtent); ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile", image->filename); image=DestroyImageList(image); @@ -353,8 +353,8 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception) image=DestroyImageList(image); return(jpeg_image); } - (void) CopyMagickString(jpeg_image->filename,image->filename,MaxTextExtent); - (void) CopyMagickString(jpeg_image->magick,image->magick,MaxTextExtent); + (void) CopyMagickString(jpeg_image->filename,image->filename,MagickPathExtent); + (void) CopyMagickString(jpeg_image->magick,image->magick,MagickPathExtent); image=DestroyImageList(image); image=jpeg_image; /* diff --git a/coders/sixel.c b/coders/sixel.c index fcd522126..77e84346e 100644 --- a/coders/sixel.c +++ b/coders/sixel.c @@ -991,7 +991,7 @@ static Image *ReadSIXELImage(const ImageInfo *image_info,ExceptionInfo *exceptio /* Read SIXEL file. */ - length=MaxTextExtent; + length=MagickPathExtent; sixel_buffer=(char *) AcquireQuantumMemory((size_t) length,sizeof(*sixel_buffer)); p=sixel_buffer; if (sixel_buffer != (char *) NULL) @@ -1002,10 +1002,10 @@ static Image *ReadSIXELImage(const ImageInfo *image_info,ExceptionInfo *exceptio if ((*p == '}') && (*(p+1) == ';')) break; p+=strlen(p); - if ((size_t) (p-sixel_buffer+MaxTextExtent) < length) + if ((size_t) (p-sixel_buffer+MagickPathExtent) < length) continue; length<<=1; - sixel_buffer=(char *) ResizeQuantumMemory(sixel_buffer,length+MaxTextExtent, + sixel_buffer=(char *) ResizeQuantumMemory(sixel_buffer,length+MagickPathExtent, sizeof(*sixel_buffer)); if (sixel_buffer == (char *) NULL) break; diff --git a/coders/svg.c b/coders/svg.c index e9cb5aa3d..1ffb60060 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -288,7 +288,7 @@ static double GetUserSpaceCoordinateValue(const SVGInfo *svg_info,int type, const char *string) { char - token[MaxTextExtent]; + token[MagickPathExtent]; const char *p; @@ -775,8 +775,8 @@ static void SVGStartElement(void *context,const xmlChar *name, { char *color, - id[MaxTextExtent], - token[MaxTextExtent], + id[MagickPathExtent], + token[MagickPathExtent], **tokens, *units; @@ -871,7 +871,7 @@ static void SVGStartElement(void *context,const xmlChar *name, { if (LocaleCompare(keyword,"id") == 0) { - (void) CopyMagickString(id,value,MaxTextExtent); + (void) CopyMagickString(id,value,MagickPathExtent); break; } break; @@ -2583,7 +2583,7 @@ static void SVGWarning(void *context,const char *format,...) { char *message, - reason[MaxTextExtent]; + reason[MagickPathExtent]; SVGInfo *svg_info; @@ -2602,7 +2602,7 @@ static void SVGWarning(void *context,const char *format,...) #if !defined(MAGICKCORE_HAVE_VSNPRINTF) (void) vsprintf(reason,format,operands); #else - (void) vsnprintf(reason,MaxTextExtent,format,operands); + (void) vsnprintf(reason,MagickPathExtent,format,operands); #endif message=GetExceptionMessage(errno); (void) ThrowMagickException(svg_info->exception,GetMagickModule(), @@ -2615,7 +2615,7 @@ static void SVGError(void *context,const char *format,...) { char *message, - reason[MaxTextExtent]; + reason[MagickPathExtent]; SVGInfo *svg_info; @@ -2634,7 +2634,7 @@ static void SVGError(void *context,const char *format,...) #if !defined(MAGICKCORE_HAVE_VSNPRINTF) (void) vsprintf(reason,format,operands); #else - (void) vsnprintf(reason,MaxTextExtent,format,operands); + (void) vsnprintf(reason,MagickPathExtent,format,operands); #endif message=GetExceptionMessage(errno); (void) ThrowMagickException(svg_info->exception,GetMagickModule(),CoderError, @@ -2750,7 +2750,7 @@ static char static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -2769,7 +2769,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) *svg_info; unsigned char - message[MaxTextExtent]; + message[MagickPathExtent]; xmlSAXHandler sax_modules; @@ -2817,13 +2817,13 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (delegate_info != (const DelegateInfo *) NULL) { char - background[MaxTextExtent], - command[MaxTextExtent], + background[MagickPathExtent], + command[MagickPathExtent], *density, - input_filename[MaxTextExtent], - opacity[MaxTextExtent], - output_filename[MaxTextExtent], - unique[MaxTextExtent]; + input_filename[MagickPathExtent], + opacity[MagickPathExtent], + output_filename[MagickPathExtent], + unique[MagickPathExtent]; int status; @@ -2838,16 +2838,16 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) AcquireUniqueFilename(output_filename); (void) AcquireUniqueFilename(unique); density=AcquireString(""); - (void) FormatLocaleString(density,MaxTextExtent,"%.20g,%.20g", + (void) FormatLocaleString(density,MagickPathExtent,"%.20g,%.20g", image->resolution.x,image->resolution.y); - (void) FormatLocaleString(background,MaxTextExtent, + (void) FormatLocaleString(background,MagickPathExtent, "rgb(%.20g%%,%.20g%%,%.20g%%)", 100.0*QuantumScale*image->background_color.red, 100.0*QuantumScale*image->background_color.green, 100.0*QuantumScale*image->background_color.blue); - (void) FormatLocaleString(opacity,MaxTextExtent,"%.20g", + (void) FormatLocaleString(opacity,MagickPathExtent,"%.20g", QuantumScale*image->background_color.alpha); - (void) FormatLocaleString(command,MaxTextExtent,GetDelegateCommands( + (void) FormatLocaleString(command,MagickPathExtent,GetDelegateCommands( delegate_info),input_filename,output_filename,density,background, opacity,unique); density=DestroyString(density); @@ -2866,7 +2866,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info=CloneImageInfo(image_info); (void) CopyMagickString(read_info->filename,output_filename, - MaxTextExtent); + MagickPathExtent); svg_image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); (void) RelinquishUniqueFileResource(output_filename); @@ -2932,7 +2932,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((image->resolution.x != 90.0) && (image->resolution.y != 90.0)) rsvg_handle_set_dpi_x_y(svg_handle,image->resolution.x, image->resolution.y); - while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) + while ((n=ReadBlob(image,MagickPathExtent,message)) != 0) { error=(GError *) NULL; (void) rsvg_handle_write(svg_handle,message,n,&error); @@ -3080,7 +3080,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) file=fdopen(unique_file,"w"); if ((unique_file == -1) || (file == (FILE *) NULL)) { - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile", image->filename); image=DestroyImageList(image); @@ -3135,12 +3135,12 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) sax_modules.cdataBlock=SVGCDataBlock; sax_modules.externalSubset=SVGExternalSubset; sax_handler=(&sax_modules); - n=ReadBlob(image,MaxTextExtent,message); + n=ReadBlob(image,MagickPathExtent,message); if (n > 0) { svg_info->parser=xmlCreatePushParserCtxt(sax_handler,svg_info,(char *) message,n,image->filename); - while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) + while ((n=ReadBlob(image,MagickPathExtent,message)) != 0) { status=xmlParseChunk(svg_info->parser,(char *) message,(int) n,0); if (status != 0) @@ -3174,13 +3174,13 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) SetImageInfoBlob(read_info,(void *) NULL,0); if (read_info->density != (char *) NULL) read_info->density=DestroyString(read_info->density); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"mvg:%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"mvg:%s", filename); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); } /* Relinquish resources. @@ -3225,14 +3225,14 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) ModuleExport size_t RegisterSVGImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(LIBXML_DOTTED_VERSION) - (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MaxTextExtent); + (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MagickPathExtent); #endif #if defined(MAGICKCORE_RSVG_DELEGATE) #if !GLIB_CHECK_VERSION(2,35,0) @@ -3241,7 +3241,7 @@ ModuleExport size_t RegisterSVGImage(void) #if defined(MAGICKCORE_XML_DELEGATE) xmlInitParser(); #endif - (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d", + (void) FormatLocaleString(version,MagickPathExtent,"RSVG %d.%d.%d", LIBRSVG_MAJOR_VERSION,LIBRSVG_MINOR_VERSION,LIBRSVG_MICRO_VERSION); #endif entry=AcquireMagickInfo("SVG","SVG","Scalable Vector Graphics"); @@ -3339,7 +3339,7 @@ ModuleExport void UnregisterSVGImage(void) static void AffineToTransform(Image *image,AffineMatrix *affine) { char - transform[MaxTextExtent]; + transform[MagickPathExtent]; if ((fabs(affine->tx) < MagickEpsilon) && (fabs(affine->ty) < MagickEpsilon)) { @@ -3352,7 +3352,7 @@ static void AffineToTransform(Image *image,AffineMatrix *affine) (void) WriteBlobString(image,"\">\n"); return; } - (void) FormatLocaleString(transform,MaxTextExtent, + (void) FormatLocaleString(transform,MagickPathExtent, "\" transform=\"scale(%g,%g)\">\n",affine->sx,affine->sy); (void) WriteBlobString(image,transform); return; @@ -3368,7 +3368,7 @@ static void AffineToTransform(Image *image,AffineMatrix *affine) theta; theta=(180.0/MagickPI)*atan2(affine->rx,affine->sx); - (void) FormatLocaleString(transform,MaxTextExtent, + (void) FormatLocaleString(transform,MagickPathExtent, "\" transform=\"rotate(%g)\">\n",theta); (void) WriteBlobString(image,transform); return; @@ -3382,13 +3382,13 @@ static void AffineToTransform(Image *image,AffineMatrix *affine) (fabs(affine->ry) < MagickEpsilon) && (fabs(affine->sy-1.0) < MagickEpsilon)) { - (void) FormatLocaleString(transform,MaxTextExtent, + (void) FormatLocaleString(transform,MagickPathExtent, "\" transform=\"translate(%g,%g)\">\n",affine->tx,affine->ty); (void) WriteBlobString(image,transform); return; } } - (void) FormatLocaleString(transform,MaxTextExtent, + (void) FormatLocaleString(transform,MagickPathExtent, "\" transform=\"matrix(%g %g %g %g %g %g)\">\n", affine->sx,affine->rx,affine->ry,affine->sy,affine->tx,affine->ty); (void) WriteBlobString(image,transform); @@ -3483,7 +3483,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) { char *base64, - message[MaxTextExtent]; + message[MagickPathExtent]; Image *clone_image; @@ -3510,7 +3510,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) "\n"); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "magick,"PNG",MaxTextExtent); + (void) CopyMagickString(image_info->magick,"PNG",MagickPathExtent); blob_length=2048; blob=(unsigned char *) ImageToBlob(image_info,clone_image,&blob_length, exception); @@ -3535,7 +3535,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) encode_length=0; base64=Base64Encode(blob,blob_length,&encode_length); blob=(unsigned char *) RelinquishMagickMemory(blob); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " scene,(double) image->columns,(double) image->rows, @@ -3544,7 +3544,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) p=base64; for (i=(ssize_t) encode_length; i > 0; i-=76) { - (void) FormatLocaleString(message,MaxTextExtent,"%.76s",p); + (void) FormatLocaleString(message,MagickPathExtent,"%.76s",p); (void) WriteBlobString(image,message); p+=76; if (i > 76) @@ -3567,11 +3567,11 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, affine; char - keyword[MaxTextExtent], - message[MaxTextExtent], - name[MaxTextExtent], + keyword[MagickPathExtent], + message[MagickPathExtent], + name[MagickPathExtent], *token, - type[MaxTextExtent]; + type[MagickPathExtent]; const char *p, @@ -3644,7 +3644,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, "\n"); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "\n",(double) image->columns,(double) image->rows); (void) WriteBlobString(image,message); @@ -3763,7 +3763,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("clip-path",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "clip-path:url(#%s);",token); (void) WriteBlobString(image,message); break; @@ -3771,7 +3771,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("clip-rule",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "clip-rule:%s;",token); (void) WriteBlobString(image,message); break; @@ -3779,7 +3779,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("clip-units",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "clipPathUnits=%s;",token); (void) WriteBlobString(image,message); break; @@ -3803,7 +3803,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("decorate",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "text-decoration:%s;",token); (void) WriteBlobString(image,message); break; @@ -3828,7 +3828,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("fill",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"fill:%s;", + (void) FormatLocaleString(message,MagickPathExtent,"fill:%s;", token); (void) WriteBlobString(image,message); break; @@ -3836,7 +3836,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("fill-rule",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "fill-rule:%s;",token); (void) WriteBlobString(image,message); break; @@ -3844,7 +3844,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("fill-alpha",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "fill-alpha:%s;",token); (void) WriteBlobString(image,message); break; @@ -3852,7 +3852,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("font-family",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "font-family:%s;",token); (void) WriteBlobString(image,message); break; @@ -3860,7 +3860,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("font-stretch",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "font-stretch:%s;",token); (void) WriteBlobString(image,message); break; @@ -3868,7 +3868,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("font-style",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "font-style:%s;",token); (void) WriteBlobString(image,message); break; @@ -3876,7 +3876,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("font-size",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "font-size:%s;",token); (void) WriteBlobString(image,message); break; @@ -3884,7 +3884,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("font-weight",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "font-weight:%s;",token); (void) WriteBlobString(image,message); break; @@ -3903,7 +3903,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("text-align",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "text-align %s ",token); (void) WriteBlobString(image,message); break; @@ -3911,7 +3911,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("text-anchor",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "text-anchor %s ",token); (void) WriteBlobString(image,message); break; @@ -3948,7 +3948,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("opacity",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"opacity %s ", + (void) FormatLocaleString(message,MagickPathExtent,"opacity %s ", token); (void) WriteBlobString(image,message); break; @@ -3994,7 +3994,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, } if (LocaleCompare("gradient",token) == 0) { - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "\n",type); (void) WriteBlobString(image,message); break; @@ -4022,7 +4022,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("clip-path",token) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "\n",token); (void) WriteBlobString(image,message); break; @@ -4035,9 +4035,9 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("gradient",token) == 0) { GetMagickToken(q,&q,token); - (void) CopyMagickString(name,token,MaxTextExtent); + (void) CopyMagickString(name,token,MagickPathExtent); GetMagickToken(q,&q,token); - (void) CopyMagickString(type,token,MaxTextExtent); + (void) CopyMagickString(type,token,MagickPathExtent); GetMagickToken(q,&q,token); svg_info.segment.x1=StringToDouble(token,(char **) NULL); svg_info.element.cx=StringToDouble(token,(char **) NULL); @@ -4058,7 +4058,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, svg_info.segment.y2=StringToDouble(token,(char **) NULL); svg_info.element.minor=StringToDouble(token, (char **) NULL); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "<%sGradient id=\"%s\" x1=\"%g\" y1=\"%g\" x2=\"%g\" " "y2=\"%g\">\n",type,name,svg_info.segment.x1, svg_info.segment.y1,svg_info.segment.x2,svg_info.segment.y2); @@ -4069,7 +4069,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, GetMagickToken(q,&q,token); svg_info.element.angle=StringToDouble(token, (char **) NULL); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "<%sGradient id=\"%s\" cx=\"%g\" cy=\"%g\" r=\"%g\" " "fx=\"%g\" fy=\"%g\">\n",type,name, svg_info.element.cx,svg_info.element.cy, @@ -4093,7 +4093,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("pattern",token) == 0) { GetMagickToken(q,&q,token); - (void) CopyMagickString(name,token,MaxTextExtent); + (void) CopyMagickString(name,token,MagickPathExtent); GetMagickToken(q,&q,token); svg_info.bounds.x=StringToDouble(token,(char **) NULL); GetMagickToken(q,&q,token); @@ -4110,7 +4110,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, GetMagickToken(q,&q,token); svg_info.bounds.height=StringToDouble(token, (char **) NULL); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "\n",name,svg_info.bounds.x, svg_info.bounds.y,svg_info.bounds.width, @@ -4139,7 +4139,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("rotate",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"rotate(%s) ", + (void) FormatLocaleString(message,MagickPathExtent,"rotate(%s) ", token); (void) WriteBlobString(image,message); break; @@ -4163,7 +4163,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("skewX",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"skewX(%s) ", + (void) FormatLocaleString(message,MagickPathExtent,"skewX(%s) ", token); (void) WriteBlobString(image,message); break; @@ -4171,7 +4171,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("skewY",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"skewY(%s) ", + (void) FormatLocaleString(message,MagickPathExtent,"skewY(%s) ", token); (void) WriteBlobString(image,message); break; @@ -4179,12 +4179,12 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stop-color",keyword) == 0) { char - color[MaxTextExtent]; + color[MagickPathExtent]; GetMagickToken(q,&q,token); - (void) CopyMagickString(color,token,MaxTextExtent); + (void) CopyMagickString(color,token,MagickPathExtent); GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n",token,color); (void) WriteBlobString(image,message); break; @@ -4192,7 +4192,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"stroke:%s;", + (void) FormatLocaleString(message,MagickPathExtent,"stroke:%s;", token); (void) WriteBlobString(image,message); break; @@ -4200,7 +4200,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-antialias",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-antialias:%s;",token); (void) WriteBlobString(image,message); break; @@ -4220,7 +4220,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, for (j=0; j < k; j++) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent,"%s ", + (void) FormatLocaleString(message,MagickPathExtent,"%s ", token); (void) WriteBlobString(image,message); } @@ -4228,7 +4228,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, break; } GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-dasharray:%s;",token); (void) WriteBlobString(image,message); break; @@ -4236,7 +4236,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-dashoffset",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-dashoffset:%s;",token); (void) WriteBlobString(image,message); break; @@ -4244,7 +4244,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-linecap",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-linecap:%s;",token); (void) WriteBlobString(image,message); break; @@ -4252,7 +4252,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-linejoin",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-linejoin:%s;",token); (void) WriteBlobString(image,message); break; @@ -4260,7 +4260,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-miterlimit",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-miterlimit:%s;",token); (void) WriteBlobString(image,message); break; @@ -4268,7 +4268,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-opacity",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-opacity:%s;",token); (void) WriteBlobString(image,message); break; @@ -4276,7 +4276,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("stroke-width",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "stroke-width:%s;",token); (void) WriteBlobString(image,message); continue; @@ -4295,7 +4295,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, if (LocaleCompare("text-antialias",keyword) == 0) { GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, "text-antialias:%s;",token); (void) WriteBlobString(image,message); break; @@ -4415,7 +4415,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, status=MagickFalse; break; } - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n", primitive_info[j].point.x,primitive_info[j].point.y, primitive_info[j+1].point.x,primitive_info[j+1].point.y); @@ -4429,7 +4429,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, status=MagickFalse; break; } - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n", primitive_info[j].point.x,primitive_info[j].point.y, primitive_info[j+1].point.x-primitive_info[j].point.x, @@ -4444,7 +4444,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, status=MagickFalse; break; } - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n",primitive_info[j].point.x, primitive_info[j].point.y,primitive_info[j+1].point.x- @@ -4470,7 +4470,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, status=MagickFalse; break; } - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n", primitive_info[j].point.x,primitive_info[j].point.y, primitive_info[j+1].point.x,primitive_info[j+1].point.y); @@ -4490,7 +4490,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, } alpha=primitive_info[j+1].point.x-primitive_info[j].point.x; beta=primitive_info[j+1].point.y-primitive_info[j].point.y; - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n", primitive_info[j].point.x,primitive_info[j].point.y, hypot(alpha,beta)); @@ -4504,12 +4504,12 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, status=MagickFalse; break; } - (void) CopyMagickString(message," = 80) @@ -4533,12 +4533,12 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, primitive_info[i].coordinates=0; primitive_info[j].coordinates++; i++; - (void) CopyMagickString(message," = 80) @@ -4620,7 +4620,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, break; } GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " ",primitive_info[j].point.x, primitive_info[j].point.y); (void) WriteBlobString(image,message); @@ -4643,7 +4643,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, break; } GetMagickToken(q,&q,token); - (void) FormatLocaleString(message,MaxTextExtent, + (void) FormatLocaleString(message,MagickPathExtent, " \n",primitive_info[j].point.x, primitive_info[j].point.y,primitive_info[j+1].point.x, diff --git a/coders/tga.c b/coders/tga.c index 292c2203d..2cc0d0be1 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -289,8 +289,8 @@ static Image *ReadTGAImage(const ImageInfo *image_info, */ length=(size_t) tga_info.id_length; comment=(char *) NULL; - if (~length >= (MaxTextExtent-1)) - comment=(char *) AcquireQuantumMemory(length+MaxTextExtent, + if (~length >= (MagickPathExtent-1)) + comment=(char *) AcquireQuantumMemory(length+MagickPathExtent, sizeof(*comment)); if (comment == (char *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); diff --git a/coders/thumbnail.c b/coders/thumbnail.c index d54a67551..07dd0a196 100644 --- a/coders/thumbnail.c +++ b/coders/thumbnail.c @@ -177,7 +177,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, offset; unsigned char - magick[MaxTextExtent]; + magick[MagickPathExtent]; profile=GetImageProfile(image,"exif"); if (profile == (const StringInfo *) NULL) @@ -206,11 +206,11 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, (void) SetImageType(thumbnail_image,thumbnail_image->alpha_trait == UndefinedPixelTrait ? TrueColorType : TrueColorAlphaType,exception); (void) CopyMagickString(thumbnail_image->filename,image->filename, - MaxTextExtent); + MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"THUMBNAIL") == 0) - (void) FormatLocaleString(thumbnail_image->filename,MaxTextExtent, + (void) FormatLocaleString(thumbnail_image->filename,MagickPathExtent, "miff:%s",write_info->filename); status=WriteImage(write_info,thumbnail_image,exception); thumbnail_image=DestroyImage(thumbnail_image); diff --git a/coders/tiff.c b/coders/tiff.c index a85eebe11..43997f62d 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -303,7 +303,7 @@ static Image *ReadGROUP4Image(const ImageInfo *image_info, ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -392,16 +392,16 @@ static Image *ReadGROUP4Image(const ImageInfo *image_info, Read TIFF image. */ read_info=CloneImageInfo((ImageInfo *) NULL); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"%s",filename); + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"%s",filename); image=ReadTIFFImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); (void) CopyMagickString(image->magick_filename,image_info->filename, - MaxTextExtent); - (void) CopyMagickString(image->magick,"GROUP4",MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(image->magick,"GROUP4",MagickPathExtent); } (void) RelinquishUniqueFileResource(filename); return(image); @@ -535,17 +535,17 @@ static int TIFFCloseBlob(thandle_t image) static void TIFFErrors(const char *module,const char *format,va_list error) { char - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; #if defined(MAGICKCORE_HAVE_VSNPRINTF) - (void) vsnprintf(message,MaxTextExtent,format,error); + (void) vsnprintf(message,MagickPathExtent,format,error); #else (void) vsprintf(message,format,error); #endif - (void) ConcatenateMagickString(message,".",MaxTextExtent); + (void) ConcatenateMagickString(message,".",MagickPathExtent); exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception); if (exception != (ExceptionInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),CoderError,message, @@ -601,7 +601,7 @@ static void TIFFGetProfiles(TIFF *tiff,Image *image,ExceptionInfo *exception) static void TIFFGetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception) { char - message[MaxTextExtent], + message[MagickPathExtent], *text; uint32 @@ -625,8 +625,8 @@ static void TIFFGetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception) (void) SetImageProperty(image,"tiff:model",text,exception); if (TIFFGetField(tiff,TIFFTAG_OPIIMAGEID,&count,&text) == 1) { - if (count >= MaxTextExtent) - count=MaxTextExtent-1; + if (count >= MagickPathExtent) + count=MagickPathExtent-1; (void) CopyMagickString(message,text,count+1); (void) SetImageProperty(image,"tiff:image-id",message,exception); } @@ -636,15 +636,15 @@ static void TIFFGetProperties(TIFF *tiff,Image *image,ExceptionInfo *exception) (void) SetImageProperty(image,"tiff:software",text,exception); if (TIFFGetField(tiff,33423,&count,&text) == 1) { - if (count >= MaxTextExtent) - count=MaxTextExtent-1; + if (count >= MagickPathExtent) + count=MagickPathExtent-1; (void) CopyMagickString(message,text,count+1); (void) SetImageProperty(image,"tiff:kodak-33423",message,exception); } if (TIFFGetField(tiff,36867,&count,&text) == 1) { - if (count >= MaxTextExtent) - count=MaxTextExtent-1; + if (count >= MagickPathExtent) + count=MagickPathExtent-1; (void) CopyMagickString(message,text,count+1); (void) SetImageProperty(image,"tiff:kodak-36867",message,exception); } @@ -655,7 +655,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, { #if defined(MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY) char - value[MaxTextExtent]; + value[MagickPathExtent]; register ssize_t i; @@ -699,7 +699,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, ascii=(char *) NULL; if ((TIFFGetField(tiff,exif_info[i].tag,&ascii,&sans,&sans) == 1) && (ascii != (char *) NULL) && (*ascii != '\0')) - (void) CopyMagickString(value,ascii,MaxTextExtent); + (void) CopyMagickString(value,ascii,MagickPathExtent); break; } case TIFF_SHORT: @@ -711,7 +711,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, shorty=0; if (TIFFGetField(tiff,exif_info[i].tag,&shorty,&sans,&sans) == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%d",shorty); + (void) FormatLocaleString(value,MagickPathExtent,"%d",shorty); } else { @@ -727,7 +727,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, tiff_status=TIFFGetField(tiff,exif_info[i].tag,&shorty_num,&shorty, &sans,&sans); if (tiff_status == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%d", + (void) FormatLocaleString(value,MagickPathExtent,"%d", shorty_num != 0 ? shorty[0] : 0); } break; @@ -739,7 +739,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, longy=0; if (TIFFGetField(tiff,exif_info[i].tag,&longy,&sans,&sans) == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%d",longy); + (void) FormatLocaleString(value,MagickPathExtent,"%d",longy); break; } #if defined(TIFF_VERSION_BIG) @@ -750,7 +750,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, long8y=0; if (TIFFGetField(tiff,exif_info[i].tag,&long8y,&sans,&sans) == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double) + (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) ((MagickOffsetType) long8y)); break; } @@ -764,7 +764,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, floaty=0.0; if (TIFFGetField(tiff,exif_info[i].tag,&floaty,&sans,&sans) == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%g",(double) floaty); + (void) FormatLocaleString(value,MagickPathExtent,"%g",(double) floaty); break; } case TIFF_DOUBLE: @@ -774,7 +774,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, doubley=0.0; if (TIFFGetField(tiff,exif_info[i].tag,&doubley,&sans,&sans) == 1) - (void) FormatLocaleString(value,MaxTextExtent,"%g",doubley); + (void) FormatLocaleString(value,MagickPathExtent,"%g",doubley); break; } default: @@ -836,17 +836,17 @@ static void TIFFUnmapBlob(thandle_t image,tdata_t base,toff_t size) static void TIFFWarnings(const char *module,const char *format,va_list warning) { char - message[MaxTextExtent]; + message[MagickPathExtent]; ExceptionInfo *exception; #if defined(MAGICKCORE_HAVE_VSNPRINTF) - (void) vsnprintf(message,MaxTextExtent,format,warning); + (void) vsnprintf(message,MagickPathExtent,format,warning); #else (void) vsprintf(message,format,warning); #endif - (void) ConcatenateMagickString(message,".",MaxTextExtent); + (void) ConcatenateMagickString(message,".",MagickPathExtent); exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception); if (exception != (ExceptionInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),CoderWarning, @@ -1276,7 +1276,7 @@ RestoreMSCWarning #if defined(JPEG_SUPPORT) { char - sampling_factor[MaxTextExtent]; + sampling_factor[MagickPathExtent]; int tiff_status; @@ -1289,7 +1289,7 @@ RestoreMSCWarning &horizontal,&vertical); if (tiff_status == 1) { - (void) FormatLocaleString(sampling_factor,MaxTextExtent,"%dx%d", + (void) FormatLocaleString(sampling_factor,MagickPathExtent,"%dx%d", horizontal,vertical); (void) SetImageProperty(image,"jpeg:sampling-factor", sampling_factor,exception); @@ -1448,10 +1448,10 @@ RestoreMSCWarning if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1) { char - value[MaxTextExtent]; + value[MagickPathExtent]; method=ReadStripMethod; - (void) FormatLocaleString(value,MaxTextExtent,"%u", + (void) FormatLocaleString(value,MagickPathExtent,"%u", (unsigned int) rows_per_strip); (void) SetImageProperty(image,"tiff:rows-per-strip",value,exception); } @@ -2114,7 +2114,7 @@ ModuleExport size_t RegisterTIFFImage(void) #define TIFFDescription "Tagged Image File Format" char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; @@ -2135,7 +2135,7 @@ ModuleExport size_t RegisterTIFFImage(void) UnlockSemaphoreInfo(tiff_semaphore); *version='\0'; #if defined(TIFF_VERSION) - (void) FormatLocaleString(version,MaxTextExtent,"%d",TIFF_VERSION); + (void) FormatLocaleString(version,MagickPathExtent,"%d",TIFF_VERSION); #endif #if defined(MAGICKCORE_TIFF_DELEGATE) { @@ -2146,7 +2146,7 @@ ModuleExport size_t RegisterTIFFImage(void) i; p=TIFFGetVersion(); - for (i=0; (i < (MaxTextExtent-1)) && (*p != 0) && (*p != '\n'); i++) + for (i=0; (i < (MagickPathExtent-1)) && (*p != 0) && (*p != '\n'); i++) version[i]=(*p++); version[i]='\0'; } @@ -2291,7 +2291,7 @@ static MagickBooleanType WriteGROUP4Image(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -2355,7 +2355,7 @@ static MagickBooleanType WriteGROUP4Image(const ImageInfo *image_info, filename); return(MagickFalse); } - (void) FormatLocaleString(huffman_image->filename,MaxTextExtent,"tiff:%s", + (void) FormatLocaleString(huffman_image->filename,MagickPathExtent,"tiff:%s", filename); (void) SetImageType(huffman_image,BilevelType,exception); write_info=CloneImageInfo((ImageInfo *) NULL); @@ -2513,8 +2513,8 @@ static MagickBooleanType WritePTIFImage(const ImageInfo *image_info, */ write_info=CloneImageInfo(image_info); write_info->adjoin=MagickTrue; - (void) CopyMagickString(write_info->magick,"TIFF",MaxTextExtent); - (void) CopyMagickString(images->magick,"TIFF",MaxTextExtent); + (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent); + (void) CopyMagickString(images->magick,"TIFF",MagickPathExtent); status=WriteTIFFImage(write_info,images,exception); images=DestroyImageList(images); write_info=DestroyImageInfo(write_info); diff --git a/coders/tile.c b/coders/tile.c index 03924e432..cafe8dc17 100644 --- a/coders/tile.c +++ b/coders/tile.c @@ -126,7 +126,7 @@ static Image *ReadTILEImage(const ImageInfo *image_info, image->alpha_trait=tile_image->alpha_trait; if (image->alpha_trait != UndefinedPixelTrait) (void) SetImageBackgroundColor(image,exception); - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); if (LocaleCompare(tile_image->magick,"PATTERN") == 0) { tile_image->tile_offset.x=0; diff --git a/coders/ttf.c b/coders/ttf.c index 559f6be0f..11cd34d6e 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -167,7 +167,7 @@ static MagickBooleanType IsTTF(const unsigned char *magick,const size_t length) static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], *text; const char @@ -217,7 +217,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) type_info=GetTypeInfo(image_info->filename,exception); if ((type_info != (const TypeInfo *) NULL) && (type_info->glyphs != (char *) NULL)) - (void) CopyMagickString(image->filename,type_info->glyphs,MaxTextExtent); + (void) CopyMagickString(image->filename,type_info->glyphs,MagickPathExtent); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) { @@ -244,8 +244,8 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - (void) CopyMagickString(image->magick,image_info->magick,MaxTextExtent); - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(image->magick,image_info->magick,MagickPathExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); /* Prepare drawing commands */ @@ -253,29 +253,29 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL); draw_info->font=AcquireString(image->filename); ConcatenateString(&draw_info->primitive,"push graphic-context\n"); - (void) FormatLocaleString(buffer,MaxTextExtent," viewbox 0 0 %.20g %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent," viewbox 0 0 %.20g %.20g\n", (double) image->columns,(double) image->rows); ConcatenateString(&draw_info->primitive,buffer); ConcatenateString(&draw_info->primitive," font-size 18\n"); - (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '",(double) y); + (void) FormatLocaleString(buffer,MagickPathExtent," text 10,%.20g '",(double) y); ConcatenateString(&draw_info->primitive,buffer); text=EscapeString(Text,'"'); ConcatenateString(&draw_info->primitive,text); text=DestroyString(text); - (void) FormatLocaleString(buffer,MaxTextExtent,"'\n"); + (void) FormatLocaleString(buffer,MagickPathExtent,"'\n"); ConcatenateString(&draw_info->primitive,buffer); y+=20*(ssize_t) MultilineCensus((char *) Text)+20; for (i=12; i <= 72; i+=6) { y+=i+12; ConcatenateString(&draw_info->primitive," font-size 18\n"); - (void) FormatLocaleString(buffer,MaxTextExtent," text 10,%.20g '%.20g'\n", + (void) FormatLocaleString(buffer,MagickPathExtent," text 10,%.20g '%.20g'\n", (double) y,(double) i); ConcatenateString(&draw_info->primitive,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent," font-size %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent," font-size %.20g\n", (double) i); ConcatenateString(&draw_info->primitive,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent," text 50,%.20g " + (void) FormatLocaleString(buffer,MagickPathExtent," text 50,%.20g " "'That which does not destroy me, only makes me stronger.'\n",(double) y); ConcatenateString(&draw_info->primitive,buffer); if (i >= 24) @@ -318,14 +318,14 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) ModuleExport size_t RegisterTTFImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; *version='\0'; #if defined(FREETYPE_MAJOR) && defined(FREETYPE_MINOR) && defined(FREETYPE_PATCH) - (void) FormatLocaleString(version,MaxTextExtent,"Freetype %d.%d.%d", + (void) FormatLocaleString(version,MagickPathExtent,"Freetype %d.%d.%d", FREETYPE_MAJOR,FREETYPE_MINOR,FREETYPE_PATCH); #endif entry=AcquireMagickInfo("TTF","DFONT","Multi-face font package"); diff --git a/coders/txt.c b/coders/txt.c index fa321a092..b92a0fada 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -104,7 +104,7 @@ static MagickBooleanType IsTXT(const unsigned char *magick,const size_t length) #define MagickID "# ImageMagick pixel enumeration:" char - colorspace[MaxTextExtent]; + colorspace[MagickPathExtent]; ssize_t count; @@ -160,8 +160,8 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, char *text,ExceptionInfo *exception) { char - filename[MaxTextExtent], - geometry[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], *p; DrawInfo @@ -241,7 +241,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); (void) CopyMagickString(read_info->filename,image_info->texture, - MaxTextExtent); + MagickPathExtent); texture=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); } @@ -251,17 +251,17 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, (void) SetImageBackgroundColor(image,exception); draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL); (void) CloneString(&draw_info->text,image_info->filename); - (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x, + (void) FormatLocaleString(geometry,MagickPathExtent,"0x0%+ld%+ld",(long) page.x, (long) page.y); (void) CloneString(&draw_info->geometry,geometry); status=GetTypeMetrics(image,draw_info,&metrics,exception); if (status == MagickFalse) ThrowReaderException(TypeError,"UnableToGetTypeMetrics"); page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5); - (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x, + (void) FormatLocaleString(geometry,MagickPathExtent,"0x0%+ld%+ld",(long) page.x, (long) page.y); (void) CloneString(&draw_info->geometry,geometry); - (void) CopyMagickString(filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(filename,image_info->filename,MagickPathExtent); if (*draw_info->text != '\0') *draw_info->text='\0'; p=text; @@ -310,7 +310,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, image->next->columns=image->columns; image->next->rows=image->rows; image=SyncNextImageInList(image); - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); (void) SetImageBackgroundColor(image,exception); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), GetBlobSize(image)); @@ -364,8 +364,8 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - colorspace[MaxTextExtent], - text[MaxTextExtent]; + colorspace[MagickPathExtent], + text[MagickPathExtent]; Image *image; @@ -672,9 +672,9 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - buffer[MaxTextExtent], - colorspace[MaxTextExtent], - tuple[MaxTextExtent]; + buffer[MagickPathExtent], + colorspace[MagickPathExtent], + tuple[MagickPathExtent]; MagickBooleanType status; @@ -713,15 +713,15 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, compliance; (void) CopyMagickString(colorspace,CommandOptionToMnemonic( - MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent); + MagickColorspaceOptions,(ssize_t) image->colorspace),MagickPathExtent); LocaleLower(colorspace); image->depth=GetImageQuantumDepth(image,MagickTrue); if (image->alpha_trait != UndefinedPixelTrait) - (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent); + (void) ConcatenateMagickString(colorspace,"a",MagickPathExtent); compliance=NoCompliance; if (LocaleCompare(image_info->magick,"SPARSE-COLOR") != 0) { - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double) image->columns,(double) image->rows,(double) ((MagickOffsetType) GetQuantumRange(image->depth)),colorspace); @@ -750,7 +750,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, if (GetPixelAlpha(image,p) == (Quantum) OpaqueAlpha) { GetColorTuple(&pixel,MagickFalse,tuple); - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g,", + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g,", (double) x,(double) y); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,tuple); @@ -759,39 +759,39 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, p+=GetPixelChannels(image); continue; } - (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double) + (void) FormatLocaleString(buffer,MagickPathExtent,"%.20g,%.20g: ",(double) x,(double) y); (void) WriteBlobString(image,buffer); - (void) CopyMagickString(tuple,"(",MaxTextExtent); + (void) CopyMagickString(tuple,"(",MagickPathExtent); if (pixel.colorspace == GRAYColorspace) ConcatenateColorComponent(&pixel,GrayPixelChannel,compliance, tuple); else { ConcatenateColorComponent(&pixel,RedPixelChannel,compliance,tuple); - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,GreenPixelChannel,compliance, tuple); - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,BluePixelChannel,compliance,tuple); } if (pixel.colorspace == CMYKColorspace) { - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,BlackPixelChannel,compliance, tuple); } if (pixel.alpha_trait != UndefinedPixelTrait) { - (void) ConcatenateMagickString(tuple,",",MaxTextExtent); + (void) ConcatenateMagickString(tuple,",",MagickPathExtent); ConcatenateColorComponent(&pixel,AlphaPixelChannel,compliance, tuple); } - (void) ConcatenateMagickString(tuple,")",MaxTextExtent); + (void) ConcatenateMagickString(tuple,")",MagickPathExtent); (void) WriteBlobString(image,tuple); (void) WriteBlobString(image," "); GetColorTuple(&pixel,MagickTrue,tuple); - (void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s",tuple); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image," "); (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception); diff --git a/coders/uil.c b/coders/uil.c index ad42fdfed..82e6d4bae 100644 --- a/coders/uil.c +++ b/coders/uil.c @@ -161,9 +161,9 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, #define MaxCixels 92 char - basename[MaxTextExtent], - buffer[MaxTextExtent], - name[MaxTextExtent], + basename[MagickPathExtent], + buffer[MagickPathExtent], + name[MagickPathExtent], *symbol; int @@ -291,7 +291,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, symbol=AcquireString(""); (void) WriteBlobString(image,"/* UIL */\n"); GetPathComponent(image->filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "value\n %s_ct : color_table(\n",basename); (void) WriteBlobString(image,buffer); GetPixelInfo(image,&pixel); @@ -307,7 +307,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, GetColorTuple(&pixel,MagickTrue,name); if (transparent != MagickFalse) if (i == (ssize_t) (colors-1)) - (void) CopyMagickString(name,"None",MaxTextExtent); + (void) CopyMagickString(name,"None",MagickPathExtent); /* Write UIL color. */ @@ -321,15 +321,15 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, symbol[j]='\0'; (void) SubstituteString(&symbol,"'","''"); if (LocaleCompare(name,"None") == 0) - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " background color = '%s'",symbol); else - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " color('%s',%s) = '%s'",name, GetPixelInfoIntensity(image,image->colormap+i) < (QuantumRange/2.0) ? "background" : "foreground",symbol); (void) WriteBlobString(image,buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"%s", + (void) FormatLocaleString(buffer,MagickPathExtent,"%s", (i == (ssize_t) (colors-1) ? ");\n" : ",\n")); (void) WriteBlobString(image,buffer); } @@ -337,7 +337,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, Define UIL pixels. */ GetPathComponent(image->filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, " %s_icon : icon(color_table = %s_ct,\n",basename,basename); (void) WriteBlobString(image,buffer); for (y=0; y < (ssize_t) image->rows; y++) @@ -357,11 +357,11 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, symbol[j]=Cixel[k]; } symbol[j]='\0'; - (void) CopyMagickString(buffer,symbol,MaxTextExtent); + (void) CopyMagickString(buffer,symbol,MagickPathExtent); (void) WriteBlobString(image,buffer); p+=GetPixelChannels(image); } - (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n", (y == (ssize_t) (image->rows-1) ? ");" : ",")); (void) WriteBlobString(image,buffer); status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, diff --git a/coders/url.c b/coders/url.c index b8b241e78..5449b4229 100644 --- a/coders/url.c +++ b/coders/url.c @@ -133,7 +133,7 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception) #define MaxBufferExtent 8192 char - filename[MaxTextExtent]; + filename[MagickPathExtent]; FILE *file; @@ -161,16 +161,16 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info=DestroyImageInfo(read_info); return((Image *) NULL); } - (void) CopyMagickString(filename,image_info->magick,MaxTextExtent); - (void) ConcatenateMagickString(filename,":",MaxTextExtent); + (void) CopyMagickString(filename,image_info->magick,MagickPathExtent); + (void) ConcatenateMagickString(filename,":",MagickPathExtent); LocaleLower(filename); - (void) ConcatenateMagickString(filename,image_info->filename,MaxTextExtent); + (void) ConcatenateMagickString(filename,image_info->filename,MagickPathExtent); if (LocaleCompare(read_info->magick,"file") == 0) { (void) RelinquishUniqueFileResource(read_info->filename); unique_file=(-1); (void) CopyMagickString(read_info->filename,image_info->filename+2, - MaxTextExtent); + MagickPathExtent); } #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \ !(defined(__MINGW32__) || defined(__MINGW64__)) @@ -246,7 +246,7 @@ static Image *ReadURLImage(const ImageInfo *image_info,ExceptionInfo *exception) clone_info=CloneImageInfo(image_info); sans=AcquireExceptionInfo(); (void) SetImageInfo(clone_info,0,sans); - (void) CopyMagickString(read_info->magick,clone_info->magick,MaxTextExtent); + (void) CopyMagickString(read_info->magick,clone_info->magick,MagickPathExtent); clone_info=DestroyImageInfo(clone_info); sans=DestroyExceptionInfo(sans); } diff --git a/coders/uyvy.c b/coders/uyvy.c index b31eb44a7..ff9ec4f39 100644 --- a/coders/uyvy.c +++ b/coders/uyvy.c @@ -132,7 +132,7 @@ static Image *ReadUYVYImage(const ImageInfo *image_info, ThrowReaderException(OptionError,"MustSpecifyImageSize"); if ((image->columns % 2) != 0) image->columns++; - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) return((Image *) NULL); diff --git a/coders/vicar.c b/coders/vicar.c index 876a42c3b..0d7e389ce 100644 --- a/coders/vicar.c +++ b/coders/vicar.c @@ -146,8 +146,8 @@ static Image *ReadVICARImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - keyword[MaxTextExtent], - value[MaxTextExtent]; + keyword[MagickPathExtent], + value[MagickPathExtent]; const void *pixels; @@ -226,7 +226,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info, p=keyword; do { - if ((size_t) (p-keyword) < (MaxTextExtent-1)) + if ((size_t) (p-keyword) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); count++; @@ -245,7 +245,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info, p=value; while (isalnum(c)) { - if ((size_t) (p-value) < (MaxTextExtent-1)) + if ((size_t) (p-value) < (MagickPathExtent-1)) *p++=c; c=ReadBlobByte(image); count++; @@ -425,7 +425,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { char - header[MaxTextExtent]; + header[MagickPathExtent]; int y; @@ -466,13 +466,13 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, /* Write header. */ - (void) ResetMagickMemory(header,' ',MaxTextExtent); - (void) FormatLocaleString(header,MaxTextExtent, + (void) ResetMagickMemory(header,' ',MagickPathExtent); + (void) FormatLocaleString(header,MagickPathExtent, "LBLSIZE=%.20g FORMAT='BYTE' TYPE='IMAGE' BUFSIZE=20000 DIM=2 EOL=0 " "RECSIZE=%.20g ORG='BSQ' NL=%.20g NS=%.20g NB=1 N1=0 N2=0 N3=0 N4=0 NBB=0 " - "NLB=0 TASK='ImageMagick'",(double) MaxTextExtent,(double) image->columns, + "NLB=0 TASK='ImageMagick'",(double) MagickPathExtent,(double) image->columns, (double) image->rows,(double) image->columns); - (void) WriteBlob(image,MaxTextExtent,(unsigned char *) header); + (void) WriteBlob(image,MagickPathExtent,(unsigned char *) header); /* Write VICAR pixels. */ diff --git a/coders/vid.c b/coders/vid.c index 68ee524b5..b57d26b0a 100644 --- a/coders/vid.c +++ b/coders/vid.c @@ -163,7 +163,7 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image_info->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"name: %s", filelist[i]); - (void) CopyMagickString(read_info->filename,filelist[i],MaxTextExtent); + (void) CopyMagickString(read_info->filename,filelist[i],MagickPathExtent); filelist[i]=DestroyString(filelist[i]); *read_info->magick='\0'; next_image=ReadImage(read_info,exception); @@ -331,11 +331,11 @@ static MagickBooleanType WriteVIDImage(const ImageInfo *image_info,Image *image, if (montage_image == (Image *) NULL) return(MagickFalse); (void) CopyMagickString(montage_image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception); if (LocaleCompare(write_info->magick,"VID") == 0) - (void) FormatLocaleString(montage_image->filename,MaxTextExtent, + (void) FormatLocaleString(montage_image->filename,MagickPathExtent, "miff:%s",write_info->filename); status=WriteImage(write_info,montage_image,exception); montage_image=DestroyImage(montage_image); diff --git a/coders/vips.c b/coders/vips.c index 4267fa16a..11519ec9a 100644 --- a/coders/vips.c +++ b/coders/vips.c @@ -363,7 +363,7 @@ static Image *ReadVIPSImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - buffer[MaxTextExtent], + buffer[MagickPathExtent], *metadata; Image @@ -502,7 +502,7 @@ static Image *ReadVIPSImage(const ImageInfo *image_info, else ThrowReaderException(CoderError,"Unsupported coding"); metadata=(char *) NULL; - while ((n=ReadBlob(image,MaxTextExtent-1,(unsigned char *) buffer)) != 0) + while ((n=ReadBlob(image,MagickPathExtent-1,(unsigned char *) buffer)) != 0) { buffer[n]='\0'; if (metadata == (char *) NULL) diff --git a/coders/webp.c b/coders/webp.c index 372b1096c..d65e6e2e3 100644 --- a/coders/webp.c +++ b/coders/webp.c @@ -395,7 +395,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info, ModuleExport size_t RegisterWEBPImage(void) { char - version[MaxTextExtent]; + version[MagickPathExtent]; MagickInfo *entry; @@ -405,7 +405,7 @@ ModuleExport size_t RegisterWEBPImage(void) #if defined(MAGICKCORE_WEBP_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadWEBPImage; entry->encoder=(EncodeImageHandler *) WriteWEBPImage; - (void) FormatLocaleString(version,MaxTextExtent,"libwebp %d.%d.%d [%04X]", + (void) FormatLocaleString(version,MagickPathExtent,"libwebp %d.%d.%d [%04X]", (WebPGetDecoderVersion() >> 16) & 0xff, (WebPGetDecoderVersion() >> 8) & 0xff, (WebPGetDecoderVersion() >> 0) & 0xff,WEBP_DECODER_ABI_VERSION); diff --git a/coders/wmf.c b/coders/wmf.c index a0ad8aa95..c52d1d4e8 100644 --- a/coders/wmf.c +++ b/coders/wmf.c @@ -116,7 +116,7 @@ static long WMFTellBlob(void *image) static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; int unique_file; @@ -220,17 +220,17 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception) */ read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - (void) FormatLocaleString(read_info->filename,MaxTextExtent,"eps:%s", + (void) FormatLocaleString(read_info->filename,MagickPathExtent,"eps:%s", filename); image=ReadImage(read_info,exception); read_info=DestroyImageInfo(read_info); if (image != (Image *) NULL) { (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); (void) CopyMagickString(image->magick_filename,image_info->filename, - MaxTextExtent); - (void) CopyMagickString(image->magick,"WMF",MaxTextExtent); + MagickPathExtent); + (void) CopyMagickString(image->magick,"WMF",MagickPathExtent); } (void) RelinquishUniqueFileResource(filename); return(GetFirstImageInList(image)); @@ -532,9 +532,9 @@ static void draw_pattern_push( wmfAPI* API, unsigned long rows ) { char - pattern_id[MaxTextExtent]; + pattern_id[MagickPathExtent]; - (void) FormatLocaleString(pattern_id,MaxTextExtent,"brush_%lu",id); + (void) FormatLocaleString(pattern_id,MagickPathExtent,"brush_%lu",id); (void) DrawPushPattern(WmfDrawingWand,pattern_id,0,0,columns,rows); } @@ -744,13 +744,13 @@ static void ipa_bmp_read(wmfAPI * API, wmfBMP_Read_t * bmp_read) { image_info=CloneImageInfo(ddata->image_info); exception=ddata->exception; - (void) CopyMagickString(image_info->magick,"DIB",MaxTextExtent); + (void) CopyMagickString(image_info->magick,"DIB",MagickPathExtent); if (bmp_read->width || bmp_read->height) { char - size[MaxTextExtent]; + size[MagickPathExtent]; - (void) FormatLocaleString(size,MaxTextExtent,"%ux%u",bmp_read->width, + (void) FormatLocaleString(size,MagickPathExtent,"%ux%u",bmp_read->width, bmp_read->height); CloneString(&image_info->size,size); } @@ -827,7 +827,7 @@ static void ipa_device_close(wmfAPI * API) static void ipa_device_begin(wmfAPI * API) { char - comment[MaxTextExtent]; + comment[MagickPathExtent]; wmf_magick_t *ddata = WMF_MAGICK_GetData(API); @@ -837,7 +837,7 @@ static void ipa_device_begin(wmfAPI * API) DrawSetViewbox(WmfDrawingWand, 0, 0, ddata->image->columns, ddata->image->rows ); - (void) FormatLocaleString(comment,MaxTextExtent,"Created by ImageMagick %s", + (void) FormatLocaleString(comment,MagickPathExtent,"Created by ImageMagick %s", GetMagickVersion((size_t *) NULL)); DrawComment(WmfDrawingWand,comment); @@ -880,7 +880,7 @@ static void ipa_device_begin(wmfAPI * API) image_info = CloneImageInfo((ImageInfo *) 0); (void) CopyMagickString(image_info->filename,ddata->image_info->texture, - MaxTextExtent); + MagickPathExtent); if ( ddata->image_info->size ) CloneString(&image_info->size,ddata->image_info->size); @@ -890,12 +890,12 @@ static void ipa_device_begin(wmfAPI * API) if (image) { char - pattern_id[MaxTextExtent]; + pattern_id[MagickPathExtent]; MagickWand *magick_wand; - (void) CopyMagickString(image->magick,"MIFF",MaxTextExtent); + (void) CopyMagickString(image->magick,"MIFF",MagickPathExtent); DrawPushDefs(WmfDrawingWand); draw_pattern_push(API,ddata->pattern_id,image->columns,image->rows); magick_wand=NewMagickWandFromImage(image); @@ -904,7 +904,7 @@ static void ipa_device_begin(wmfAPI * API) magick_wand=DestroyMagickWand(magick_wand); (void) DrawPopPattern(WmfDrawingWand); DrawPopDefs(WmfDrawingWand); - (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu", + (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu", ddata->pattern_id); (void) DrawSetFillPatternURL(WmfDrawingWand,pattern_id); ++ddata->pattern_id; @@ -1345,12 +1345,12 @@ static void ipa_region_clip(wmfAPI *API, wmfPolyRectangle_t *poly_rect) if (poly_rect->count > 0) { char - clip_mask_id[MaxTextExtent]; + clip_mask_id[MagickPathExtent]; /* Define clip path */ ddata->clip_mask_id++; DrawPushDefs(WmfDrawingWand); - (void) FormatLocaleString(clip_mask_id,MaxTextExtent,"clip_%lu", + (void) FormatLocaleString(clip_mask_id,MagickPathExtent,"clip_%lu", ddata->clip_mask_id); DrawPushClipPath(WmfDrawingWand,clip_mask_id); (void) PushDrawingWand(WmfDrawingWand); @@ -1829,9 +1829,9 @@ static void util_set_brush(wmfAPI *API, wmfDC *dc,const BrushApply brush_apply) DrawPopDefs(WmfDrawingWand); { char - pattern_id[MaxTextExtent]; + pattern_id[MagickPathExtent]; - (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu", + (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu", ddata->pattern_id); if (brush_apply == BrushApplyStroke ) (void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id); @@ -1942,9 +1942,9 @@ static void util_set_brush(wmfAPI *API, wmfDC *dc,const BrushApply brush_apply) { char - pattern_id[MaxTextExtent]; + pattern_id[MagickPathExtent]; - (void) FormatLocaleString(pattern_id,MaxTextExtent,"#brush_%lu", + (void) FormatLocaleString(pattern_id,MagickPathExtent,"#brush_%lu", ddata->pattern_id); if ( brush_apply == BrushApplyStroke ) (void) DrawSetStrokePatternURL(WmfDrawingWand,pattern_id); @@ -2436,7 +2436,7 @@ static void lite_font_map( wmfAPI* API, wmfFont* font) if (!magick_font->ps_name) { char - target[MaxTextExtent]; + target[MagickPathExtent]; int target_weight = 400, @@ -2456,13 +2456,13 @@ static void lite_font_map( wmfAPI* API, wmfFont* font) strstr(wmf_font_name,"Oblique"))) ) want_italic = MagickTrue; - (void) CopyMagickString(target,"Times",MaxTextExtent); + (void) CopyMagickString(target,"Times",MagickPathExtent); for( i=0; SubFontMap[i].name != NULL; i++ ) { if (LocaleCompare(wmf_font_name, SubFontMap[i].name) == 0) { (void) CopyMagickString(target,SubFontMap[i].mapping, - MaxTextExtent); + MagickPathExtent); break; } } diff --git a/coders/wpg.c b/coders/wpg.c index ef961f0ff..0c7324446 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -737,7 +737,7 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info, MagickOffsetType PS_Offset,ssize_t PS_Size,ExceptionInfo *exception) { char - postscript_file[MaxTextExtent]; + postscript_file[MagickPathExtent]; const MagicInfo *magic_info; @@ -752,7 +752,7 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info, *image2; unsigned char - magick[2*MaxTextExtent]; + magick[2*MagickPathExtent]; if ((clone_info=CloneImageInfo(image_info)) == NULL) @@ -768,7 +768,7 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info, /* Copy postscript to temporary file */ (void) SeekBlob(image,PS_Offset,SEEK_SET); - (void) ReadBlob(image, 2*MaxTextExtent, magick); + (void) ReadBlob(image, 2*MagickPathExtent, magick); (void) SeekBlob(image,PS_Offset,SEEK_SET); while(PS_Size-- > 0) @@ -778,17 +778,17 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info, (void) fclose(ps_file); /* Detect file format - Check magic.mgk configuration file. */ - magic_info=GetMagicInfo(magick,2*MaxTextExtent,exception); + magic_info=GetMagicInfo(magick,2*MagickPathExtent,exception); if(magic_info == (const MagicInfo *) NULL) goto FINISH_UNL; /* printf("Detected:%s \n",magic_info->name); */ if(exception->severity != UndefinedException) goto FINISH_UNL; if(magic_info->name == (char *) NULL) goto FINISH_UNL; - (void) CopyMagickMemory(clone_info->magick,magic_info->name,MaxTextExtent); + (void) CopyMagickMemory(clone_info->magick,magic_info->name,MagickPathExtent); /* Read nested image */ /*FormatString(clone_info->filename,"%s:%s",magic_info->name,postscript_file);*/ - FormatLocaleString(clone_info->filename,MaxTextExtent,"%s",postscript_file); + FormatLocaleString(clone_info->filename,MagickPathExtent,"%s",postscript_file); image2=ReadImage(clone_info,exception); if (!image2) @@ -798,9 +798,9 @@ static Image *ExtractPostscript(Image *image,const ImageInfo *image_info, Replace current image with new image while copying base image attributes. */ - (void) CopyMagickMemory(image2->filename,image->filename,MaxTextExtent); - (void) CopyMagickMemory(image2->magick_filename,image->magick_filename,MaxTextExtent); - (void) CopyMagickMemory(image2->magick,image->magick,MaxTextExtent); + (void) CopyMagickMemory(image2->filename,image->filename,MagickPathExtent); + (void) CopyMagickMemory(image2->magick_filename,image->magick_filename,MagickPathExtent); + (void) CopyMagickMemory(image2->magick,image->magick,MagickPathExtent); image2->depth=image->depth; DestroyBlob(image2); image2->blob=ReferenceBlob(image->blob); diff --git a/coders/xbm.c b/coders/xbm.c index c3c080039..8350c72ae 100644 --- a/coders/xbm.c +++ b/coders/xbm.c @@ -171,8 +171,8 @@ static unsigned int XBMInteger(Image *image,short int *hex_digits) static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) { char - buffer[MaxTextExtent], - name[MaxTextExtent]; + buffer[MagickPathExtent], + name[MagickPathExtent]; Image *image; @@ -483,8 +483,8 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { char - basename[MaxTextExtent], - buffer[MaxTextExtent]; + basename[MagickPathExtent], + buffer[MagickPathExtent]; MagickBooleanType status; @@ -522,16 +522,16 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, Write X bitmap header. */ GetPathComponent(image->filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_width %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_width %.20g\n", basename,(double) image->columns); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); - (void) FormatLocaleString(buffer,MaxTextExtent,"#define %s_height %.20g\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"#define %s_height %.20g\n", basename,(double) image->rows); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "static char %s_bits[] = {\n",basename); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); - (void) CopyMagickString(buffer," ",MaxTextExtent); + (void) CopyMagickString(buffer," ",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); /* Convert MIFF to X bitmap pixels. @@ -542,7 +542,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, count=0; x=0; y=0; - (void) CopyMagickString(buffer," ",MaxTextExtent); + (void) CopyMagickString(buffer," ",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); for (y=0; y < (ssize_t) image->rows; y++) { @@ -560,13 +560,13 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, /* Write a bitmap byte to the image file. */ - (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ", + (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ", (unsigned int) (byte & 0xff)); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); count++; if (count == 12) { - (void) CopyMagickString(buffer,"\n ",MaxTextExtent); + (void) CopyMagickString(buffer,"\n ",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); count=0; }; @@ -581,13 +581,13 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, Write a bitmap byte to the image file. */ byte>>=(8-bit); - (void) FormatLocaleString(buffer,MaxTextExtent,"0x%02X, ", + (void) FormatLocaleString(buffer,MagickPathExtent,"0x%02X, ", (unsigned int) (byte & 0xff)); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); count++; if (count == 12) { - (void) CopyMagickString(buffer,"\n ",MaxTextExtent); + (void) CopyMagickString(buffer,"\n ",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); count=0; }; @@ -599,7 +599,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } - (void) CopyMagickString(buffer,"};\n",MaxTextExtent); + (void) CopyMagickString(buffer,"};\n",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); (void) CloseBlob(image); return(MagickTrue); diff --git a/coders/xc.c b/coders/xc.c index ff8456770..506a88dce 100644 --- a/coders/xc.c +++ b/coders/xc.c @@ -127,7 +127,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) status=SetImageExtent(image,image->columns,image->rows,exception); if (status == MagickFalse) return(DestroyImageList(image)); - (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent); + (void) CopyMagickString(image->filename,image_info->filename,MagickPathExtent); if (*image_info->filename == '\0') pixel=image->background_color; else diff --git a/coders/xpm.c b/coders/xpm.c index 8c3bb1cca..66cedba7c 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -237,8 +237,8 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) { char *grey, - key[MaxTextExtent], - target[MaxTextExtent], + key[MagickPathExtent], + target[MagickPathExtent], *xpm_buffer; Image @@ -296,7 +296,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Read XPM file. */ - length=MaxTextExtent; + length=MagickPathExtent; xpm_buffer=(char *) AcquireQuantumMemory((size_t) length,sizeof(*xpm_buffer)); if (xpm_buffer == (char *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); @@ -309,10 +309,10 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((*p == '}') && (*(p+1) == ';')) break; p+=strlen(p); - if ((size_t) (p-xpm_buffer+MaxTextExtent) < length) + if ((size_t) (p-xpm_buffer+MagickPathExtent) < length) continue; length<<=1; - xpm_buffer=(char *) ResizeQuantumMemory(xpm_buffer,length+MaxTextExtent, + xpm_buffer=(char *) ResizeQuantumMemory(xpm_buffer,length+MagickPathExtent, sizeof(*xpm_buffer)); if (xpm_buffer == (char *) NULL) break; @@ -375,12 +375,12 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) { p=next; next=NextXPMLine(p); - (void) CopyXPMColor(key,p,MagickMin((size_t) width,MaxTextExtent-1)); + (void) CopyXPMColor(key,p,MagickMin((size_t) width,MagickPathExtent-1)); status=AddValueToSplayTree(xpm_colors,ConstantString(key),(void *) j); /* Parse color. */ - (void) CopyMagickString(target,"gray",MaxTextExtent); + (void) CopyMagickString(target,"gray",MagickPathExtent); q=ParseXPMColor(p+width,MagickTrue); if (q != (char *) NULL) { @@ -390,9 +390,9 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) break; if (next != (char *) NULL) (void) CopyXPMColor(target,q,MagickMin((size_t) (next-q), - MaxTextExtent-1)); + MagickPathExtent-1)); else - (void) CopyMagickString(target,q,MaxTextExtent); + (void) CopyMagickString(target,q,MagickPathExtent); q=ParseXPMColor(target,MagickFalse); if (q != (char *) NULL) *q='\0'; @@ -438,7 +438,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - ssize_t count=CopyXPMColor(key,p,MagickMin(width,MaxTextExtent-1)); + ssize_t count=CopyXPMColor(key,p,MagickMin(width,MagickPathExtent-1)); if (count != (ssize_t) width) break; j=(ssize_t) GetValueFromSplayTree(xpm_colors,key); @@ -613,10 +613,10 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|"; char - buffer[MaxTextExtent], - basename[MaxTextExtent], - name[MaxTextExtent], - symbol[MaxTextExtent]; + buffer[MagickPathExtent], + basename[MagickPathExtent], + name[MagickPathExtent], + symbol[MagickPathExtent]; Image *affinity_image, @@ -762,11 +762,11 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, */ (void) WriteBlobString(image,"/* XPM */\n"); GetPathComponent(picon->filename,BasePath,basename); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "static char *%s[] = {\n",basename); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\"%.20g %.20g %.20g %.20g\",\n",(double) picon->columns,(double) picon->rows,(double) colors,(double) characters_per_pixel); (void) WriteBlobString(image,buffer); @@ -784,7 +784,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, if (transparent != MagickFalse) { if (i == (ssize_t) (colors-1)) - (void) CopyMagickString(name,"grey75",MaxTextExtent); + (void) CopyMagickString(name,"grey75",MagickPathExtent); } /* Write XPM color. @@ -797,7 +797,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, symbol[j]=Cixel[k]; } symbol[j]='\0'; - (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s c %s\",\n", symbol,name); (void) WriteBlobString(image,buffer); } @@ -821,11 +821,11 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, symbol[j]=Cixel[k]; } symbol[j]='\0'; - (void) CopyMagickString(buffer,symbol,MaxTextExtent); + (void) CopyMagickString(buffer,symbol,MagickPathExtent); (void) WriteBlobString(image,buffer); p+=GetPixelChannels(image); } - (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n", y == (ssize_t) (picon->rows-1) ? "" : ","); (void) WriteBlobString(image,buffer); status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, @@ -876,10 +876,10 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|"; char - buffer[MaxTextExtent], - basename[MaxTextExtent], - name[MaxTextExtent], - symbol[MaxTextExtent]; + buffer[MagickPathExtent], + basename[MagickPathExtent], + name[MagickPathExtent], + symbol[MagickPathExtent]; MagickBooleanType status; @@ -990,19 +990,19 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, GetPathComponent(image->filename,BasePath,basename); if (isalnum((int) ((unsigned char) *basename)) == 0) { - (void) FormatLocaleString(buffer,MaxTextExtent,"xpm_%s",basename); - (void) CopyMagickString(basename,buffer,MaxTextExtent); + (void) FormatLocaleString(buffer,MagickPathExtent,"xpm_%s",basename); + (void) CopyMagickString(basename,buffer,MagickPathExtent); } if (isalpha((int) ((unsigned char) basename[0])) == 0) basename[0]='_'; for (i=1; basename[i] != '\0'; i++) if (isalnum((int) ((unsigned char) basename[i])) == 0) basename[i]='_'; - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "static char *%s[] = {\n",basename); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n"); - (void) FormatLocaleString(buffer,MaxTextExtent, + (void) FormatLocaleString(buffer,MagickPathExtent, "\"%.20g %.20g %.20g %.20g \",\n",(double) image->columns,(double) image->rows,(double) image->colors,(double) characters_per_pixel); (void) WriteBlobString(image,buffer); @@ -1018,7 +1018,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, pixel.alpha=(double) OpaqueAlpha; (void) QueryColorname(image,&pixel,XPMCompliance,name,exception); if (i == opacity) - (void) CopyMagickString(name,"None",MaxTextExtent); + (void) CopyMagickString(name,"None",MagickPathExtent); /* Write XPM color. */ @@ -1030,7 +1030,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, symbol[j]=Cixel[k]; } symbol[j]='\0'; - (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s c %s\",\n",symbol, + (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s c %s\",\n",symbol, name); (void) WriteBlobString(image,buffer); } @@ -1054,11 +1054,11 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, symbol[j]=Cixel[k]; } symbol[j]='\0'; - (void) CopyMagickString(buffer,symbol,MaxTextExtent); + (void) CopyMagickString(buffer,symbol,MagickPathExtent); (void) WriteBlobString(image,buffer); p+=GetPixelChannels(image); } - (void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"\"%s\n", (y == (ssize_t) (image->rows-1) ? "" : ",")); (void) WriteBlobString(image,buffer); if (image->previous == (Image *) NULL) diff --git a/coders/xps.c b/coders/xps.c index 41ce5416f..a7f85159e 100644 --- a/coders/xps.c +++ b/coders/xps.c @@ -105,12 +105,12 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) #define RenderXPSText " Rendering XPS... " char - command[MaxTextExtent], + command[MagickPathExtent], *density, - filename[MaxTextExtent], - geometry[MaxTextExtent], + filename[MagickPathExtent], + geometry[MagickPathExtent], *options, - input_filename[MaxTextExtent]; + input_filename[MagickPathExtent]; const char *option; @@ -215,7 +215,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) */ *p++=(char) c; if ((c != (int) '/') && (c != '\n') && - ((size_t) (p-command) < (MaxTextExtent-1))) + ((size_t) (p-command) < (MagickPathExtent-1))) continue; *p='\0'; p=command; @@ -266,7 +266,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char *) NULL) (void) ParseAbsoluteGeometry(image_info->page,&page); - (void) FormatLocaleString(geometry,MaxTextExtent,"%.20gx%.20g",(double) + (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",(double) page.width,(double) page.height); if (image_info->monochrome != MagickFalse) delegate_info=GetDelegateInfo("xps:mono",(char *) NULL,exception); @@ -279,7 +279,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) return((Image *) NULL); density=AcquireString(""); options=AcquireString(""); - (void) FormatLocaleString(density,MaxTextExtent,"%gx%g", + (void) FormatLocaleString(density,MagickPathExtent,"%gx%g", image->resolution.x,image->resolution.y); if ((page.width == 0) || (page.height == 0)) (void) ParseAbsoluteGeometry(PSPageGeometry,&page); @@ -287,7 +287,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ParseAbsoluteGeometry(image_info->page,&page); page.width=(size_t) floor(page.width*image->resolution.y/delta.x+0.5); page.height=(size_t) floor(page.height*image->resolution.y/delta.y+0.5); - (void) FormatLocaleString(options,MaxTextExtent,"-g%.20gx%.20g ",(double) + (void) FormatLocaleString(options,MagickPathExtent,"-g%.20gx%.20g ",(double) page.width,(double) page.height); image=DestroyImage(image); read_info=CloneImageInfo(image_info); @@ -295,10 +295,10 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) if (read_info->number_scenes != 0) { if (read_info->number_scenes != 1) - (void) FormatLocaleString(options,MaxTextExtent,"-dLastPage=%.20g", + (void) FormatLocaleString(options,MagickPathExtent,"-dLastPage=%.20g", (double) (read_info->scene+read_info->number_scenes)); else - (void) FormatLocaleString(options,MaxTextExtent, + (void) FormatLocaleString(options,MagickPathExtent, "-dFirstPage=%.20g -dLastPage=%.20g",(double) read_info->scene+1, (double) (read_info->scene+read_info->number_scenes)); read_info->number_scenes=0; @@ -307,11 +307,11 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) } option=GetImageOption(image_info,"authenticate"); if (option != (const char *) NULL) - (void) FormatLocaleString(options+strlen(options),MaxTextExtent, + (void) FormatLocaleString(options+strlen(options),MagickPathExtent, " -sPCLPassword=%s",option); - (void) CopyMagickString(filename,read_info->filename,MaxTextExtent); + (void) CopyMagickString(filename,read_info->filename,MagickPathExtent); (void) AcquireUniqueFilename(read_info->filename); - (void) FormatLocaleString(command,MaxTextExtent, + (void) FormatLocaleString(command,MagickPathExtent, GetDelegateCommands(delegate_info), read_info->antialias != MagickFalse ? 4 : 1, read_info->antialias != MagickFalse ? 4 : 1,density,options, @@ -340,7 +340,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception) } do { - (void) CopyMagickString(image->filename,filename,MaxTextExtent); + (void) CopyMagickString(image->filename,filename,MagickPathExtent); image->page=page; next_image=SyncNextImageInList(image); if (next_image != (Image *) NULL) diff --git a/coders/xtrn.c b/coders/xtrn.c index 54798259e..977470948 100644 --- a/coders/xtrn.c +++ b/coders/xtrn.c @@ -166,7 +166,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info, *blob_length; char - filename[MaxTextExtent]; + filename[MagickPathExtent]; (void) sscanf(clone_info->filename,"%lx,%lx,%s",¶m1,¶m2,&filename); blob_data=(char **) param1; @@ -178,7 +178,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info, { char *blob_data, - filename[MaxTextExtent]; + filename[MagickPathExtent]; HRESULT hr; @@ -213,7 +213,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info, *clone_info->magick='\0'; if (*filename != '\0') (void) CopyMagickString(clone_info->filename,filename, - MaxTextExtent); + MagickPathExtent); image=BlobToImage(clone_info,blob_data,blob_length, exception); hr=SafeArrayUnaccessData(pSafeArray); @@ -459,7 +459,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, *blob_length; char - filename[MaxTextExtent]; + filename[MagickPathExtent]; clone_info=CloneImageInfo(image_info); if (clone_info->filename[0]) @@ -470,15 +470,15 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, blob_data=(char **) param1; blob_length=(size_t *) param2; scene = 0; - (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(clone_info->filename,filename,MagickPathExtent); for (p=image; p != (Image *) NULL; p=GetNextImageInList(p)) { - (void) CopyMagickString(p->filename,filename,MaxTextExtent); + (void) CopyMagickString(p->filename,filename,MagickPathExtent); p->scene=scene++; } SetImageInfo(clone_info,1,exception); (void) CopyMagickString(image->magick,clone_info->magick, - MaxTextExtent); + MagickPathExtent); if (*blob_length == 0) *blob_length=8192; *blob_data=(char *) ImageToBlob(clone_info,image,blob_length, @@ -493,7 +493,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; size_t blob_length; @@ -507,15 +507,15 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, (void) sscanf(clone_info->filename,"%lx,%s",¶m1,&filename); image->client_data=param1; scene=0; - (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent); + (void) CopyMagickString(clone_info->filename,filename,MagickPathExtent); for (p=image; p != (Image *) NULL; p=GetNextImageInList(p)) { - (void) CopyMagickString(p->filename,filename,MaxTextExtent); + (void) CopyMagickString(p->filename,filename,MagickPathExtent); p->scene=scene++; } SetImageInfo(clone_info,1,exception); (void) CopyMagickString(image->magick,clone_info->magick, - MaxTextExtent); + MagickPathExtent); blob_data=ImageToBlob(clone_info,image,&blob_length, exception); if (blob_data == (unsigned char *) NULL) diff --git a/coders/ycbcr.c b/coders/ycbcr.c index cf2f2eb6d..e2f0d2019 100644 --- a/coders/ycbcr.c +++ b/coders/ycbcr.c @@ -1203,7 +1203,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, } if (image_info->interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,5,5); @@ -1313,7 +1313,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, } (void) CloseBlob(image); (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (image->previous == (Image *) NULL) { status=SetImageProgress(image,SaveImageTag,5,5); diff --git a/coders/yuv.c b/coders/yuv.c index f92d6d686..f24b2a36e 100644 --- a/coders/yuv.c +++ b/coders/yuv.c @@ -424,7 +424,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) SetImageColorspace(image,YCbCrColorspace,exception); if (interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (EOFBlob(image) != MagickFalse) { ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", @@ -825,7 +825,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, chroma_image=DestroyImage(chroma_image); if (interlace == PartitionInterlace) (void) CopyMagickString(image->filename,image_info->filename, - MaxTextExtent); + MagickPathExtent); if (GetNextImageInList(image) == (Image *) NULL) break; image=SyncNextImageInList(image); diff --git a/filters/analyze.c b/filters/analyze.c index 2f5c9848a..7dd95f3df 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -81,7 +81,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, const char **argv,ExceptionInfo *exception) { char - text[MaxTextExtent]; + text[MagickPathExtent]; double area, @@ -186,12 +186,12 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, if (area <= 0.0) break; brightness_mean=brightness_sum_x/area; - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_mean); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_mean); (void) SetImageProperty(image,"filter:brightness:mean",text, exception); brightness_standard_deviation=sqrt(brightness_sum_x2/area-(brightness_sum_x/ area*brightness_sum_x/area)); - (void) FormatLocaleString(text,MaxTextExtent,"%g", + (void) FormatLocaleString(text,MagickPathExtent,"%g", brightness_standard_deviation); (void) SetImageProperty(image,"filter:brightness:standard-deviation",text, exception); @@ -202,7 +202,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, brightness_mean*brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation* brightness_standard_deviation)-3.0; - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_kurtosis); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_kurtosis); (void) SetImageProperty(image,"filter:brightness:kurtosis",text, exception); if (brightness_standard_deviation != 0) @@ -210,16 +210,16 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, brightness_sum_x2/area+2.0*brightness_mean*brightness_mean* brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation); - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_skewness); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_skewness); (void) SetImageProperty(image,"filter:brightness:skewness",text, exception); saturation_mean=saturation_sum_x/area; - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_mean); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_mean); (void) SetImageProperty(image,"filter:saturation:mean",text, exception); saturation_standard_deviation=sqrt(saturation_sum_x2/area-(saturation_sum_x/ area*saturation_sum_x/area)); - (void) FormatLocaleString(text,MaxTextExtent,"%g", + (void) FormatLocaleString(text,MagickPathExtent,"%g", saturation_standard_deviation); (void) SetImageProperty(image,"filter:saturation:standard-deviation",text, exception); @@ -230,7 +230,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, saturation_mean*saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation* saturation_standard_deviation)-3.0; - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_kurtosis); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_kurtosis); (void) SetImageProperty(image,"filter:saturation:kurtosis",text, exception); if (fabs(saturation_standard_deviation) >= MagickEpsilon) @@ -238,7 +238,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, saturation_sum_x2/area+2.0*saturation_mean*saturation_mean* saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation); - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_skewness); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_skewness); (void) SetImageProperty(image,"filter:saturation:skewness",text, exception); } diff --git a/tests/drawtest.c b/tests/drawtest.c index e91493385..bedc1ea19 100644 --- a/tests/drawtest.c +++ b/tests/drawtest.c @@ -409,7 +409,7 @@ static MagickBooleanType ScribbleImage(MagickWand *canvas) int main(int argc,char **argv) { char - filename[MaxTextExtent]; + filename[MagickPathExtent]; MagickBooleanType status; @@ -422,7 +422,7 @@ int main(int argc,char **argv) (void) printf ("Usage: %s filename\n",argv[0]); exit(1); } - (void) CopyMagickString(filename,argv[1],MaxTextExtent); + (void) CopyMagickString(filename,argv[1],MagickPathExtent); /* Create canvas image. */ diff --git a/tests/validate.c b/tests/validate.c index 62c8bbadf..6224a9606 100644 --- a/tests/validate.c +++ b/tests/validate.c @@ -1159,7 +1159,7 @@ static size_t ValidateCompareCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -1181,7 +1181,7 @@ static size_t ValidateCompareCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) (test++), compare_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s %s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s %s %s", compare_options[i],reference_filename,reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); if (arguments == (char **) NULL) @@ -1250,7 +1250,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -1272,7 +1272,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) (test++), composite_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s %s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s %s %s", reference_filename,composite_options[i],reference_filename, output_filename); arguments=StringToArgv(command,&number_arguments); @@ -1342,7 +1342,7 @@ static size_t ValidateConvertCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -1364,7 +1364,7 @@ static size_t ValidateConvertCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) test++, convert_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s %s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s %s %s", reference_filename,convert_options[i],reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); if (arguments == (char **) NULL) @@ -1433,7 +1433,7 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -1456,7 +1456,7 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) test++, identify_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s", identify_options[i],reference_filename); arguments=StringToArgv(command,&number_arguments); if (arguments == (char **) NULL) @@ -1532,10 +1532,10 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, { char #ifdef MagickCountTempFiles - path[MaxTextExtent], - SystemCommand[MaxTextExtent], + path[MagickPathExtent], + SystemCommand[MagickPathExtent], #endif - size[MaxTextExtent]; + size[MagickPathExtent]; const MagickInfo *magick_info; @@ -1593,7 +1593,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type), (double) reference_types[j].depth); (void) CopyMagickString(image_info->filename,reference_filename, - MaxTextExtent); + MagickPathExtent); reference_image=ReadImage(image_info,exception); if (reference_image == (Image *) NULL || exception->severity >= ErrorException) @@ -1607,11 +1607,11 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, /* Write reference image. */ - (void) FormatLocaleString(size,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(size,MagickPathExtent,"%.20gx%.20g", (double) reference_image->columns,(double) reference_image->rows); (void) CloneString(&image_info->size,size); image_info->depth=reference_types[j].depth; - (void) FormatLocaleString(reference_image->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(reference_image->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); status=SetImageType(reference_image,reference_types[j].type,exception); if (status == MagickFalse || exception->severity >= ErrorException) @@ -1647,7 +1647,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, /* Ping reference image. */ - (void) FormatLocaleString(image_info->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(image_info->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); ping_image=PingImage(image_info,exception); if (ping_image == (Image *) NULL || @@ -1676,10 +1676,10 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, /* Write reference image. */ - (void) FormatLocaleString(reference_image->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(reference_image->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); (void) CopyMagickString(image_info->magick,reference_formats[i].magick, - MaxTextExtent); + MagickPathExtent); reference_image->depth=reference_types[j].depth; reference_image->compression=reference_formats[i].compression; length=8192; @@ -1712,7 +1712,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, /* Read reconstruct image. */ - (void) FormatLocaleString(image_info->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(image_info->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); reconstruct_image=BlobToImage(image_info,blob,length,exception); blob=(unsigned char *) RelinquishMagickMemory(blob); @@ -1758,7 +1758,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, (void) fflush(stdout); SystemCommand[0]='\0'; (void) strncat(SystemCommand,"echo `ls ",9); - (void) strncat(SystemCommand,path,MaxTextExtent-31); + (void) strncat(SystemCommand,path,MagickPathExtent-31); (void) strncat(SystemCommand,"* | wc -w` tmp files.",20); (void) system(SystemCommand); (void) fflush(stdout); @@ -1811,7 +1811,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, ExceptionInfo *exception) { char - size[MaxTextExtent]; + size[MagickPathExtent]; const MagickInfo *magick_info; @@ -1856,7 +1856,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type), (double) reference_types[j].depth); (void) CopyMagickString(image_info->filename,reference_filename, - MaxTextExtent); + MagickPathExtent); reference_image=ReadImage(image_info,exception); if (reference_image == (Image *) NULL || exception->severity >= ErrorException) @@ -1870,11 +1870,11 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, /* Write reference image. */ - (void) FormatLocaleString(size,MaxTextExtent,"%.20gx%.20g", + (void) FormatLocaleString(size,MagickPathExtent,"%.20gx%.20g", (double) reference_image->columns,(double) reference_image->rows); (void) CloneString(&image_info->size,size); image_info->depth=reference_types[j].depth; - (void) FormatLocaleString(reference_image->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(reference_image->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); status=SetImageType(reference_image,reference_types[j].type,exception); if (status == MagickFalse || exception->severity >= ErrorException) @@ -1910,7 +1910,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, /* Read reference image. */ - (void) FormatLocaleString(image_info->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(image_info->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); reference_image=ReadImage(image_info,exception); if (reference_image == (Image *) NULL || @@ -1925,7 +1925,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, /* Write reference image. */ - (void) FormatLocaleString(reference_image->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(reference_image->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); reference_image->depth=reference_types[j].depth; reference_image->compression=reference_formats[i].compression; @@ -1942,7 +1942,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, /* Read reconstruct image. */ - (void) FormatLocaleString(image_info->filename,MaxTextExtent,"%s:%s", + (void) FormatLocaleString(image_info->filename,MagickPathExtent,"%s:%s", reference_formats[i].magick,output_filename); reconstruct_image=ReadImage(image_info,exception); if (reconstruct_image == (Image *) NULL || @@ -2068,7 +2068,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info, reference_map[i],CommandOptionToMnemonic(MagickStorageOptions, reference_storage[j].type)); (void) CopyMagickString(image_info->filename,reference_filename, - MaxTextExtent); + MagickPathExtent); reference_image=ReadImage(image_info,exception); if (reference_image == (Image *) NULL || exception->severity >= ErrorException) @@ -2216,7 +2216,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -2238,7 +2238,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) (test++), montage_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s %s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s %s %s", reference_filename,montage_options[i],reference_filename, output_filename); arguments=StringToArgv(command,&number_arguments); @@ -2308,7 +2308,7 @@ static size_t ValidateStreamCommand(ImageInfo *image_info, { char **arguments, - command[MaxTextExtent]; + command[MagickPathExtent]; int number_arguments; @@ -2330,7 +2330,7 @@ static size_t ValidateStreamCommand(ImageInfo *image_info, CatchException(exception); (void) FormatLocaleFile(stdout," test %.20g: %s",(double) (test++), stream_options[i]); - (void) FormatLocaleString(command,MaxTextExtent,"%s %s %s", + (void) FormatLocaleString(command,MagickPathExtent,"%s %s %s", stream_options[i],reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); if (arguments == (char **) NULL) @@ -2426,8 +2426,8 @@ int main(int argc,char **argv) } char - output_filename[MaxTextExtent], - reference_filename[MaxTextExtent], + output_filename[MagickPathExtent], + reference_filename[MagickPathExtent], *option; double @@ -2478,13 +2478,13 @@ int main(int argc,char **argv) (void) regard_warnings; exception=AcquireExceptionInfo(); image_info=AcquireImageInfo(); - (void) CopyMagickString(image_info->filename,ReferenceFilename,MaxTextExtent); + (void) CopyMagickString(image_info->filename,ReferenceFilename,MagickPathExtent); for (i=1; i < (ssize_t) argc; i++) { option=argv[i]; if (IsCommandOption(option) == MagickFalse) { - (void) CopyMagickString(image_info->filename,option,MaxTextExtent); + (void) CopyMagickString(image_info->filename,option,MagickPathExtent); continue; } switch (*(option+1)) @@ -2584,11 +2584,11 @@ int main(int argc,char **argv) { if (LocaleCompare(image_info->filename,ReferenceFilename) == 0) (void) CopyMagickString(reference_image->magick,ReferenceImageFormat, - MaxTextExtent); + MagickPathExtent); (void) AcquireUniqueFilename(reference_filename); (void) AcquireUniqueFilename(output_filename); (void) CopyMagickString(reference_image->filename,reference_filename, - MaxTextExtent); + MagickPathExtent); status=WriteImage(image_info,reference_image,exception); reference_image=DestroyImage(reference_image); if (status == MagickFalse) diff --git a/tests/wandtest.c b/tests/wandtest.c index 733a82a3c..c0e5eb5b1 100644 --- a/tests/wandtest.c +++ b/tests/wandtest.c @@ -5225,7 +5225,7 @@ int main(int argc,char **argv) { char *p, - path[MaxTextExtent]; + path[MagickPathExtent]; path[0]=0; p=getenv("SRCDIR"); diff --git a/www/api/MagickCore/annotate_8c.html b/www/api/MagickCore/annotate_8c.html index cdbf18450..6407b3ee4 100644 --- a/www/api/MagickCore/annotate_8c.html +++ b/www/api/MagickCore/annotate_8c.html @@ -215,7 +215,7 @@ Variables

Definition at line 228 of file annotate.c.

-

References _DrawInfo::affine, _DrawInfo::align, _PixelInfo::alpha, _TypeMetric::ascent, _TypeMetric::bounds, CenterAlign, CenterGravity, CloneDrawInfo(), CloneString(), _Image::colorspace, _Image::debug, _DrawInfo::decorate, _TypeMetric::descent, DestroyDrawInfo(), DestroyString(), DirectClass, DrawImage(), EastGravity, _Image::filename, _DrawInfo::fill, FormatLocaleString(), _DrawInfo::geometry, GetMagickModule, GetTypeMetrics(), _DrawInfo::gravity, _RectangleInfo::height, _DrawInfo::interline_spacing, IsGrayColorspace(), LeftAlign, LineThroughDecoration, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, NorthEastGravity, NorthGravity, NorthWestGravity, _TypeMetric::origin, OverlineDecoration, _Image::page, ParseGeometry(), ParsePageGeometry(), _DrawInfo::primitive, _GeometryInfo::psi, RelinquishMagickMemory(), RenderType(), RightAlign, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetGeometryInfo(), SetImageColorspace(), SetImageStorageClass(), _DrawInfo::signature, _Image::signature, SouthEastGravity, SouthGravity, SouthWestGravity, sRGBColorspace, StringToList(), _AffineMatrix::sx, _AffineMatrix::sy, _DrawInfo::text, TraceEvent, TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedGravity, _DrawInfo::undercolor, _TypeMetric::underline_position, _TypeMetric::underline_thickness, UnderlineDecoration, WestGravity, _RectangleInfo::width, _TypeMetric::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _GeometryInfo::xi, _PointInfo::y, and _RectangleInfo::y.

+

References _DrawInfo::affine, _DrawInfo::align, _PixelInfo::alpha, _TypeMetric::ascent, _TypeMetric::bounds, CenterAlign, CenterGravity, CloneDrawInfo(), CloneString(), _Image::colorspace, _Image::debug, _DrawInfo::decorate, _TypeMetric::descent, DestroyDrawInfo(), DestroyString(), DirectClass, DrawImage(), EastGravity, _Image::filename, _DrawInfo::fill, FormatLocaleString(), _DrawInfo::geometry, GetMagickModule, GetTypeMetrics(), _DrawInfo::gravity, _RectangleInfo::height, _DrawInfo::interline_spacing, IsGrayColorspace(), LeftAlign, LineThroughDecoration, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, NorthEastGravity, NorthGravity, NorthWestGravity, _TypeMetric::origin, OverlineDecoration, _Image::page, ParseGeometry(), ParsePageGeometry(), _DrawInfo::primitive, _GeometryInfo::psi, RelinquishMagickMemory(), RenderType(), RightAlign, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetGeometryInfo(), SetImageColorspace(), SetImageStorageClass(), _DrawInfo::signature, _Image::signature, SouthEastGravity, SouthGravity, SouthWestGravity, sRGBColorspace, StringToList(), _AffineMatrix::sx, _AffineMatrix::sy, _DrawInfo::text, TraceEvent, TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedGravity, _DrawInfo::undercolor, _TypeMetric::underline_position, _TypeMetric::underline_thickness, UnderlineDecoration, WestGravity, _RectangleInfo::width, _TypeMetric::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _GeometryInfo::xi, _PointInfo::y, and _RectangleInfo::y.

Referenced by DrawPrimitive(), MontageImageList(), and PolaroidImage().

@@ -245,7 +245,7 @@ Variables

Definition at line 1601 of file annotate.c.

-

References AcquireString(), MagickMin(), and MaxTextExtent.

+

References AcquireString(), MagickMin(), and MagickPathExtent.

Referenced by RenderPostscript().

@@ -589,7 +589,7 @@ Variables

Definition at line 1631 of file annotate.c.

-

References AcquireAuthenticCacheView(), AcquireImageInfo(), AcquireUniqueFileResource(), _DrawInfo::affine, _PixelInfo::alpha, _Image::alpha_trait, AnnotateEvent, _ImageInfo::antialias, _TypeMetric::ascent, BlendPixelTrait, _PixelInfo::blue, _TypeMetric::bounds, CatchException(), ClampToQuantum(), CloneString(), _Image::columns, CompositeImage(), _Image::debug, DefaultResolution, _DrawInfo::density, _ImageInfo::density, _TypeMetric::descent, DestroyCacheView(), DestroyImage(), DestroyImageInfo(), DestroyString(), EscapeParenthesis(), ExpandAffine(), _ImageInfo::filename, FileOpenError, _DrawInfo::fill, _DrawInfo::font, FormatLocaleFile(), FormatLocaleString(), GetCacheViewAuthenticPixels(), GetFillColor(), GetImageBoundingBox(), GetMagickModule, GetPixelChannels(), GetPixelIntensity(), _PixelInfo::green, _RectangleInfo::height, _TypeMetric::height, LogMagickEvent(), MagickEpsilon, MagickFalse, MagickTrue, _TypeMetric::max_advance, MaxTextExtent, NegateImage(), OpaqueAlphaChannel, OverCompositeOp, _ImageInfo::page, ParseGeometry(), _TypeMetric::pixels_per_em, _DrawInfo::pointsize, QuantumScale, ReadImage(), _PixelInfo::red, RelinquishUniqueFileResource(), _DrawInfo::render, _GeometryInfo::rho, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetImageAlphaChannel(), SetPixelAlpha(), SetPixelBlue(), SetPixelGreen(), SetPixelRed(), _GeometryInfo::sigma, SigmaValue, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _DrawInfo::text_antialias, ThrowFileException, TransformImage(), TransparentAlpha, _TypeMetric::underline_position, _TypeMetric::underline_thickness, _RectangleInfo::width, _TypeMetric::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _SegmentInfo::x2, _PointInfo::y, _RectangleInfo::y, _SegmentInfo::y1, and _SegmentInfo::y2.

+

References AcquireAuthenticCacheView(), AcquireImageInfo(), AcquireUniqueFileResource(), _DrawInfo::affine, _PixelInfo::alpha, _Image::alpha_trait, AnnotateEvent, _ImageInfo::antialias, _TypeMetric::ascent, BlendPixelTrait, _PixelInfo::blue, _TypeMetric::bounds, CatchException(), ClampToQuantum(), CloneString(), _Image::columns, CompositeImage(), _Image::debug, DefaultResolution, _DrawInfo::density, _ImageInfo::density, _TypeMetric::descent, DestroyCacheView(), DestroyImage(), DestroyImageInfo(), DestroyString(), EscapeParenthesis(), ExpandAffine(), _ImageInfo::filename, FileOpenError, _DrawInfo::fill, _DrawInfo::font, FormatLocaleFile(), FormatLocaleString(), GetCacheViewAuthenticPixels(), GetFillColor(), GetImageBoundingBox(), GetMagickModule, GetPixelChannels(), GetPixelIntensity(), _PixelInfo::green, _RectangleInfo::height, _TypeMetric::height, LogMagickEvent(), MagickEpsilon, MagickFalse, MagickTrue, _TypeMetric::max_advance, MagickPathExtent, NegateImage(), OpaqueAlphaChannel, OverCompositeOp, _ImageInfo::page, ParseGeometry(), _TypeMetric::pixels_per_em, _DrawInfo::pointsize, QuantumScale, ReadImage(), _PixelInfo::red, RelinquishUniqueFileResource(), _DrawInfo::render, _GeometryInfo::rho, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetImageAlphaChannel(), SetPixelAlpha(), SetPixelBlue(), SetPixelGreen(), SetPixelRed(), _GeometryInfo::sigma, SigmaValue, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _DrawInfo::text_antialias, ThrowFileException, TransformImage(), TransparentAlpha, _TypeMetric::underline_position, _TypeMetric::underline_thickness, _RectangleInfo::width, _TypeMetric::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _SegmentInfo::x2, _PointInfo::y, _RectangleInfo::y, _SegmentInfo::y1, and _SegmentInfo::y2.

Referenced by RenderFreetype().

diff --git a/www/api/MagickCore/artifact_8c.html b/www/api/MagickCore/artifact_8c.html index 44390fabe..4b4c61d54 100644 --- a/www/api/MagickCore/artifact_8c.html +++ b/www/api/MagickCore/artifact_8c.html @@ -177,7 +177,7 @@ Functions

Definition at line 147 of file artifact.c.

-

References CopyMagickString(), MaxTextExtent, and SetImageArtifact().

+

References CopyMagickString(), MagickPathExtent, and SetImageArtifact().

diff --git a/www/api/MagickCore/blob_8c.html b/www/api/MagickCore/blob_8c.html index 329e39c5b..5c3553d56 100644 --- a/www/api/MagickCore/blob_8c.html +++ b/www/api/MagickCore/blob_8c.html @@ -414,7 +414,7 @@ Functions

Definition at line 322 of file blob.c.

-

References _Image::blob, _ImageInfo::blob, BlobError, BlobToFile(), CloneImageInfo(), CopyMagickMemory(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _Image::filename, _ImageInfo::filename, FormatLocaleString(), GetFirstImageInList(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, GetNextImageInList(), _ImageInfo::length, LogMagickEvent(), _ImageInfo::magick, _Image::magick_filename, MagickFalse, MagickSignature, MaxTextExtent, MissingDelegateError, ReadImage(), RelinquishUniqueFileResource(), SetImageInfo(), _ImageInfo::signature, ThrowMagickException(), and TraceEvent.

+

References _Image::blob, _ImageInfo::blob, BlobError, BlobToFile(), CloneImageInfo(), CopyMagickMemory(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _Image::filename, _ImageInfo::filename, FormatLocaleString(), GetFirstImageInList(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, GetNextImageInList(), _ImageInfo::length, LogMagickEvent(), _ImageInfo::magick, _Image::magick_filename, MagickFalse, MagickSignature, MagickPathExtent, MissingDelegateError, ReadImage(), RelinquishUniqueFileResource(), SetImageInfo(), _ImageInfo::signature, ThrowMagickException(), and TraceEvent.

Referenced by ClipImagePath(), and ReadInlineImage().

@@ -626,7 +626,7 @@ Functions

Definition at line 932 of file blob.c.

-

References AcquireQuantumMemory(), BlobError, GetMagickModule, LocaleCompare(), LogMagickEvent(), MagickMaxBufferExtent, MagickMin(), MapBlob(), MaxTextExtent, O_BINARY, open_utf8(), ReadMode, RelinquishMagickMemory(), ResizeQuantumMemory(), ResourceLimitError, ThrowFileException, ThrowMagickException(), TraceEvent, and UnmapBlob().

+

References AcquireQuantumMemory(), BlobError, GetMagickModule, LocaleCompare(), LogMagickEvent(), MagickMaxBufferExtent, MagickMin(), MapBlob(), MagickPathExtent, O_BINARY, open_utf8(), ReadMode, RelinquishMagickMemory(), ResizeQuantumMemory(), ResourceLimitError, ThrowFileException, ThrowMagickException(), TraceEvent, and UnmapBlob().

Referenced by FileToString(), FileToStringInfo(), ImagesToBlob(), and ImageToBlob().

@@ -860,7 +860,7 @@ Functions

Definition at line 1742 of file blob.c.

-

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _ImageInfo::adjoin, _Image::blob, _ImageInfo::blob, CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _BlobInfo::exempt, _ImageInfo::file, _Image::filename, _ImageInfo::filename, FileOpenError, FileToBlob(), FormatLocaleString(), GetImageListLength(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, ImageToBlob(), _BlobInfo::length, _ImageInfo::length, LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickMaxBlobExtent, MagickSignature, MagickTrue, MaxTextExtent, MissingDelegateError, RelinquishUniqueFileResource(), ResizeQuantumMemory(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, ThrowFileException, ThrowMagickException(), TraceEvent, and WriteImages().

+

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _ImageInfo::adjoin, _Image::blob, _ImageInfo::blob, CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _BlobInfo::exempt, _ImageInfo::file, _Image::filename, _ImageInfo::filename, FileOpenError, FileToBlob(), FormatLocaleString(), GetImageListLength(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, ImageToBlob(), _BlobInfo::length, _ImageInfo::length, LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickMaxBlobExtent, MagickSignature, MagickTrue, MagickPathExtent, MissingDelegateError, RelinquishUniqueFileResource(), ResizeQuantumMemory(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, ThrowFileException, ThrowMagickException(), TraceEvent, and WriteImages().

@@ -902,7 +902,7 @@ Functions

Definition at line 1492 of file blob.c.

-

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _ImageInfo::adjoin, _Image::blob, _ImageInfo::blob, BlobError, CloneImageInfo(), CloseBlob(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _BlobInfo::exempt, _ImageInfo::file, _Image::filename, _ImageInfo::filename, FileToBlob(), FormatLocaleString(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, _BlobInfo::length, _ImageInfo::length, LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickMaxBlobExtent, MagickSignature, MagickTrue, MaxTextExtent, MissingDelegateError, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResizeQuantumMemory(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, ThrowFileException, ThrowMagickException(), TraceEvent, and WriteImage().

+

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _ImageInfo::adjoin, _Image::blob, _ImageInfo::blob, BlobError, CloneImageInfo(), CloseBlob(), CopyMagickString(), _ImageInfo::debug, DestroyImageInfo(), DetachBlob(), _BlobInfo::exempt, _ImageInfo::file, _Image::filename, _ImageInfo::filename, FileToBlob(), FormatLocaleString(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, _BlobInfo::length, _ImageInfo::length, LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickMaxBlobExtent, MagickSignature, MagickTrue, MagickPathExtent, MissingDelegateError, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResizeQuantumMemory(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, ThrowFileException, ThrowMagickException(), TraceEvent, and WriteImage().

Referenced by ImagesToBlob().

@@ -990,7 +990,7 @@ Functions

Definition at line 1880 of file blob.c.

-

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _Image::blob, CloneBlobInfo(), CloneImage(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyImage(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, FileOpenError, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickMaxBufferExtent, MagickMin(), MagickSignature, MagickTrue, MaxTextExtent, O_BINARY, open_utf8(), RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, SetImageInfoFile(), _Image::signature, _ImageInfo::signature, ThrowBinaryException, ThrowFileException, TraceEvent, WriteBlobStream(), and WriteImage().

+

References AcquireQuantumMemory(), AcquireUniqueFileResource(), _Image::blob, CloneBlobInfo(), CloneImage(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyImage(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, FileOpenError, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickMaxBufferExtent, MagickMin(), MagickSignature, MagickTrue, MagickPathExtent, O_BINARY, open_utf8(), RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, SetImageInfoFile(), _Image::signature, _ImageInfo::signature, ThrowBinaryException, ThrowFileException, TraceEvent, WriteBlobStream(), and WriteImage().

@@ -1230,7 +1230,7 @@ Functions

Definition at line 2335 of file blob.c.

-

References AcquireExceptionInfo(), AcquireMagickResource(), _ImageInfo::adjoin, AppendBinaryBlobMode, AppendBlobMode, AttachBlob(), _Image::blob, _ImageInfo::blob, BlobError, BlobEvent, BZipStream, CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DetachBlob(), _BlobInfo::exempt, ExtensionPath, FifoStream, FileInfo::file, _ImageInfo::file, _BlobInfo::file_info, _Image::filename, _ImageInfo::filename, FileStream, fopen_utf8(), FormatLocaleString(), GetBlobSize(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, GetNextImageInList(), GetPathAttributes(), GetPathComponent(), GetPreviousImageInList(), InterpretImageFilename(), IsRightsAuthorized(), _ImageInfo::length, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickFalse, MagickMaxBufferExtent, MagickSignature, MagickTrue, MapBlob(), _BlobInfo::mapped, MapResource, MaxTextExtent, PathPolicyDomain, PipeStream, PolicyError, popen_utf8(), _BlobInfo::properties, ReadBinaryBlobMode, ReadBlobMode, ReadMode, ReadPolicyRights, RelinquishMagickResource(), ResetMagickMemory(), RootPath, _Image::scene, SetApplicationType(), _Image::signature, _ImageInfo::signature, _BlobInfo::size, StandardStream, _BlobInfo::status, _BlobInfo::stream, _ImageInfo::stream, StringToLong(), _BlobInfo::synchronize, _ImageInfo::synchronize, ThrowFileException, ThrowMagickException(), TraceEvent, _BlobInfo::type, UndefinedStream, WriteBinaryBlobMode, WriteBlobMode, WritePolicyRights, and ZipStream.

+

References AcquireExceptionInfo(), AcquireMagickResource(), _ImageInfo::adjoin, AppendBinaryBlobMode, AppendBlobMode, AttachBlob(), _Image::blob, _ImageInfo::blob, BlobError, BlobEvent, BZipStream, CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DetachBlob(), _BlobInfo::exempt, ExtensionPath, FifoStream, FileInfo::file, _ImageInfo::file, _BlobInfo::file_info, _Image::filename, _ImageInfo::filename, FileStream, fopen_utf8(), FormatLocaleString(), GetBlobSize(), GetMagickBlobSupport(), GetMagickInfo(), GetMagickModule, GetNextImageInList(), GetPathAttributes(), GetPathComponent(), GetPreviousImageInList(), InterpretImageFilename(), IsRightsAuthorized(), _ImageInfo::length, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickFalse, MagickMaxBufferExtent, MagickSignature, MagickTrue, MapBlob(), _BlobInfo::mapped, MapResource, MagickPathExtent, PathPolicyDomain, PipeStream, PolicyError, popen_utf8(), _BlobInfo::properties, ReadBinaryBlobMode, ReadBlobMode, ReadMode, ReadPolicyRights, RelinquishMagickResource(), ResetMagickMemory(), RootPath, _Image::scene, SetApplicationType(), _Image::signature, _ImageInfo::signature, _BlobInfo::size, StandardStream, _BlobInfo::status, _BlobInfo::stream, _ImageInfo::stream, StringToLong(), _BlobInfo::synchronize, _ImageInfo::synchronize, ThrowFileException, ThrowMagickException(), TraceEvent, _BlobInfo::type, UndefinedStream, WriteBinaryBlobMode, WriteBlobMode, WritePolicyRights, and ZipStream.

Referenced by OpenStream(), ReadImage(), SetImageInfo(), and WriteImage().

@@ -1662,7 +1662,7 @@ Functions

Definition at line 3473 of file blob.c.

-

References MagickSignature, MaxTextExtent, ReadBlobStream(), and _Image::signature.

+

References MagickSignature, MagickPathExtent, ReadBlobStream(), and _Image::signature.

diff --git a/www/api/MagickCore/blob_8h.html b/www/api/MagickCore/blob_8h.html index 879c7146a..f5eebb691 100644 --- a/www/api/MagickCore/blob_8h.html +++ b/www/api/MagickCore/blob_8h.html @@ -1251,7 +1251,7 @@ Functions

Definition at line 3473 of file blob.c.

-

References MagickSignature, MaxTextExtent, ReadBlobStream(), and _Image::signature.

+

References MagickSignature, MagickPathExtent, ReadBlobStream(), and _Image::signature.

diff --git a/www/api/MagickCore/cache_8c.html b/www/api/MagickCore/cache_8c.html index f7b34f7d4..85ada0f73 100644 --- a/www/api/MagickCore/cache_8c.html +++ b/www/api/MagickCore/cache_8c.html @@ -669,7 +669,7 @@ Variables

Definition at line 481 of file cache.c.

-

References AcquirePixelCacheNexus(), CacheEvent, CommandOptionToMnemonic(), DestroyPixelCacheNexus(), FormatLocaleString(), GetMagickModule, GetOpenMPThreadId(), _RectangleInfo::height, LogMagickEvent(), MagickCacheOptions, MagickFalse, MagickMin(), MagickTrue, MapCache, MaxCacheThreads, MaxTextExtent, MemoryCache, PingCache, ReadMode, ReadPixelCacheMetacontent(), ReadPixelCachePixels(), ResourceLimitFatalError, SetPixelCacheNexusPixels(), ThrowFatalException, UndefinedPixelTrait, _RectangleInfo::width, WriteMode, WritePixelCacheMetacontent(), WritePixelCachePixels(), _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquirePixelCacheNexus(), CacheEvent, CommandOptionToMnemonic(), DestroyPixelCacheNexus(), FormatLocaleString(), GetMagickModule, GetOpenMPThreadId(), _RectangleInfo::height, LogMagickEvent(), MagickCacheOptions, MagickFalse, MagickMin(), MagickTrue, MapCache, MaxCacheThreads, MagickPathExtent, MemoryCache, PingCache, ReadMode, ReadPixelCacheMetacontent(), ReadPixelCachePixels(), ResourceLimitFatalError, SetPixelCacheNexusPixels(), ThrowFatalException, UndefinedPixelTrait, _RectangleInfo::width, WriteMode, WritePixelCacheMetacontent(), WritePixelCachePixels(), _RectangleInfo::x, and _RectangleInfo::y.

Referenced by OpenPixelCache(), and PersistPixelCache().

@@ -773,7 +773,7 @@ Variables

Definition at line 852 of file cache.c.

-

References CacheEvent, DestroyDistributeCacheInfo(), DestroyPixelCacheNexus(), DestroyRandomInfo(), DestroySemaphoreInfo(), FormatLocaleString(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, RelinquishMagickMemory(), RelinquishPixelCachePixels(), TraceEvent, and UnlockSemaphoreInfo().

+

References CacheEvent, DestroyDistributeCacheInfo(), DestroyPixelCacheNexus(), DestroyRandomInfo(), DestroySemaphoreInfo(), FormatLocaleString(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, RelinquishMagickMemory(), RelinquishPixelCachePixels(), TraceEvent, and UnlockSemaphoreInfo().

@@ -2273,7 +2273,7 @@ Variables

Definition at line 3292 of file cache.c.

-

References AcquireDistributeCacheInfo(), AcquireMagickResource(), AllocatePixelCachePixels(), _Image::alpha_trait, AreaResource, _Image::cache, CacheError, CacheEvent, _Image::channel_map, ClonePixelCacheRepository(), ClosePixelCacheOnDisk(), _Image::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::debug, DestroyDistributeCacheInfo(), DiskCache, DiskResource, DistributedCache, _Image::filename, FormatLocaleString(), FormatMagickSize(), GetDistributeCacheFile(), GetDistributeCacheHostname(), GetDistributeCachePort(), GetImageIndexInList(), GetMagickModule, GetPixelChannels(), InitializePixelChannelMap(), LogMagickEvent(), MagickCacheOptions, MagickFalse, MagickSignature, MagickTrue, MapBlob(), MapCache, MapResource, MaxPixelChannels, MaxTextExtent, MemoryCache, MemoryResource, _Image::metacontent_extent, _Image::offset, OpenDistributePixelCache(), OpenPixelCacheOnDisk(), _Image::ping, PingCache, _Image::read_mask, ReadMode, RelinquishMagickResource(), RelinquishPixelCachePixels(), ResourceLimitError, _Image::rows, SetPixelCacheExtent(), _Image::signature, _Image::storage_class, ThrowBinaryException, ThrowFileException, ThrowMagickException(), TraceEvent, UndefinedCache, UndefinedClass, and _Image::write_mask.

+

References AcquireDistributeCacheInfo(), AcquireMagickResource(), AllocatePixelCachePixels(), _Image::alpha_trait, AreaResource, _Image::cache, CacheError, CacheEvent, _Image::channel_map, ClonePixelCacheRepository(), ClosePixelCacheOnDisk(), _Image::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::debug, DestroyDistributeCacheInfo(), DiskCache, DiskResource, DistributedCache, _Image::filename, FormatLocaleString(), FormatMagickSize(), GetDistributeCacheFile(), GetDistributeCacheHostname(), GetDistributeCachePort(), GetImageIndexInList(), GetMagickModule, GetPixelChannels(), InitializePixelChannelMap(), LogMagickEvent(), MagickCacheOptions, MagickFalse, MagickSignature, MagickTrue, MapBlob(), MapCache, MapResource, MaxPixelChannels, MagickPathExtent, MemoryCache, MemoryResource, _Image::metacontent_extent, _Image::offset, OpenDistributePixelCache(), OpenPixelCacheOnDisk(), _Image::ping, PingCache, _Image::read_mask, ReadMode, RelinquishMagickResource(), RelinquishPixelCachePixels(), ResourceLimitError, _Image::rows, SetPixelCacheExtent(), _Image::signature, _Image::storage_class, ThrowBinaryException, ThrowFileException, ThrowMagickException(), TraceEvent, UndefinedCache, UndefinedClass, and _Image::write_mask.

Referenced by PersistPixelCache().

@@ -2363,7 +2363,7 @@ Variables

Definition at line 3609 of file cache.c.

-

References _Image::cache, CacheEvent, ClonePixelCache(), ClonePixelCacheRepository(), CopyMagickString(), _Image::debug, DestroyPixelCache(), DiskCache, _Image::filename, GetMagickModule, GetMagickPageSize(), IOMode, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MapCache, MaxTextExtent, OpenPixelCache(), ReadMode, ReferencePixelCache(), rename_utf8(), _Image::signature, TraceEvent, and UnlockSemaphoreInfo().

+

References _Image::cache, CacheEvent, ClonePixelCache(), ClonePixelCacheRepository(), CopyMagickString(), _Image::debug, DestroyPixelCache(), DiskCache, _Image::filename, GetMagickModule, GetMagickPageSize(), IOMode, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MapCache, MagickPathExtent, OpenPixelCache(), ReadMode, ReferencePixelCache(), rename_utf8(), _Image::signature, TraceEvent, and UnlockSemaphoreInfo().

@@ -2981,7 +2981,7 @@ Variables

Definition at line 3246 of file cache.c.

-

References _Image::cache, CacheEvent, _Image::debug, FormatLocaleString(), FormatMagickSize(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickTrue, MaxTextExtent, and WritePixelCacheRegion().

+

References _Image::cache, CacheEvent, _Image::debug, FormatLocaleString(), FormatMagickSize(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickTrue, MagickPathExtent, and WritePixelCacheRegion().

Referenced by OpenPixelCache().

diff --git a/www/api/MagickCore/client_8c.html b/www/api/MagickCore/client_8c.html index 34d4641f0..78f8acf23 100644 --- a/www/api/MagickCore/client_8c.html +++ b/www/api/MagickCore/client_8c.html @@ -141,7 +141,7 @@ Functions

Definition at line 114 of file client.c.

-

References CopyMagickString(), and MaxTextExtent.

+

References CopyMagickString(), and MagickPathExtent.

Referenced by GetClientName(), and MagickCoreGenesis().

@@ -163,7 +163,7 @@ Functions

Definition at line 148 of file client.c.

-

References CopyMagickString(), and MaxTextExtent.

+

References CopyMagickString(), and MagickPathExtent.

Referenced by GetClientPath(), and MagickCoreGenesis().

diff --git a/www/api/MagickCore/client_8h.html b/www/api/MagickCore/client_8h.html index 52914d653..50cdc637f 100644 --- a/www/api/MagickCore/client_8h.html +++ b/www/api/MagickCore/client_8h.html @@ -142,7 +142,7 @@ Functions

Definition at line 148 of file client.c.

-

References CopyMagickString(), and MaxTextExtent.

+

References CopyMagickString(), and MagickPathExtent.

Referenced by GetClientPath(), and MagickCoreGenesis().

diff --git a/www/api/MagickCore/coder_8c.html b/www/api/MagickCore/coder_8c.html index 7c03d2856..0951893a9 100644 --- a/www/api/MagickCore/coder_8c.html +++ b/www/api/MagickCore/coder_8c.html @@ -540,7 +540,7 @@ Variables

Definition at line 679 of file coder.c.

-

References AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), coder_list, CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DestroyCoderNode(), DirectorySeparator, _CoderInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _CoderInfo::magick, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _CoderInfo::name, NewSplayTree(), _CoderInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _CoderInfo::signature, _CoderInfo::stealth, ThrowFatalException, ThrowFileException, and ThrowMagickException().

+

References AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), coder_list, CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DestroyCoderNode(), DirectorySeparator, _CoderInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _CoderInfo::magick, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _CoderInfo::name, NewSplayTree(), _CoderInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _CoderInfo::signature, _CoderInfo::stealth, ThrowFatalException, ThrowFileException, and ThrowMagickException().

Referenced by LoadCoderLists().

diff --git a/www/api/MagickCore/color_8c.html b/www/api/MagickCore/color_8c.html index 8ae8a2708..d2e69e100 100644 --- a/www/api/MagickCore/color_8c.html +++ b/www/api/MagickCore/color_8c.html @@ -401,7 +401,7 @@ Variables

Definition at line 1024 of file color.c.

-

References _PixelInfo::alpha, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, ClampToQuantum(), _PixelInfo::colorspace, ConcatenateMagickString(), _PixelInfo::depth, FormatLocaleString(), _PixelInfo::green, GreenPixelChannel, HCLColorspace, HCLpColorspace, HSBColorspace, HSIColorspace, HSLColorspace, HSVColorspace, HWBColorspace, MaxTextExtent, QuantumScale, _PixelInfo::red, RedPixelChannel, and SVGCompliance.

+

References _PixelInfo::alpha, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, ClampToQuantum(), _PixelInfo::colorspace, ConcatenateMagickString(), _PixelInfo::depth, FormatLocaleString(), _PixelInfo::green, GreenPixelChannel, HCLColorspace, HCLpColorspace, HSBColorspace, HSIColorspace, HSLColorspace, HSVColorspace, HWBColorspace, MagickPathExtent, QuantumScale, _PixelInfo::red, RedPixelChannel, and SVGCompliance.

Referenced by GetColorTuple(), GetNumberColors(), and IdentifyImage().

@@ -447,7 +447,7 @@ Variables

Definition at line 1334 of file color.c.

-

References _PixelInfo::alpha, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, ClampToQuantum(), ConcatenateMagickString(), _PixelInfo::depth, FormatLocaleString(), _PixelInfo::green, GreenPixelChannel, MaxTextExtent, _PixelInfo::red, and RedPixelChannel.

+

References _PixelInfo::alpha, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, ClampToQuantum(), ConcatenateMagickString(), _PixelInfo::depth, FormatLocaleString(), _PixelInfo::green, GreenPixelChannel, MagickPathExtent, _PixelInfo::red, and RedPixelChannel.

Referenced by GetColorTuple().

@@ -515,7 +515,7 @@ Variables

Definition at line 903 of file color.c.

-

References color_list, color_semaphore, _ColorInfo::compliance, CopyMagickString(), GetMagickModule, GetNextValueInLinkedList(), GetValueFromLinkedList(), IfMagickFalse, IfMagickTrue, InitializeColorList(), InsertValueInLinkedList(), instantiate_color, IsLinkedListEmpty(), LocaleCompare(), LockSemaphoreInfo(), MaxTextExtent, _ColorInfo::name, OptionWarning, RemoveElementByValueFromLinkedList(), ResetLinkedListIterator(), ThrowMagickException(), and UnlockSemaphoreInfo().

+

References color_list, color_semaphore, _ColorInfo::compliance, CopyMagickString(), GetMagickModule, GetNextValueInLinkedList(), GetValueFromLinkedList(), IfMagickFalse, IfMagickTrue, InitializeColorList(), InsertValueInLinkedList(), instantiate_color, IsLinkedListEmpty(), LocaleCompare(), LockSemaphoreInfo(), MagickPathExtent, _ColorInfo::name, OptionWarning, RemoveElementByValueFromLinkedList(), ResetLinkedListIterator(), ThrowMagickException(), and UnlockSemaphoreInfo().

Referenced by GetColorInfo(), and QueryColorCompliance().

@@ -659,7 +659,7 @@ Variables

Definition at line 1402 of file color.c.

-

References _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _PixelInfo::colorspace, CommandOptionToMnemonic(), ConcatenateColorComponent(), ConcatenateMagickString(), ConcatentateHexColorComponent(), _PixelInfo::depth, GetMagickModule, GRAYColorspace, GrayPixelChannel, _PixelInfo::green, GreenPixelChannel, IfMagickTrue, IsMagickTrue, LocaleLower(), LogMagickEvent(), MagickColorspaceOptions, MagickEpsilon, MaxTextExtent, OpaqueAlpha, _PixelInfo::red, RedPixelChannel, SVGCompliance, SVGCompliant, and TraceEvent.

+

References _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _PixelInfo::colorspace, CommandOptionToMnemonic(), ConcatenateColorComponent(), ConcatenateMagickString(), ConcatentateHexColorComponent(), _PixelInfo::depth, GetMagickModule, GRAYColorspace, GrayPixelChannel, _PixelInfo::green, GreenPixelChannel, IfMagickTrue, IsMagickTrue, LocaleLower(), LogMagickEvent(), MagickColorspaceOptions, MagickEpsilon, MagickPathExtent, OpaqueAlpha, _PixelInfo::red, RedPixelChannel, SVGCompliance, SVGCompliant, and TraceEvent.

Referenced by GetNumberColors(), IdentifyImage(), ListColorInfo(), and QueryColorname().

@@ -805,7 +805,7 @@ Variables

Definition at line 1736 of file color.c.

-

References FormatLocaleFile(), GetColorInfoList(), GetColorTuple(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _ColorInfo::path, RelinquishMagickMemory(), SVGCompliance, X11Compliance, and XPMCompliance.

+

References FormatLocaleFile(), GetColorInfoList(), GetColorTuple(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _ColorInfo::path, RelinquishMagickMemory(), SVGCompliance, X11Compliance, and XPMCompliance.

@@ -855,7 +855,7 @@ Variables

Definition at line 1826 of file color.c.

-

References AcquireMagickMemory(), AcquireString(), AllCompliance, AppendValueToLinkedList(), _ColorInfo::color, color_list, _ColorInfo::compliance, ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _ColorInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), GlobExpression(), HeadPath, IfMagickFalse, IfMagickTrue, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _ColorInfo::name, NewLinkedList(), _ColorInfo::path, QueryColorCompliance(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _ColorInfo::signature, _ColorInfo::stealth, SVGCompliance, ThrowFatalException, ThrowFileException, ThrowMagickException(), X11Compliance, and XPMCompliance.

+

References AcquireMagickMemory(), AcquireString(), AllCompliance, AppendValueToLinkedList(), _ColorInfo::color, color_list, _ColorInfo::compliance, ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _ColorInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), GlobExpression(), HeadPath, IfMagickFalse, IfMagickTrue, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _ColorInfo::name, NewLinkedList(), _ColorInfo::path, QueryColorCompliance(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _ColorInfo::signature, _ColorInfo::stealth, SVGCompliance, ThrowFatalException, ThrowFileException, ThrowMagickException(), X11Compliance, and XPMCompliance.

Referenced by LoadColorLists().

@@ -969,7 +969,7 @@ Variables

Definition at line 2151 of file color.c.

-

References AcquireString(), AllCompliance, _PixelInfo::alpha, _PixelPacket::alpha, _PixelInfo::alpha_trait, BackgroundColor, _PixelInfo::black, BlendPixelTrait, _PixelInfo::blue, _PixelPacket::blue, _GeometryInfo::chi, ChiValue, ClampToQuantum(), CMYKColorspace, _ColorInfo::color, _PixelInfo::colorspace, ConvertHCLToRGB(), ConvertHSBToRGB(), ConvertHSLToRGB(), ConvertHWBToRGB(), CopyMagickString(), DestroyString(), GetColorCompliance(), GetMagickModule, GetPixelInfo(), GetQuantumRange(), GRAYColorspace, _PixelInfo::green, _PixelPacket::green, HCLColorspace, HSBColorspace, HSLColorspace, HWBColorspace, IfMagickFalse, LocaleCompare(), LocaleLower(), LocaleNCompare(), LogMagickEvent(), MagickColorspaceOptions, MagickFalse, MagickTrue, MaxTextExtent, OpaqueAlpha, OptionWarning, ParseCommandOption(), ParseGeometry(), PercentValue, _GeometryInfo::psi, PsiValue, QuantumRange, _PixelInfo::red, _PixelPacket::red, ResetMagickMemory(), RGBColorspace, _GeometryInfo::rho, RhoValue, ScaleAnyToQuantum(), SetGeometryInfo(), _GeometryInfo::sigma, SigmaValue, sRGBColorspace, SubstituteString(), ThrowMagickException(), TraceEvent, UndefinedPixelTrait, _GeometryInfo::xi, and XiValue.

+

References AcquireString(), AllCompliance, _PixelInfo::alpha, _PixelPacket::alpha, _PixelInfo::alpha_trait, BackgroundColor, _PixelInfo::black, BlendPixelTrait, _PixelInfo::blue, _PixelPacket::blue, _GeometryInfo::chi, ChiValue, ClampToQuantum(), CMYKColorspace, _ColorInfo::color, _PixelInfo::colorspace, ConvertHCLToRGB(), ConvertHSBToRGB(), ConvertHSLToRGB(), ConvertHWBToRGB(), CopyMagickString(), DestroyString(), GetColorCompliance(), GetMagickModule, GetPixelInfo(), GetQuantumRange(), GRAYColorspace, _PixelInfo::green, _PixelPacket::green, HCLColorspace, HSBColorspace, HSLColorspace, HWBColorspace, IfMagickFalse, LocaleCompare(), LocaleLower(), LocaleNCompare(), LogMagickEvent(), MagickColorspaceOptions, MagickFalse, MagickTrue, MagickPathExtent, OpaqueAlpha, OptionWarning, ParseCommandOption(), ParseGeometry(), PercentValue, _GeometryInfo::psi, PsiValue, QuantumRange, _PixelInfo::red, _PixelPacket::red, ResetMagickMemory(), RGBColorspace, _GeometryInfo::rho, RhoValue, ScaleAnyToQuantum(), SetGeometryInfo(), _GeometryInfo::sigma, SigmaValue, sRGBColorspace, SubstituteString(), ThrowMagickException(), TraceEvent, UndefinedPixelTrait, _GeometryInfo::xi, and XiValue.

Referenced by AcquireImage(), CompareImages(), DrawBoundingRectangles(), DrawClipPath(), DrawImage(), DrawPatternPath(), FloodfillPaintImage(), FxGetSymbol(), GetDrawInfo(), GetImageInfo(), LoadColorList(), MontageImageList(), PolaroidImage(), PreviewImage(), SetImageProperty(), ShadowImage(), SyncImageSettings(), and VignetteImage().

@@ -1019,7 +1019,7 @@ Variables

Definition at line 2499 of file color.c.

-

References _PixelInfo::alpha, _PixelInfo::alpha_trait, BlendPixelTrait, _PixelInfo::blue, _ColorInfo::color, color_list, _PixelInfo::colorspace, _ColorInfo::compliance, CopyMagickString(), _PixelInfo::depth, GetColorInfo(), GetColorTuple(), GetNextValueInLinkedList(), _PixelInfo::green, IfMagickFalse, IsMagickTrue, IssRGBColorspace(), MagickEpsilon, MagickFalse, MagickTrue, MaxTextExtent, _ColorInfo::name, OpaqueAlpha, _PixelInfo::red, ResetLinkedListIterator(), SVGCompliance, UndefinedPixelTrait, and XPMCompliance.

+

References _PixelInfo::alpha, _PixelInfo::alpha_trait, BlendPixelTrait, _PixelInfo::blue, _ColorInfo::color, color_list, _PixelInfo::colorspace, _ColorInfo::compliance, CopyMagickString(), _PixelInfo::depth, GetColorInfo(), GetColorTuple(), GetNextValueInLinkedList(), _PixelInfo::green, IfMagickFalse, IsMagickTrue, IssRGBColorspace(), MagickEpsilon, MagickFalse, MagickTrue, MagickPathExtent, _ColorInfo::name, OpaqueAlpha, _PixelInfo::red, ResetLinkedListIterator(), SVGCompliance, UndefinedPixelTrait, and XPMCompliance.

Referenced by GetNumberColors(), IdentifyImage(), and InterpretImageProperties().

diff --git a/www/api/MagickCore/color_8h.html b/www/api/MagickCore/color_8h.html index cf44fd123..d136e0ed0 100644 --- a/www/api/MagickCore/color_8h.html +++ b/www/api/MagickCore/color_8h.html @@ -354,7 +354,7 @@ Functions

Definition at line 1402 of file color.c.

-

References _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _PixelInfo::colorspace, CommandOptionToMnemonic(), ConcatenateColorComponent(), ConcatenateMagickString(), ConcatentateHexColorComponent(), _PixelInfo::depth, GetMagickModule, GRAYColorspace, GrayPixelChannel, _PixelInfo::green, GreenPixelChannel, IfMagickTrue, IsMagickTrue, LocaleLower(), LogMagickEvent(), MagickColorspaceOptions, MagickEpsilon, MaxTextExtent, OpaqueAlpha, _PixelInfo::red, RedPixelChannel, SVGCompliance, SVGCompliant, and TraceEvent.

+

References _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _PixelInfo::colorspace, CommandOptionToMnemonic(), ConcatenateColorComponent(), ConcatenateMagickString(), ConcatentateHexColorComponent(), _PixelInfo::depth, GetMagickModule, GRAYColorspace, GrayPixelChannel, _PixelInfo::green, GreenPixelChannel, IfMagickTrue, IsMagickTrue, LocaleLower(), LogMagickEvent(), MagickColorspaceOptions, MagickEpsilon, MagickPathExtent, OpaqueAlpha, _PixelInfo::red, RedPixelChannel, SVGCompliance, SVGCompliant, and TraceEvent.

Referenced by GetNumberColors(), IdentifyImage(), ListColorInfo(), and QueryColorname().

diff --git a/www/api/MagickCore/configure_8c.html b/www/api/MagickCore/configure_8c.html index 2adfb0a9b..1fb93b31d 100644 --- a/www/api/MagickCore/configure_8c.html +++ b/www/api/MagickCore/configure_8c.html @@ -669,7 +669,7 @@ Variables

Definition at line 560 of file configure.c.

-

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureEvent, ConfigureFileToStringInfo(), ConfigureWarning, CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), GetNumberOfElementsInLinkedList(), LogMagickEvent(), MaxTextExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), ThrowMagickException(), and TraceEvent.

+

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureEvent, ConfigureFileToStringInfo(), ConfigureWarning, CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), GetNumberOfElementsInLinkedList(), LogMagickEvent(), MagickPathExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), ThrowMagickException(), and TraceEvent.

Referenced by GetThresholdMap(), ListThresholdMaps(), LoadCoderLists(), LoadColorLists(), LoadConfigureLists(), LoadDelegateLists(), LoadLogLists(), LoadMagicLists(), LoadMimeLists(), LoadPolicyLists(), and LoadTypeLists().

@@ -701,7 +701,7 @@ Variables

Definition at line 651 of file configure.c.

-

References AppendValueToLinkedList(), ChopPathComponents(), ConcatenateMagickString(), ConstantString(), CopyMagickString(), DestroyString(), DirectoryListSeparator, DirectorySeparator, FormatLocaleString(), GetClientPath(), GetEnvironmentValue(), GetMagickModule, LogMagickEvent(), MAGICKCORE_CONFIGURE_PATH, MAGICKCORE_CONFIGURE_RELATIVE_PATH, MAGICKCORE_DOCUMENTATION_PATH, MAGICKCORE_SHARE_PATH, MAGICKCORE_SHARE_RELATIVE_PATH, MagickCoreDebugDLL, MagickCoreDLL, MagickFalse, MaxTextExtent, NewLinkedList(), RegistryKey, RelinquishMagickMemory(), and TraceEvent.

+

References AppendValueToLinkedList(), ChopPathComponents(), ConcatenateMagickString(), ConstantString(), CopyMagickString(), DestroyString(), DirectoryListSeparator, DirectorySeparator, FormatLocaleString(), GetClientPath(), GetEnvironmentValue(), GetMagickModule, LogMagickEvent(), MAGICKCORE_CONFIGURE_PATH, MAGICKCORE_CONFIGURE_RELATIVE_PATH, MAGICKCORE_DOCUMENTATION_PATH, MAGICKCORE_SHARE_PATH, MAGICKCORE_SHARE_RELATIVE_PATH, MagickCoreDebugDLL, MagickCoreDLL, MagickFalse, MagickPathExtent, NewLinkedList(), RegistryKey, RelinquishMagickMemory(), and TraceEvent.

Referenced by GetConfigureOptions(), GetLocaleOptions(), and GetMagickHomeURL().

@@ -835,7 +835,7 @@ Variables

Definition at line 1036 of file configure.c.

-

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), configure_list, ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _ConfigureInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _ConfigureInfo::name, NewLinkedList(), _ConfigureInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _ConfigureInfo::signature, _ConfigureInfo::stealth, ThrowFatalException, ThrowFileException, ThrowMagickException(), and _ConfigureInfo::value.

+

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), configure_list, ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _ConfigureInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _ConfigureInfo::name, NewLinkedList(), _ConfigureInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _ConfigureInfo::signature, _ConfigureInfo::stealth, ThrowFatalException, ThrowFileException, ThrowMagickException(), and _ConfigureInfo::value.

Referenced by LoadConfigureLists().

diff --git a/www/api/MagickCore/configure_8h.html b/www/api/MagickCore/configure_8h.html index e26c8d74c..c491a9cb0 100644 --- a/www/api/MagickCore/configure_8h.html +++ b/www/api/MagickCore/configure_8h.html @@ -279,7 +279,7 @@ Functions

Definition at line 560 of file configure.c.

-

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureEvent, ConfigureFileToStringInfo(), ConfigureWarning, CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), GetNumberOfElementsInLinkedList(), LogMagickEvent(), MaxTextExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), ThrowMagickException(), and TraceEvent.

+

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureEvent, ConfigureFileToStringInfo(), ConfigureWarning, CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), GetNumberOfElementsInLinkedList(), LogMagickEvent(), MagickPathExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), ThrowMagickException(), and TraceEvent.

Referenced by GetThresholdMap(), ListThresholdMaps(), LoadCoderLists(), LoadColorLists(), LoadConfigureLists(), LoadDelegateLists(), LoadLogLists(), LoadMagicLists(), LoadMimeLists(), LoadPolicyLists(), and LoadTypeLists().

diff --git a/www/api/MagickCore/constitute_8c.html b/www/api/MagickCore/constitute_8c.html index 1df7f1276..1b0e871e1 100644 --- a/www/api/MagickCore/constitute_8c.html +++ b/www/api/MagickCore/constitute_8c.html @@ -321,7 +321,7 @@ Variables

Definition at line 314 of file constitute.c.

-

References AcquireExceptionInfo(), AppendImageToList(), CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetMagickModule, InterpretImageFilename(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, NewImageList(), _ImageInfo::number_scenes, PingImage(), _ImageInfo::scene, SetImageInfo(), SetImageOption(), _ImageInfo::signature, and TraceEvent.

+

References AcquireExceptionInfo(), AppendImageToList(), CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetMagickModule, InterpretImageFilename(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, NewImageList(), _ImageInfo::number_scenes, PingImage(), _ImageInfo::scene, SetImageInfo(), SetImageOption(), _ImageInfo::signature, and TraceEvent.

@@ -395,7 +395,7 @@ Variables

Definition at line 407 of file constitute.c.

-

References AcquireExceptionInfo(), AcquireImage(), AcquireSemaphoreInfo(), CloneImageInfo(), CloneImages(), CloseBlob(), CoderPolicyDomain, _Image::columns, constitute_semaphore, CopyMagickString(), CropImage(), _ImageInfo::debug, DecoderThreadSupport, _Image::delay, DeleteImageProperty(), DestroyExceptionInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::dispose, _ImageInfo::endian, ErrorException, ExceptionEvent, _ImageInfo::extract, _Image::filename, _ImageInfo::filename, FileOpenError, _Image::filter, FormatMagickTime(), GetBlobError(), GetBlobProperties(), GetDelegateInfo(), GetDelegateThreadSupport(), GetFirstImageInList(), GetImageDecoder(), GetImageOption(), GetImageProfile(), GetImageProperty(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagickRawSupport(), GetMagickSeekableStream(), GetMagickThreadSupport(), GetNextImageInList(), GetPathComponent(), GreaterValue, _RectangleInfo::height, HeightValue, IdentifyImage(), ImageToFile(), InterpretImageProperties(), InvokeDelegate(), IsBlobSeekable(), IsBlobTemporary(), IsPathAccessible(), IsRightsAuthorized(), IsSceneGeometry(), LessValue, LocaleCompare(), LockSemaphoreInfo(), LogMagickEvent(), LSBEndian, _Image::magick, _ImageInfo::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickDisposeOptions, MagickFalse, MagickPath, MagickSignature, MagickTrue, MaxTextExtent, MissingDelegateError, MSBEndian, NewImageList(), OpenBlob(), OptionError, _Image::orientation, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), ParseRegionGeometry(), PolicyError, ReadBinaryBlobMode, ReadPolicyRights, RelinquishUniqueFileResource(), ReplaceImageInList(), ResizeImage(), _Image::resolution, _GeometryInfo::rho, _Image::rows, _ImageInfo::scenes, SetImageInfo(), SetImageProperty(), _ExceptionInfo::severity, _GeometryInfo::sigma, SigmaValue, _ImageInfo::signature, _ImageInfo::stream, StringToLong(), _Image::taint, _ImageInfo::temporary, ThrowFileException, ThrowMagickException(), _Image::ticks_per_second, TraceEvent, UndefinedEndian, _Image::units, UnlockSemaphoreInfo(), _ImageInfo::verbose, _RectangleInfo::width, WidthValue, _PointInfo::x, XValue, _PointInfo::y, and YValue.

+

References AcquireExceptionInfo(), AcquireImage(), AcquireSemaphoreInfo(), CloneImageInfo(), CloneImages(), CloseBlob(), CoderPolicyDomain, _Image::columns, constitute_semaphore, CopyMagickString(), CropImage(), _ImageInfo::debug, DecoderThreadSupport, _Image::delay, DeleteImageProperty(), DestroyExceptionInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::dispose, _ImageInfo::endian, ErrorException, ExceptionEvent, _ImageInfo::extract, _Image::filename, _ImageInfo::filename, FileOpenError, _Image::filter, FormatMagickTime(), GetBlobError(), GetBlobProperties(), GetDelegateInfo(), GetDelegateThreadSupport(), GetFirstImageInList(), GetImageDecoder(), GetImageOption(), GetImageProfile(), GetImageProperty(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagickRawSupport(), GetMagickSeekableStream(), GetMagickThreadSupport(), GetNextImageInList(), GetPathComponent(), GreaterValue, _RectangleInfo::height, HeightValue, IdentifyImage(), ImageToFile(), InterpretImageProperties(), InvokeDelegate(), IsBlobSeekable(), IsBlobTemporary(), IsPathAccessible(), IsRightsAuthorized(), IsSceneGeometry(), LessValue, LocaleCompare(), LockSemaphoreInfo(), LogMagickEvent(), LSBEndian, _Image::magick, _ImageInfo::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickDisposeOptions, MagickFalse, MagickPath, MagickSignature, MagickTrue, MagickPathExtent, MissingDelegateError, MSBEndian, NewImageList(), OpenBlob(), OptionError, _Image::orientation, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), ParseRegionGeometry(), PolicyError, ReadBinaryBlobMode, ReadPolicyRights, RelinquishUniqueFileResource(), ReplaceImageInList(), ResizeImage(), _Image::resolution, _GeometryInfo::rho, _Image::rows, _ImageInfo::scenes, SetImageInfo(), SetImageProperty(), _ExceptionInfo::severity, _GeometryInfo::sigma, SigmaValue, _ImageInfo::signature, _ImageInfo::stream, StringToLong(), _Image::taint, _ImageInfo::temporary, ThrowFileException, ThrowMagickException(), _Image::ticks_per_second, TraceEvent, UndefinedEndian, _Image::units, UnlockSemaphoreInfo(), _ImageInfo::verbose, _RectangleInfo::width, WidthValue, _PointInfo::x, XValue, _PointInfo::y, and YValue.

Referenced by BlobToImage(), DrawImage(), DrawPrimitive(), IdentifyImage(), MontageImageList(), PreviewImage(), ReadImages(), ReadStream(), and RenderPostscript().

@@ -433,7 +433,7 @@ Variables

Definition at line 843 of file constitute.c.

-

References AcquireExceptionInfo(), AppendImageToList(), CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetMagickModule, InterpretImageFilename(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, NewImageList(), _ImageInfo::number_scenes, ReadImage(), _ImageInfo::scene, SetImageInfo(), SetImageOption(), _ImageInfo::signature, and TraceEvent.

+

References AcquireExceptionInfo(), AppendImageToList(), CloneImageInfo(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetMagickModule, InterpretImageFilename(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, NewImageList(), _ImageInfo::number_scenes, ReadImage(), _ImageInfo::scene, SetImageInfo(), SetImageOption(), _ImageInfo::signature, and TraceEvent.

@@ -507,7 +507,7 @@ Variables

Definition at line 1010 of file constitute.c.

-

References AcquireExceptionInfo(), AcquireSemaphoreInfo(), AcquireUniqueFilename(), _ImageInfo::adjoin, _ImageInfo::affirm, CloneImageInfo(), CloseBlob(), CoderPolicyDomain, constitute_semaphore, CopyMagickString(), _Image::debug, DestroyExceptionInfo(), DestroyImageInfo(), EncoderThreadSupport, _Image::endian, _ImageInfo::endian, ExtensionPath, _Image::filename, _ImageInfo::filename, FileOpenError, GetBlobError(), GetDelegateInfo(), GetDelegateMode(), GetDelegateThreadSupport(), GetImageEncoder(), GetImageOption(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagickRawSupport(), GetMagickSeekableStream(), GetMagickThreadSupport(), GetNextImageInList(), GetPathComponent(), GetPreviousImageInList(), IdentifyImage(), IfMagickFalse, IfMagickTrue, ImageToFile(), InvokeDelegate(), IsBlobSeekable(), IsPathAccessible(), IsRightsAuthorized(), IsStringTrue(), IsTaintImage(), LocaleCompare(), LockSemaphoreInfo(), LogMagickEvent(), LSBEndian, _Image::magick, _ImageInfo::magick, _Image::magick_filename, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, MissingDelegateError, MissingDelegateWarning, MSBEndian, OpenBlob(), _ImageInfo::page, PolicyError, ReadBinaryBlobMode, RelinquishUniqueFileResource(), SetImageInfo(), _Image::signature, _ImageInfo::signature, SyncImageProfiles(), ThrowBinaryException, ThrowFileException, ThrowMagickException(), TraceEvent, UndefinedEndian, UnlockSemaphoreInfo(), _ImageInfo::verbose, WriteBinaryBlobMode, and WritePolicyRights.

+

References AcquireExceptionInfo(), AcquireSemaphoreInfo(), AcquireUniqueFilename(), _ImageInfo::adjoin, _ImageInfo::affirm, CloneImageInfo(), CloseBlob(), CoderPolicyDomain, constitute_semaphore, CopyMagickString(), _Image::debug, DestroyExceptionInfo(), DestroyImageInfo(), EncoderThreadSupport, _Image::endian, _ImageInfo::endian, ExtensionPath, _Image::filename, _ImageInfo::filename, FileOpenError, GetBlobError(), GetDelegateInfo(), GetDelegateMode(), GetDelegateThreadSupport(), GetImageEncoder(), GetImageOption(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagickRawSupport(), GetMagickSeekableStream(), GetMagickThreadSupport(), GetNextImageInList(), GetPathComponent(), GetPreviousImageInList(), IdentifyImage(), IfMagickFalse, IfMagickTrue, ImageToFile(), InvokeDelegate(), IsBlobSeekable(), IsPathAccessible(), IsRightsAuthorized(), IsStringTrue(), IsTaintImage(), LocaleCompare(), LockSemaphoreInfo(), LogMagickEvent(), LSBEndian, _Image::magick, _ImageInfo::magick, _Image::magick_filename, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, MissingDelegateError, MissingDelegateWarning, MSBEndian, OpenBlob(), _ImageInfo::page, PolicyError, ReadBinaryBlobMode, RelinquishUniqueFileResource(), SetImageInfo(), _Image::signature, _ImageInfo::signature, SyncImageProfiles(), ThrowBinaryException, ThrowFileException, ThrowMagickException(), TraceEvent, UndefinedEndian, UnlockSemaphoreInfo(), _ImageInfo::verbose, WriteBinaryBlobMode, and WritePolicyRights.

Referenced by ImageToBlob(), InjectImageBlob(), InvokeDelegate(), PreviewImage(), WriteImages(), and WriteStream().

@@ -551,7 +551,7 @@ Variables

Definition at line 1292 of file constitute.c.

-

References AcquireExceptionInfo(), _ImageInfo::adjoin, _Image::blob, _Image::client_data, CloneBlobInfo(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyExceptionInfo(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, GetFirstImageInList(), GetImageListLength(), GetMagickModule, GetNextImageInList(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _Image::scene, SetImageInfo(), SetImageProgress(), SetImageProgressMonitor(), _Image::signature, _ImageInfo::signature, TraceEvent, WriteImage(), and WriteImageTag.

+

References AcquireExceptionInfo(), _ImageInfo::adjoin, _Image::blob, _Image::client_data, CloneBlobInfo(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyExceptionInfo(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, GetFirstImageInList(), GetImageListLength(), GetMagickModule, GetNextImageInList(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _Image::scene, SetImageInfo(), SetImageProgress(), SetImageProgressMonitor(), _Image::signature, _ImageInfo::signature, TraceEvent, WriteImage(), and WriteImageTag.

Referenced by ImagesToBlob().

diff --git a/www/api/MagickCore/constitute_8h.html b/www/api/MagickCore/constitute_8h.html index 0ca10291c..1da81f0dc 100644 --- a/www/api/MagickCore/constitute_8h.html +++ b/www/api/MagickCore/constitute_8h.html @@ -368,7 +368,7 @@ Functions

Definition at line 1292 of file constitute.c.

-

References AcquireExceptionInfo(), _ImageInfo::adjoin, _Image::blob, _Image::client_data, CloneBlobInfo(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyExceptionInfo(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, GetFirstImageInList(), GetImageListLength(), GetMagickModule, GetNextImageInList(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _Image::scene, SetImageInfo(), SetImageProgress(), SetImageProgressMonitor(), _Image::signature, _ImageInfo::signature, TraceEvent, WriteImage(), and WriteImageTag.

+

References AcquireExceptionInfo(), _ImageInfo::adjoin, _Image::blob, _Image::client_data, CloneBlobInfo(), CloneImageInfo(), CopyMagickString(), _Image::debug, DestroyBlob(), DestroyExceptionInfo(), DestroyImageInfo(), _Image::filename, _ImageInfo::filename, GetFirstImageInList(), GetImageListLength(), GetMagickModule, GetNextImageInList(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _Image::scene, SetImageInfo(), SetImageProgress(), SetImageProgressMonitor(), _Image::signature, _ImageInfo::signature, TraceEvent, WriteImage(), and WriteImageTag.

Referenced by ImagesToBlob().

diff --git a/www/api/MagickCore/delegate_8c.html b/www/api/MagickCore/delegate_8c.html index d2e6738ae..77e906b07 100644 --- a/www/api/MagickCore/delegate_8c.html +++ b/www/api/MagickCore/delegate_8c.html @@ -656,7 +656,7 @@ Variables

Definition at line 836 of file delegate.c.

-

References access_utf8(), AcquireUniqueFilename(), AcquireUniqueSymbolicLink(), _ImageInfo::adjoin, CloneImageInfo(), _DelegateInfo::commands, CopyDelegateFile(), CopyMagickString(), _Image::debug, _DelegateInfo::decode, DelegateError, DelegatePolicyDomain, DestroyImageInfo(), DestroyString(), _DelegateInfo::encode, ExecutePolicyRights, _Image::filename, _ImageInfo::filename, FileOpenError, FormatLocaleString(), GetDelegateInfo(), GetImageListLength(), GetMagickModule, GetNextImageInList(), IfMagickFalse, IfMagickTrue, InterpretImageProperties(), IsMagickFalse, IsMagickTrue, IsRightsAuthorized(), LocaleCompare(), LocaleUpper(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickDelay(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _DelegateInfo::mode, PolicyError, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, _DelegateInfo::spawn, StringToList(), SystemCommand(), _ImageInfo::temporary, ThrowFileException, ThrowMagickException(), TraceEvent, _ImageInfo::unique, _ImageInfo::verbose, WriteImage(), and _ImageInfo::zero.

+

References access_utf8(), AcquireUniqueFilename(), AcquireUniqueSymbolicLink(), _ImageInfo::adjoin, CloneImageInfo(), _DelegateInfo::commands, CopyDelegateFile(), CopyMagickString(), _Image::debug, _DelegateInfo::decode, DelegateError, DelegatePolicyDomain, DestroyImageInfo(), DestroyString(), _DelegateInfo::encode, ExecutePolicyRights, _Image::filename, _ImageInfo::filename, FileOpenError, FormatLocaleString(), GetDelegateInfo(), GetImageListLength(), GetMagickModule, GetNextImageInList(), IfMagickFalse, IfMagickTrue, InterpretImageProperties(), IsMagickFalse, IsMagickTrue, IsRightsAuthorized(), LocaleCompare(), LocaleUpper(), LogMagickEvent(), _Image::magick, _ImageInfo::magick, MagickDelay(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _DelegateInfo::mode, PolicyError, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, SetImageInfo(), _Image::signature, _ImageInfo::signature, _DelegateInfo::spawn, StringToList(), SystemCommand(), _ImageInfo::temporary, ThrowFileException, ThrowMagickException(), TraceEvent, _ImageInfo::unique, _ImageInfo::verbose, WriteImage(), and _ImageInfo::zero.

Referenced by ReadImage(), and WriteImage().

@@ -688,7 +688,7 @@ Variables

Definition at line 1116 of file delegate.c.

-

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetDelegateInfoList(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _DelegateInfo::path, RelinquishMagickMemory(), StringToList(), and StripString().

+

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetDelegateInfoList(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _DelegateInfo::path, RelinquishMagickMemory(), StringToList(), and StripString().

@@ -738,7 +738,7 @@ Variables

Definition at line 1217 of file delegate.c.

-

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), _DelegateInfo::commands, ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _DelegateInfo::decode, delegate_list, DirectorySeparator, _DelegateInfo::encode, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IfMagickFalse, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _DelegateInfo::mode, NewLinkedList(), _DelegateInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _DelegateInfo::signature, _DelegateInfo::spawn, _DelegateInfo::stealth, SubstituteString(), _DelegateInfo::thread_support, ThrowFatalException, ThrowFileException, and ThrowMagickException().

+

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), _DelegateInfo::commands, ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _DelegateInfo::decode, delegate_list, DirectorySeparator, _DelegateInfo::encode, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IfMagickFalse, IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _DelegateInfo::mode, NewLinkedList(), _DelegateInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _DelegateInfo::signature, _DelegateInfo::spawn, _DelegateInfo::stealth, SubstituteString(), _DelegateInfo::thread_support, ThrowFatalException, ThrowFileException, and ThrowMagickException().

Referenced by LoadDelegateLists().

diff --git a/www/api/MagickCore/delegate_8h.html b/www/api/MagickCore/delegate_8h.html index 8977813f9..6504bf72e 100644 --- a/www/api/MagickCore/delegate_8h.html +++ b/www/api/MagickCore/delegate_8h.html @@ -391,7 +391,7 @@ Functions

Definition at line 1116 of file delegate.c.

-

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetDelegateInfoList(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _DelegateInfo::path, RelinquishMagickMemory(), StringToList(), and StripString().

+

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetDelegateInfoList(), IfMagickTrue, LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _DelegateInfo::path, RelinquishMagickMemory(), StringToList(), and StripString().

diff --git a/www/api/MagickCore/distort_8c.html b/www/api/MagickCore/distort_8c.html index 51985c191..962aea55a 100644 --- a/www/api/MagickCore/distort_8c.html +++ b/www/api/MagickCore/distort_8c.html @@ -437,7 +437,7 @@ Functions

Definition at line 1685 of file distort.c.

-

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), AcquireResampleFilterThreadSet(), AffineDistortion, _PixelInfo::alpha_trait, _Image::alpha_trait, ArcDistortion, _Image::background_color, BarrelDistortion, BarrelInverseDistortion, BilinearDistortion, BilinearForwardDistortion, BilinearReverseDistortion, BlendPixelTrait, CloneImage(), CMYKColorspace, CoefficientsToAffineArgs(), _Image::colorspace, _Image::columns, CompositePixelInfoBlend(), ConvertRGBToCMYK(), Cylinder2PlaneDistortion, _Image::debug, DePolarDistortion, DestroyCacheView(), DestroyImage(), DestroyResampleFilterThreadSet(), DirectClass, DistortImageTag, DistortResizeImage(), ExpandBounds, _Image::filename, FormatLocaleFile(), FormatLocaleString(), GenerateCoefficients(), GetImageArtifact(), GetMagickModule, GetOpenMPThreadId(), GetPixelChannels(), GetPixelInfo(), _RectangleInfo::height, IfStringTrue, InitalBounds, InvertAffineCoefficients(), InvertPerspectiveCoefficients(), IsGrayColorspace(), IsPixelInfoGray(), LogMagickEvent(), Magick2PI, MagickEpsilon, MagickFalse, MagickPI, MagickPI2, MagickRound(), MagickSignature, MagickTrue, _Image::matte_color, MaxTextExtent, NoValue, OptionError, OptionWarning, _Image::page, ParseAbsoluteGeometry(), PerceptibleReciprocal(), PerspectiveDistortion, Plane2CylinderDistortion, PolarDistortion, poly_basis_dx(), poly_basis_dy(), poly_basis_fn(), poly_basis_str(), PolynomialDistortion, _Image::progress_monitor, QueueCacheViewAuthenticPixels(), RelinquishMagickMemory(), ResamplePixelColor(), ResizeDistortion, ResourceLimitError, _Image::rows, ScaleFilter, SetImageColorspace(), SetImageProgress(), SetImageStorageClass(), SetPixelInfoPixel(), ShepardsDistortion, _ExceptionInfo::signature, _Image::signature, sRGBColorspace, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowMagickException(), TraceEvent, UndefinedVirtualPixelMethod, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

+

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), AcquireResampleFilterThreadSet(), AffineDistortion, _PixelInfo::alpha_trait, _Image::alpha_trait, ArcDistortion, _Image::background_color, BarrelDistortion, BarrelInverseDistortion, BilinearDistortion, BilinearForwardDistortion, BilinearReverseDistortion, BlendPixelTrait, CloneImage(), CMYKColorspace, CoefficientsToAffineArgs(), _Image::colorspace, _Image::columns, CompositePixelInfoBlend(), ConvertRGBToCMYK(), Cylinder2PlaneDistortion, _Image::debug, DePolarDistortion, DestroyCacheView(), DestroyImage(), DestroyResampleFilterThreadSet(), DirectClass, DistortImageTag, DistortResizeImage(), ExpandBounds, _Image::filename, FormatLocaleFile(), FormatLocaleString(), GenerateCoefficients(), GetImageArtifact(), GetMagickModule, GetOpenMPThreadId(), GetPixelChannels(), GetPixelInfo(), _RectangleInfo::height, IfStringTrue, InitalBounds, InvertAffineCoefficients(), InvertPerspectiveCoefficients(), IsGrayColorspace(), IsPixelInfoGray(), LogMagickEvent(), Magick2PI, MagickEpsilon, MagickFalse, MagickPI, MagickPI2, MagickRound(), MagickSignature, MagickTrue, _Image::matte_color, MagickPathExtent, NoValue, OptionError, OptionWarning, _Image::page, ParseAbsoluteGeometry(), PerceptibleReciprocal(), PerspectiveDistortion, Plane2CylinderDistortion, PolarDistortion, poly_basis_dx(), poly_basis_dy(), poly_basis_fn(), poly_basis_str(), PolynomialDistortion, _Image::progress_monitor, QueueCacheViewAuthenticPixels(), RelinquishMagickMemory(), ResamplePixelColor(), ResizeDistortion, ResourceLimitError, _Image::rows, ScaleFilter, SetImageColorspace(), SetImageProgress(), SetImageStorageClass(), SetPixelInfoPixel(), ShepardsDistortion, _ExceptionInfo::signature, _Image::signature, sRGBColorspace, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowMagickException(), TraceEvent, UndefinedVirtualPixelMethod, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

Referenced by AffineTransformImage(), DistortResizeImage(), and RotateImage().

diff --git a/www/api/MagickCore/draw_8c.html b/www/api/MagickCore/draw_8c.html index 3be6ba436..e2e883450 100644 --- a/www/api/MagickCore/draw_8c.html +++ b/www/api/MagickCore/draw_8c.html @@ -897,7 +897,7 @@ Functions

Definition at line 1397 of file draw.c.

-

References AllCompliance, _PixelInfo::alpha, _Image::background_color, _DrawInfo::clip_mask, CloneDrawInfo(), CloneImage(), CloneString(), _Image::columns, _Image::debug, DestroyDrawInfo(), DestroyImage(), DrawEvent, DrawImage(), _Image::filename, _DrawInfo::fill, FormatLocaleString(), GetImageArtifact(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, NegateImage(), _DrawInfo::primitive, QueryColorCompliance(), _Image::rows, SetImageBackgroundColor(), SetImageMask(), _Image::signature, TraceEvent, and TransparentAlpha.

+

References AllCompliance, _PixelInfo::alpha, _Image::background_color, _DrawInfo::clip_mask, CloneDrawInfo(), CloneImage(), CloneString(), _Image::columns, _Image::debug, DestroyDrawInfo(), DestroyImage(), DrawEvent, DrawImage(), _Image::filename, _DrawInfo::fill, FormatLocaleString(), GetImageArtifact(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, NegateImage(), _DrawInfo::primitive, QueryColorCompliance(), _Image::rows, SetImageBackgroundColor(), SetImageMask(), _Image::signature, TraceEvent, and TransparentAlpha.

Referenced by DrawImage().

@@ -1055,7 +1055,7 @@ Functions

Definition at line 1673 of file draw.c.

-

References AcquireImageInfo(), AcquireMagickMemory(), AcquireQuantumMemory(), AcquireString(), _DrawInfo::affine, _DrawInfo::align, AllCompliance, _PixelInfo::alpha, _DrawInfo::alpha, ArcPrimitive, BezierPrimitive, BezierQuantum, _DrawInfo::bounds, CatchException(), CirclePrimitive, ClampToQuantum(), _DrawInfo::clip_mask, _DrawInfo::clip_units, CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::columns, _DrawInfo::compose, _PrimitiveInfo::coordinates, CopyMagickString(), _DrawInfo::dash_offset, _DrawInfo::dash_pattern, _Image::debug, _DrawInfo::decorate, DegreesToRadians(), DestroyDrawInfo(), DestroyImageInfo(), DestroyString(), DirectClass, DrawClipPath(), DrawError, DrawEvent, DrawPatternPath(), DrawPrimitive(), EllipsePrimitive, _Image::filename, _ImageInfo::filename, FileToString(), _DrawInfo::fill, _DrawInfo::fill_pattern, _DrawInfo::fill_rule, FloodfillMethod, FormatLocaleString(), GetAffineMatrix(), GetImageArtifact(), GetMagickModule, GetMagickToken(), GradientImage(), _DrawInfo::gravity, _RectangleInfo::height, ImagePrimitive, _DrawInfo::interline_spacing, _DrawInfo::interword_spacing, IsPoint(), _DrawInfo::kerning, LinearGradient, _DrawInfo::linecap, _DrawInfo::linejoin, LinePrimitive, LocaleCompare(), LogMagickEvent(), MagickAlignOptions, MagickClipPathOptions, MagickComposeOptions, MagickDecorateOptions, MagickFalse, MagickFillRuleOptions, MagickGravityOptions, MagickLineCapOptions, MagickLineJoinOptions, MagickMax(), MagickMethodOptions, MagickPI, MagickSignature, MagickStretchOptions, MagickStyleOptions, MagickTrue, MattePrimitive, MaxTextExtent, _PrimitiveInfo::method, _DrawInfo::miterlimit, ObjectBoundingBox, _Image::page, ParseCommandOption(), PathPrimitive, _PrimitiveInfo::point, PointPrimitive, _DrawInfo::pointsize, PolygonPrimitive, PolylinePrimitive, _DrawInfo::primitive, _PrimitiveInfo::primitive, QuantumRange, QuantumScale, QueryColorCompliance(), ReadImage(), RectanglePrimitive, ReflectSpread, RelinquishMagickMemory(), RenderImageTag, ResizeQuantumMemory(), ResourceLimitError, ResourceLimitFatalError, RoundRectanglePrimitive, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetImageArtifact(), SetImageMask(), SetImageProgress(), SetImageStorageClass(), _DrawInfo::signature, _Image::signature, _DrawInfo::stretch, StringToDouble(), StringToLong(), StringToUnsignedLong(), _DrawInfo::stroke, _DrawInfo::stroke_antialias, _DrawInfo::stroke_pattern, _DrawInfo::stroke_width, _DrawInfo::style, _AffineMatrix::sx, _AffineMatrix::sy, _PrimitiveInfo::text, _DrawInfo::text_antialias, TextPrimitive, ThrowBinaryException, ThrowFatalException, ThrowMagickException(), TraceArc(), TraceBezier(), TraceCircle(), TraceEllipse(), TraceEvent, TraceLine(), TracePath(), TracePoint(), TraceRectangle(), TraceRoundRectangle(), _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _DrawInfo::viewbox, _DrawInfo::weight, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _SegmentInfo::x2, _PointInfo::y, _RectangleInfo::y, _SegmentInfo::y1, and _SegmentInfo::y2.

+

References AcquireImageInfo(), AcquireMagickMemory(), AcquireQuantumMemory(), AcquireString(), _DrawInfo::affine, _DrawInfo::align, AllCompliance, _PixelInfo::alpha, _DrawInfo::alpha, ArcPrimitive, BezierPrimitive, BezierQuantum, _DrawInfo::bounds, CatchException(), CirclePrimitive, ClampToQuantum(), _DrawInfo::clip_mask, _DrawInfo::clip_units, CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::columns, _DrawInfo::compose, _PrimitiveInfo::coordinates, CopyMagickString(), _DrawInfo::dash_offset, _DrawInfo::dash_pattern, _Image::debug, _DrawInfo::decorate, DegreesToRadians(), DestroyDrawInfo(), DestroyImageInfo(), DestroyString(), DirectClass, DrawClipPath(), DrawError, DrawEvent, DrawPatternPath(), DrawPrimitive(), EllipsePrimitive, _Image::filename, _ImageInfo::filename, FileToString(), _DrawInfo::fill, _DrawInfo::fill_pattern, _DrawInfo::fill_rule, FloodfillMethod, FormatLocaleString(), GetAffineMatrix(), GetImageArtifact(), GetMagickModule, GetMagickToken(), GradientImage(), _DrawInfo::gravity, _RectangleInfo::height, ImagePrimitive, _DrawInfo::interline_spacing, _DrawInfo::interword_spacing, IsPoint(), _DrawInfo::kerning, LinearGradient, _DrawInfo::linecap, _DrawInfo::linejoin, LinePrimitive, LocaleCompare(), LogMagickEvent(), MagickAlignOptions, MagickClipPathOptions, MagickComposeOptions, MagickDecorateOptions, MagickFalse, MagickFillRuleOptions, MagickGravityOptions, MagickLineCapOptions, MagickLineJoinOptions, MagickMax(), MagickMethodOptions, MagickPI, MagickSignature, MagickStretchOptions, MagickStyleOptions, MagickTrue, MattePrimitive, MagickPathExtent, _PrimitiveInfo::method, _DrawInfo::miterlimit, ObjectBoundingBox, _Image::page, ParseCommandOption(), PathPrimitive, _PrimitiveInfo::point, PointPrimitive, _DrawInfo::pointsize, PolygonPrimitive, PolylinePrimitive, _DrawInfo::primitive, _PrimitiveInfo::primitive, QuantumRange, QuantumScale, QueryColorCompliance(), ReadImage(), RectanglePrimitive, ReflectSpread, RelinquishMagickMemory(), RenderImageTag, ResizeQuantumMemory(), ResourceLimitError, ResourceLimitFatalError, RoundRectanglePrimitive, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetImageArtifact(), SetImageMask(), SetImageProgress(), SetImageStorageClass(), _DrawInfo::signature, _Image::signature, _DrawInfo::stretch, StringToDouble(), StringToLong(), StringToUnsignedLong(), _DrawInfo::stroke, _DrawInfo::stroke_antialias, _DrawInfo::stroke_pattern, _DrawInfo::stroke_width, _DrawInfo::style, _AffineMatrix::sx, _AffineMatrix::sy, _PrimitiveInfo::text, _DrawInfo::text_antialias, TextPrimitive, ThrowBinaryException, ThrowFatalException, ThrowMagickException(), TraceArc(), TraceBezier(), TraceCircle(), TraceEllipse(), TraceEvent, TraceLine(), TracePath(), TracePoint(), TraceRectangle(), TraceRoundRectangle(), _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _DrawInfo::viewbox, _DrawInfo::weight, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _SegmentInfo::x1, _SegmentInfo::x2, _PointInfo::y, _RectangleInfo::y, _SegmentInfo::y1, and _SegmentInfo::y2.

Referenced by AnnotateImage(), DrawClipPath(), DrawPatternPath(), and VignetteImage().

@@ -1105,7 +1105,7 @@ Functions

Definition at line 3465 of file draw.c.

-

References AcquireImage(), AcquireImageInfo(), AcquireString(), AllCompliance, CloneDrawInfo(), CloneString(), _Image::debug, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawEvent, DrawImage(), _Image::filename, _DrawInfo::fill_pattern, FormatLocaleString(), GetImageArtifact(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, NewImageList(), _DrawInfo::primitive, QueryColorCompliance(), SetImageBackgroundColor(), _Image::signature, _ImageInfo::size, _DrawInfo::stroke_pattern, and TraceEvent.

+

References AcquireImage(), AcquireImageInfo(), AcquireString(), AllCompliance, CloneDrawInfo(), CloneString(), _Image::debug, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawEvent, DrawImage(), _Image::filename, _DrawInfo::fill_pattern, FormatLocaleString(), GetImageArtifact(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, NewImageList(), _DrawInfo::primitive, QueryColorCompliance(), SetImageBackgroundColor(), _Image::signature, _ImageInfo::size, _DrawInfo::stroke_pattern, and TraceEvent.

Referenced by DrawImage().

@@ -1201,7 +1201,7 @@ Functions

Definition at line 4123 of file draw.c.

-

References AcquireAuthenticCacheView(), AcquireImageInfo(), _DrawInfo::affine, _PixelInfo::alpha, _DrawInfo::alpha, _Image::alpha_trait, AlphaChannel, AnnotateImage(), BlendPixelTrait, _PixelInfo::blue, _DrawInfo::border_color, ClampToQuantum(), CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::colorspace, _Image::columns, _DrawInfo::compose, CompositeImage(), CompositePixelOver(), CopyMagickString(), _DrawInfo::dash_pattern, _Image::debug, DestroyCacheView(), DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawAffineImage(), DrawDashPolygon(), DrawEvent, DrawPolygonPrimitive(), DrawStrokePolygon(), ExpandAffine(), _ImageInfo::filename, _DrawInfo::fill, FillToBorderMethod, _Image::filter, FloodfillMethod, FloodfillPaintImage(), FormatLocaleString(), _DrawInfo::geometry, GetCacheViewAuthenticPixels(), GetFillColor(), GetMagickModule, GetOneCacheViewVirtualPixelInfo(), GetOneVirtualPixelInfo(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), _Image::gravity, _DrawInfo::gravity, _PixelInfo::green, ImagePrimitive, _Image::interpolate, IsEventLogging(), IsFuzzyEquivalencePixelInfo(), IsGrayColorspace(), IsPixelInfoGray(), _DrawInfo::linecap, _DrawInfo::linejoin, LocaleNCompare(), LogMagickEvent(), LogPrimitiveInfo(), MagickEpsilon, MagickFalse, MagickTrue, MattePrimitive, MaxTextExtent, _PrimitiveInfo::method, OpaqueAlpha, OpaqueAlphaChannel, OverCompositeOp, ParseGravityGeometry(), _PrimitiveInfo::point, PointMethod, PointPrimitive, _PrimitiveInfo::primitive, ReadImage(), ReadInlineImage(), _PixelInfo::red, ReplaceMethod, ResetMethod, RoundCap, RoundJoin, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetImageAlpha(), SetImageAlphaChannel(), SetImageChannelMask(), SetImageColorspace(), SetImageProgressMonitor(), SetPixelAlpha(), SetPixelInfoPixel(), sRGBColorspace, _DrawInfo::stroke, _DrawInfo::stroke_width, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _PrimitiveInfo::text, TextPrimitive, TileVirtualPixelMethod, TransformImage(), TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

+

References AcquireAuthenticCacheView(), AcquireImageInfo(), _DrawInfo::affine, _PixelInfo::alpha, _DrawInfo::alpha, _Image::alpha_trait, AlphaChannel, AnnotateImage(), BlendPixelTrait, _PixelInfo::blue, _DrawInfo::border_color, ClampToQuantum(), CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::colorspace, _Image::columns, _DrawInfo::compose, CompositeImage(), CompositePixelOver(), CopyMagickString(), _DrawInfo::dash_pattern, _Image::debug, DestroyCacheView(), DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawAffineImage(), DrawDashPolygon(), DrawEvent, DrawPolygonPrimitive(), DrawStrokePolygon(), ExpandAffine(), _ImageInfo::filename, _DrawInfo::fill, FillToBorderMethod, _Image::filter, FloodfillMethod, FloodfillPaintImage(), FormatLocaleString(), _DrawInfo::geometry, GetCacheViewAuthenticPixels(), GetFillColor(), GetMagickModule, GetOneCacheViewVirtualPixelInfo(), GetOneVirtualPixelInfo(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), _Image::gravity, _DrawInfo::gravity, _PixelInfo::green, ImagePrimitive, _Image::interpolate, IsEventLogging(), IsFuzzyEquivalencePixelInfo(), IsGrayColorspace(), IsPixelInfoGray(), _DrawInfo::linecap, _DrawInfo::linejoin, LocaleNCompare(), LogMagickEvent(), LogPrimitiveInfo(), MagickEpsilon, MagickFalse, MagickTrue, MattePrimitive, MagickPathExtent, _PrimitiveInfo::method, OpaqueAlpha, OpaqueAlphaChannel, OverCompositeOp, ParseGravityGeometry(), _PrimitiveInfo::point, PointMethod, PointPrimitive, _PrimitiveInfo::primitive, ReadImage(), ReadInlineImage(), _PixelInfo::red, ReplaceMethod, ResetMethod, RoundCap, RoundJoin, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetImageAlpha(), SetImageAlphaChannel(), SetImageChannelMask(), SetImageColorspace(), SetImageProgressMonitor(), SetPixelAlpha(), SetPixelInfoPixel(), sRGBColorspace, _DrawInfo::stroke, _DrawInfo::stroke_width, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _PrimitiveInfo::text, TextPrimitive, TileVirtualPixelMethod, TransformImage(), TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

Referenced by DrawBoundingRectangles(), and DrawImage().

@@ -2111,7 +2111,7 @@ Functions

Definition at line 5228 of file draw.c.

-

References _PrimitiveInfo::coordinates, FillToBorderMethod, FormatLocaleFile(), GetMagickToken(), IsPoint(), MagickFalse, MagickTrue, MaxTextExtent, _PrimitiveInfo::method, _PrimitiveInfo::primitive, StringToDouble(), StringToLong(), TraceArcPath(), TraceBezier(), TracePoint(), _PointInfo::x, and _PointInfo::y.

+

References _PrimitiveInfo::coordinates, FillToBorderMethod, FormatLocaleFile(), GetMagickToken(), IsPoint(), MagickFalse, MagickTrue, MagickPathExtent, _PrimitiveInfo::method, _PrimitiveInfo::primitive, StringToDouble(), StringToLong(), TraceArcPath(), TraceBezier(), TracePoint(), _PointInfo::x, and _PointInfo::y.

Referenced by DrawImage().

diff --git a/www/api/MagickCore/draw_8h.html b/www/api/MagickCore/draw_8h.html index eb2fddb2e..bde32eced 100644 --- a/www/api/MagickCore/draw_8h.html +++ b/www/api/MagickCore/draw_8h.html @@ -900,7 +900,7 @@ Functions

Definition at line 4123 of file draw.c.

-

References AcquireAuthenticCacheView(), AcquireImageInfo(), _DrawInfo::affine, _PixelInfo::alpha, _DrawInfo::alpha, _Image::alpha_trait, AlphaChannel, AnnotateImage(), BlendPixelTrait, _PixelInfo::blue, _DrawInfo::border_color, ClampToQuantum(), CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::colorspace, _Image::columns, _DrawInfo::compose, CompositeImage(), CompositePixelOver(), CopyMagickString(), _DrawInfo::dash_pattern, _Image::debug, DestroyCacheView(), DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawAffineImage(), DrawDashPolygon(), DrawEvent, DrawPolygonPrimitive(), DrawStrokePolygon(), ExpandAffine(), _ImageInfo::filename, _DrawInfo::fill, FillToBorderMethod, _Image::filter, FloodfillMethod, FloodfillPaintImage(), FormatLocaleString(), _DrawInfo::geometry, GetCacheViewAuthenticPixels(), GetFillColor(), GetMagickModule, GetOneCacheViewVirtualPixelInfo(), GetOneVirtualPixelInfo(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), _Image::gravity, _DrawInfo::gravity, _PixelInfo::green, ImagePrimitive, _Image::interpolate, IsEventLogging(), IsFuzzyEquivalencePixelInfo(), IsGrayColorspace(), IsPixelInfoGray(), _DrawInfo::linecap, _DrawInfo::linejoin, LocaleNCompare(), LogMagickEvent(), LogPrimitiveInfo(), MagickEpsilon, MagickFalse, MagickTrue, MattePrimitive, MaxTextExtent, _PrimitiveInfo::method, OpaqueAlpha, OpaqueAlphaChannel, OverCompositeOp, ParseGravityGeometry(), _PrimitiveInfo::point, PointMethod, PointPrimitive, _PrimitiveInfo::primitive, ReadImage(), ReadInlineImage(), _PixelInfo::red, ReplaceMethod, ResetMethod, RoundCap, RoundJoin, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetImageAlpha(), SetImageAlphaChannel(), SetImageChannelMask(), SetImageColorspace(), SetImageProgressMonitor(), SetPixelAlpha(), SetPixelInfoPixel(), sRGBColorspace, _DrawInfo::stroke, _DrawInfo::stroke_width, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _PrimitiveInfo::text, TextPrimitive, TileVirtualPixelMethod, TransformImage(), TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

+

References AcquireAuthenticCacheView(), AcquireImageInfo(), _DrawInfo::affine, _PixelInfo::alpha, _DrawInfo::alpha, _Image::alpha_trait, AlphaChannel, AnnotateImage(), BlendPixelTrait, _PixelInfo::blue, _DrawInfo::border_color, ClampToQuantum(), CloneDrawInfo(), CloneString(), ColorPrimitive, _Image::colorspace, _Image::columns, _DrawInfo::compose, CompositeImage(), CompositePixelOver(), CopyMagickString(), _DrawInfo::dash_pattern, _Image::debug, DestroyCacheView(), DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DrawAffineImage(), DrawDashPolygon(), DrawEvent, DrawPolygonPrimitive(), DrawStrokePolygon(), ExpandAffine(), _ImageInfo::filename, _DrawInfo::fill, FillToBorderMethod, _Image::filter, FloodfillMethod, FloodfillPaintImage(), FormatLocaleString(), _DrawInfo::geometry, GetCacheViewAuthenticPixels(), GetFillColor(), GetMagickModule, GetOneCacheViewVirtualPixelInfo(), GetOneVirtualPixelInfo(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), _Image::gravity, _DrawInfo::gravity, _PixelInfo::green, ImagePrimitive, _Image::interpolate, IsEventLogging(), IsFuzzyEquivalencePixelInfo(), IsGrayColorspace(), IsPixelInfoGray(), _DrawInfo::linecap, _DrawInfo::linejoin, LocaleNCompare(), LogMagickEvent(), LogPrimitiveInfo(), MagickEpsilon, MagickFalse, MagickTrue, MattePrimitive, MagickPathExtent, _PrimitiveInfo::method, OpaqueAlpha, OpaqueAlphaChannel, OverCompositeOp, ParseGravityGeometry(), _PrimitiveInfo::point, PointMethod, PointPrimitive, _PrimitiveInfo::primitive, ReadImage(), ReadInlineImage(), _PixelInfo::red, ReplaceMethod, ResetMethod, RoundCap, RoundJoin, _Image::rows, _AffineMatrix::rx, _AffineMatrix::ry, SetGeometry(), SetImageAlpha(), SetImageAlphaChannel(), SetImageChannelMask(), SetImageColorspace(), SetImageProgressMonitor(), SetPixelAlpha(), SetPixelInfoPixel(), sRGBColorspace, _DrawInfo::stroke, _DrawInfo::stroke_width, _AffineMatrix::sx, _AffineMatrix::sy, SyncCacheViewAuthenticPixels(), _DrawInfo::text, _PrimitiveInfo::text, TextPrimitive, TileVirtualPixelMethod, TransformImage(), TransparentAlpha, _AffineMatrix::tx, _AffineMatrix::ty, UndefinedPrimitive, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, and _RectangleInfo::y.

Referenced by DrawBoundingRectangles(), and DrawImage().

diff --git a/www/api/MagickCore/effect_8c.html b/www/api/MagickCore/effect_8c.html index 726c0a719..8ab18e897 100644 --- a/www/api/MagickCore/effect_8c.html +++ b/www/api/MagickCore/effect_8c.html @@ -529,7 +529,7 @@ Functions

Definition at line 818 of file effect.c.

-

References AcquireKernelInfo(), ConvolveMorphology, _Image::debug, DestroyKernelInfo(), _Image::filename, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, MorphologyApply(), ResourceLimitError, _ExceptionInfo::signature, _Image::signature, ThrowImageException, TraceEvent, and UndefinedCompositeOp.

+

References AcquireKernelInfo(), ConvolveMorphology, _Image::debug, DestroyKernelInfo(), _Image::filename, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, MorphologyApply(), ResourceLimitError, _ExceptionInfo::signature, _Image::signature, ThrowImageException, TraceEvent, and UndefinedCompositeOp.

Referenced by AdaptiveBlurImage(), AdaptiveSharpenImage(), CharcoalImage(), PreviewImage(), ShadowImage(), UnsharpMaskImage(), and VignetteImage().

@@ -721,7 +721,7 @@ Functions

Definition at line 1401 of file effect.c.

-

References AcquireKernelInfo(), ConvolveMorphology, _Image::debug, DestroyKernelInfo(), _Image::filename, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, MorphologyApply(), ResourceLimitError, _ExceptionInfo::signature, _Image::signature, ThrowImageException, TraceEvent, and UndefinedCompositeOp.

+

References AcquireKernelInfo(), ConvolveMorphology, _Image::debug, DestroyKernelInfo(), _Image::filename, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, MorphologyApply(), ResourceLimitError, _ExceptionInfo::signature, _Image::signature, ThrowImageException, TraceEvent, and UndefinedCompositeOp.

@@ -923,7 +923,7 @@ Functions

Definition at line 1741 of file effect.c.

-

References AcquireImageInfo(), AcquireUniqueFileResource(), AddNoisePreview, AllCompliance, AppendImageToList(), BilevelImage(), BlurImage(), BlurPreview, BrightnessPreview, CharcoalDrawingPreview, CharcoalImage(), CloneImage(), CloneMontageInfo(), CloneString(), _QuantizeInfo::colorspace, _Image::columns, ContrastImage(), CopyMagickString(), _Image::debug, DefaultPreviewGeometry, DefaultTileFrame, DefaultTileLabel, DeleteImageProperty(), DespeckleImage(), DespecklePreview, DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyMontageInfo(), _Image::directory, DullPreview, EdgeDetectPreview, EdgeImage(), _MontageInfo::filename, _Image::filename, _ImageInfo::filename, FormatLocaleString(), _MontageInfo::frame, GammaImage(), GammaPreview, _MontageInfo::geometry, GetBlobSize(), GetMagickModule, GetQuantizeInfo(), GRAYColorspace, GrayscalePreview, _RectangleInfo::height, HuePreview, ImplodeImage(), ImplodePreview, _Image::interpolate, JPEGPreview, LogMagickEvent(), _Image::magick, MagickFalse, MagickSignature, MagickTrue, _Image::matte_color, MaxTextExtent, ModulateImage(), _Image::montage, MontageImages(), NewImageList(), NonpeakStatistic, _QuantizeInfo::number_colors, NumberTiles, OilPaintImage(), OilPaintPreview, ParseMetaGeometry(), PreviewImageTag, _ImageInfo::quality, QuantizeImage(), QuantizePreview, QuantumRange, QueryColorCompliance(), RaiseImage(), RaisePreview, ReadImage(), ReduceNoisePreview, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, RollImage(), RollPreview, RotateImage(), RotatePreview, _Image::rows, SaturationPreview, SegmentImage(), SegmentPreview, SetGeometry(), SetImageProgress(), SetImageProgressMonitor(), SetImageProperty(), ShadeImage(), ShadePreview, _MontageInfo::shadow, SharpenImage(), SharpenPreview, ShearImage(), ShearPreview, _Image::signature, SolarizeImage(), SolarizePreview, SpiffPreview, SpreadImage(), SpreadPreview, sRGBColorspace, StatisticImage(), SwirlImage(), SwirlPreview, ThresholdPreview, ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TraceEvent, WaveImage(), WavePreview, _RectangleInfo::width, WriteImage(), _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquireImageInfo(), AcquireUniqueFileResource(), AddNoisePreview, AllCompliance, AppendImageToList(), BilevelImage(), BlurImage(), BlurPreview, BrightnessPreview, CharcoalDrawingPreview, CharcoalImage(), CloneImage(), CloneMontageInfo(), CloneString(), _QuantizeInfo::colorspace, _Image::columns, ContrastImage(), CopyMagickString(), _Image::debug, DefaultPreviewGeometry, DefaultTileFrame, DefaultTileLabel, DeleteImageProperty(), DespeckleImage(), DespecklePreview, DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyMontageInfo(), _Image::directory, DullPreview, EdgeDetectPreview, EdgeImage(), _MontageInfo::filename, _Image::filename, _ImageInfo::filename, FormatLocaleString(), _MontageInfo::frame, GammaImage(), GammaPreview, _MontageInfo::geometry, GetBlobSize(), GetMagickModule, GetQuantizeInfo(), GRAYColorspace, GrayscalePreview, _RectangleInfo::height, HuePreview, ImplodeImage(), ImplodePreview, _Image::interpolate, JPEGPreview, LogMagickEvent(), _Image::magick, MagickFalse, MagickSignature, MagickTrue, _Image::matte_color, MagickPathExtent, ModulateImage(), _Image::montage, MontageImages(), NewImageList(), NonpeakStatistic, _QuantizeInfo::number_colors, NumberTiles, OilPaintImage(), OilPaintPreview, ParseMetaGeometry(), PreviewImageTag, _ImageInfo::quality, QuantizeImage(), QuantizePreview, QuantumRange, QueryColorCompliance(), RaiseImage(), RaisePreview, ReadImage(), ReduceNoisePreview, RelinquishMagickMemory(), RelinquishUniqueFileResource(), ResourceLimitError, RollImage(), RollPreview, RotateImage(), RotatePreview, _Image::rows, SaturationPreview, SegmentImage(), SegmentPreview, SetGeometry(), SetImageProgress(), SetImageProgressMonitor(), SetImageProperty(), ShadeImage(), ShadePreview, _MontageInfo::shadow, SharpenImage(), SharpenPreview, ShearImage(), ShearPreview, _Image::signature, SolarizeImage(), SolarizePreview, SpiffPreview, SpreadImage(), SpreadPreview, sRGBColorspace, StatisticImage(), SwirlImage(), SwirlPreview, ThresholdPreview, ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TraceEvent, WaveImage(), WavePreview, _RectangleInfo::width, WriteImage(), _RectangleInfo::x, and _RectangleInfo::y.

@@ -1007,7 +1007,7 @@ Functions

Definition at line 2540 of file effect.c.

-

References AcquireAlignedMemory(), AcquireAuthenticCacheView(), AcquireString(), AcquireVirtualCacheView(), BlendPixelTrait, ClampToQuantum(), CloneImage(), _Image::columns, ConcatenateString(), CopyPixelTrait, _Image::debug, DestroyCacheView(), DestroyImage(), DestroyString(), DirectClass, _Image::filename, FormatLocaleString(), GetCacheViewVirtualPixels(), GetMagickModule, GetOptimalKernelWidth1D(), GetPixelAlpha(), GetPixelChannelChannel(), GetPixelChannels(), GetPixelChannelTraits(), GetPixelIntensity(), GetPixelReadMask(), GRAYColorspace, LogMagickEvent(), MagickAssumeAligned, MagickEpsilon, MagickFalse, MagickPI, MagickSigma, MagickSignature, MagickTrue, MaxTextExtent, PerceptibleReciprocal(), _Image::progress_monitor, QuantumScale, QueueCacheViewAuthenticPixels(), RelinquishAlignedMemory(), ResourceLimitError, _Image::rows, SelectiveBlurImageTag, SetImageProgress(), SetImageStorageClass(), SetPixelChannel(), _ExceptionInfo::signature, _Image::signature, SyncCacheViewAuthenticPixels(), ThrowImageException, TraceEvent, TransformEvent, TransformImageColorspace(), _Image::type, and UndefinedPixelTrait.

+

References AcquireAlignedMemory(), AcquireAuthenticCacheView(), AcquireString(), AcquireVirtualCacheView(), BlendPixelTrait, ClampToQuantum(), CloneImage(), _Image::columns, ConcatenateString(), CopyPixelTrait, _Image::debug, DestroyCacheView(), DestroyImage(), DestroyString(), DirectClass, _Image::filename, FormatLocaleString(), GetCacheViewVirtualPixels(), GetMagickModule, GetOptimalKernelWidth1D(), GetPixelAlpha(), GetPixelChannelChannel(), GetPixelChannels(), GetPixelChannelTraits(), GetPixelIntensity(), GetPixelReadMask(), GRAYColorspace, LogMagickEvent(), MagickAssumeAligned, MagickEpsilon, MagickFalse, MagickPI, MagickSigma, MagickSignature, MagickTrue, MagickPathExtent, PerceptibleReciprocal(), _Image::progress_monitor, QuantumScale, QueueCacheViewAuthenticPixels(), RelinquishAlignedMemory(), ResourceLimitError, _Image::rows, SelectiveBlurImageTag, SetImageProgress(), SetImageStorageClass(), SetPixelChannel(), _ExceptionInfo::signature, _Image::signature, SyncCacheViewAuthenticPixels(), ThrowImageException, TraceEvent, TransformEvent, TransformImageColorspace(), _Image::type, and UndefinedPixelTrait.

diff --git a/www/api/MagickCore/enhance_8c.html b/www/api/MagickCore/enhance_8c.html index 2a7435237..6b956e18c 100644 --- a/www/api/MagickCore/enhance_8c.html +++ b/www/api/MagickCore/enhance_8c.html @@ -806,7 +806,7 @@ Functions

Definition at line 465 of file enhance.c.

-

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), _PixelInfo::blue, ClampToQuantum(), ColorDecisionListCorrectImageTag, _Image::colormap, _Image::colors, _Image::columns, _Image::debug, DestroyCacheView(), DestroyXMLTree(), _Image::filename, GetCacheViewAuthenticPixels(), GetMagickModule, GetMagickToken(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelRed(), GetXMLTreeChild(), GetXMLTreeContent(), _PixelInfo::green, IfMagickFalse, IfMagickTrue, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxMap, MaxTextExtent, NewXMLTree(), _Image::progress_monitor, PseudoClass, _PixelInfo::red, RelinquishMagickMemory(), ResourceLimitError, _Image::rows, SetImageProgress(), SetPixelBlue(), SetPixelGreen(), SetPixelRed(), _Image::signature, _Image::storage_class, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowBinaryException, TraceEvent, and TransformEvent.

+

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), _PixelInfo::blue, ClampToQuantum(), ColorDecisionListCorrectImageTag, _Image::colormap, _Image::colors, _Image::columns, _Image::debug, DestroyCacheView(), DestroyXMLTree(), _Image::filename, GetCacheViewAuthenticPixels(), GetMagickModule, GetMagickToken(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelRed(), GetXMLTreeChild(), GetXMLTreeContent(), _PixelInfo::green, IfMagickFalse, IfMagickTrue, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxMap, MagickPathExtent, NewXMLTree(), _Image::progress_monitor, PseudoClass, _PixelInfo::red, RelinquishMagickMemory(), ResourceLimitError, _Image::rows, SetImageProgress(), SetPixelBlue(), SetPixelGreen(), SetPixelRed(), _Image::signature, _Image::storage_class, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowBinaryException, TraceEvent, and TransformEvent.

diff --git a/www/api/MagickCore/exception_8c.html b/www/api/MagickCore/exception_8c.html index 8f6757426..8376f4a7a 100644 --- a/www/api/MagickCore/exception_8c.html +++ b/www/api/MagickCore/exception_8c.html @@ -544,7 +544,7 @@ Variables

Definition at line 488 of file exception.c.

-

References ConstantString(), CopyMagickString(), and MaxTextExtent.

+

References ConstantString(), CopyMagickString(), and MagickPathExtent.

Referenced by InitializeMagickList().

@@ -576,7 +576,7 @@ Variables

Definition at line 606 of file exception.c.

-

References ExceptionSeverityToTag(), FormatLocaleString(), GetLocaleMessage(), and MaxTextExtent.

+

References ExceptionSeverityToTag(), FormatLocaleString(), GetLocaleMessage(), and MagickPathExtent.

Referenced by GetImageViewException(), and ThrowMagickExceptionList().

@@ -966,7 +966,7 @@ Variables

Definition at line 991 of file exception.c.

-

References ConcatenateMagickString(), CopyMagickString(), ErrorException, ExceptionEvent, FatalErrorException, FormatLocaleString(), GetLocaleExceptionMessage(), GetPathComponent(), LogMagickEvent(), MagickSignature, MaxTextExtent, _ExceptionInfo::signature, TailPath, ThrowException(), and WarningException.

+

References ConcatenateMagickString(), CopyMagickString(), ErrorException, ExceptionEvent, FatalErrorException, FormatLocaleString(), GetLocaleExceptionMessage(), GetPathComponent(), LogMagickEvent(), MagickSignature, MagickPathExtent, _ExceptionInfo::signature, TailPath, ThrowException(), and WarningException.

Referenced by ThrowMagickException().

diff --git a/www/api/MagickCore/exception_8h.html b/www/api/MagickCore/exception_8h.html index 6119f0fe7..77061eca7 100644 --- a/www/api/MagickCore/exception_8h.html +++ b/www/api/MagickCore/exception_8h.html @@ -551,7 +551,7 @@ Functions

Definition at line 488 of file exception.c.

-

References ConstantString(), CopyMagickString(), and MaxTextExtent.

+

References ConstantString(), CopyMagickString(), and MagickPathExtent.

Referenced by InitializeMagickList().

@@ -583,7 +583,7 @@ Functions

Definition at line 606 of file exception.c.

-

References ExceptionSeverityToTag(), FormatLocaleString(), GetLocaleMessage(), and MaxTextExtent.

+

References ExceptionSeverityToTag(), FormatLocaleString(), GetLocaleMessage(), and MagickPathExtent.

Referenced by GetImageViewException(), and ThrowMagickExceptionList().

diff --git a/www/api/MagickCore/fx_8c.html b/www/api/MagickCore/fx_8c.html index b93942ca0..a0cba33ab 100644 --- a/www/api/MagickCore/fx_8c.html +++ b/www/api/MagickCore/fx_8c.html @@ -990,7 +990,7 @@ Functions

Definition at line 852 of file fx.c.

-

References AcquireAuthenticCacheView(), AcquireString(), AcquireVirtualCacheView(), _PixelInfo::alpha, _Image::alpha_trait, _PixelInfo::black, BlendPixelTrait, _PixelInfo::blue, CloneImage(), CMYKColorspace, ColorMatrixImageTag, _Image::colorspace, _Image::columns, ConcatenateString(), _Image::debug, DestroyCacheView(), DestroyImage(), DestroyString(), DirectClass, _Image::filename, FormatLocaleString(), GetCacheViewAuthenticPixels(), GetCacheViewVirtualPixels(), GetMagickModule, GetPixelAlpha(), GetPixelBlack(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelInfo(), GetPixelInfoPixel(), GetPixelRed(), _PixelInfo::green, _KernelInfo::height, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _Image::progress_monitor, QuantumRange, _PixelInfo::red, _Image::rows, SetImageProgress(), SetImageStorageClass(), SetPixelInfoPixel(), _ExceptionInfo::signature, _Image::signature, SyncCacheViewAuthenticPixels(), TraceEvent, TransformEvent, _KernelInfo::values, and _KernelInfo::width.

+

References AcquireAuthenticCacheView(), AcquireString(), AcquireVirtualCacheView(), _PixelInfo::alpha, _Image::alpha_trait, _PixelInfo::black, BlendPixelTrait, _PixelInfo::blue, CloneImage(), CMYKColorspace, ColorMatrixImageTag, _Image::colorspace, _Image::columns, ConcatenateString(), _Image::debug, DestroyCacheView(), DestroyImage(), DestroyString(), DirectClass, _Image::filename, FormatLocaleString(), GetCacheViewAuthenticPixels(), GetCacheViewVirtualPixels(), GetMagickModule, GetPixelAlpha(), GetPixelBlack(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelInfo(), GetPixelInfoPixel(), GetPixelRed(), _PixelInfo::green, _KernelInfo::height, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _Image::progress_monitor, QuantumRange, _PixelInfo::red, _Image::rows, SetImageProgress(), SetImageStorageClass(), SetPixelInfoPixel(), _ExceptionInfo::signature, _Image::signature, SyncCacheViewAuthenticPixels(), TraceEvent, TransformEvent, _KernelInfo::values, and _KernelInfo::width.

@@ -1098,7 +1098,7 @@ Functions

Definition at line 1125 of file fx.c.

-

References AddValueToSplayTree(), ConstantString(), DeleteNodeFromSplayTree(), FormatLocaleString(), GetImageDepth(), GetImageKurtosis(), GetImageMean(), GetImageRange(), GetValueFromSplayTree(), LocaleNCompare(), MagickPixelChannelOptions, MagickTrue, MaxTextExtent, ParseCommandOption(), QuantumScale, SetPixelChannelMask(), StringToDouble(), _FxInfo::symbols, and UndefinedChannel.

+

References AddValueToSplayTree(), ConstantString(), DeleteNodeFromSplayTree(), FormatLocaleString(), GetImageDepth(), GetImageKurtosis(), GetImageMean(), GetImageRange(), GetValueFromSplayTree(), LocaleNCompare(), MagickPixelChannelOptions, MagickTrue, MagickPathExtent, ParseCommandOption(), QuantumScale, SetPixelChannelMask(), StringToDouble(), _FxInfo::symbols, and UndefinedChannel.

Referenced by FxGetSymbol().

@@ -1260,7 +1260,7 @@ Functions

Definition at line 2093 of file fx.c.

-

References AddValueToSplayTree(), AlphaPixelChannel, BlackPixelChannel, BluePixelChannel, ClearMagickException(), CMYKColorspace, _Image::colorspace, ConstantString(), CopyMagickString(), CyanPixelChannel, DeleteNodeFromSplayTree(), EqualOperator, ExponentialNotation, _FxInfo::file, _Image::filename, FormatLocaleFile(), FormatLocaleString(), FxGCD(), FxGetSymbol(), FxOperatorPrecedence(), GetMagickModule, GetMagickPrecision(), GetPseudoRandomValue(), GreaterThanEqualOperator, GreenPixelChannel, _FxInfo::images, InterpretSiPrefixValue(), LeftShiftOperator, LessThanEqualOperator, LocaleCompare(), LocaleNCompare(), LogicalAndOperator, LogicalOrOperator, MagentaPixelChannel, MagickEpsilon, MagickPHI, MagickPI, MaxTextExtent, NotEqualOperator, OptionError, QuantumRange, QuantumScale, _FxInfo::random_info, RedPixelChannel, RightShiftOperator, _ExceptionInfo::severity, StringToken(), _FxInfo::symbols, ThrowMagickException(), UndefinedException, and YellowPixelChannel.

+

References AddValueToSplayTree(), AlphaPixelChannel, BlackPixelChannel, BluePixelChannel, ClearMagickException(), CMYKColorspace, _Image::colorspace, ConstantString(), CopyMagickString(), CyanPixelChannel, DeleteNodeFromSplayTree(), EqualOperator, ExponentialNotation, _FxInfo::file, _Image::filename, FormatLocaleFile(), FormatLocaleString(), FxGCD(), FxGetSymbol(), FxOperatorPrecedence(), GetMagickModule, GetMagickPrecision(), GetPseudoRandomValue(), GreaterThanEqualOperator, GreenPixelChannel, _FxInfo::images, InterpretSiPrefixValue(), LeftShiftOperator, LessThanEqualOperator, LocaleCompare(), LocaleNCompare(), LogicalAndOperator, LogicalOrOperator, MagentaPixelChannel, MagickEpsilon, MagickPHI, MagickPI, MagickPathExtent, NotEqualOperator, OptionError, QuantumRange, QuantumScale, _FxInfo::random_info, RedPixelChannel, RightShiftOperator, _ExceptionInfo::severity, StringToken(), _FxInfo::symbols, ThrowMagickException(), UndefinedException, and YellowPixelChannel.

Referenced by FxEvaluateChannelExpression(), and FxGetSymbol().

@@ -1362,7 +1362,7 @@ Functions

Definition at line 1274 of file fx.c.

-

References AddValueToSplayTree(), AllCompliance, _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, _GeometryInfo::chi, ChiValue, ClonePixelInfo(), CMYKColorspace, _FxInfo::colors, _Image::colorspace, _Image::columns, ConstantString(), ConvertRGBToHSL(), CopyMagickString(), CyanPixelChannel, _FxInfo::exception, _Image::filename, FxChannelStatistics(), FxEvaluateSubexpression(), GetImageDepth(), GetImageFromList(), GetImageIndexInList(), GetImageListLength(), GetMagickModule, GetPixelInfo(), GetPixelInfoIntensity(), GetValueFromSplayTree(), _PixelInfo::green, GreenPixelChannel, _RectangleInfo::height, ImageError, _FxInfo::images, IndexPixelChannel, IntensityPixelChannel, _Image::interpolate, InterpolatePixelInfo(), LocaleCompare(), LocaleNCompare(), MagentaPixelChannel, MagickFalse, MaxTextExtent, OptionError, _Image::page, ParseGeometry(), _GeometryInfo::psi, PsiValue, QuantumScale, QueryColorCompliance(), _PixelInfo::red, RedPixelChannel, _Image::resolution, _GeometryInfo::rho, RhoValue, _Image::rows, _GeometryInfo::sigma, SigmaValue, StringToDouble(), StripString(), _FxInfo::symbols, ThrowMagickException(), _FxInfo::view, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _GeometryInfo::xi, XiValue, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

+

References AddValueToSplayTree(), AllCompliance, _PixelInfo::alpha, _PixelInfo::alpha_trait, AlphaPixelChannel, _PixelInfo::black, BlackPixelChannel, BlendPixelTrait, _PixelInfo::blue, BluePixelChannel, _GeometryInfo::chi, ChiValue, ClonePixelInfo(), CMYKColorspace, _FxInfo::colors, _Image::colorspace, _Image::columns, ConstantString(), ConvertRGBToHSL(), CopyMagickString(), CyanPixelChannel, _FxInfo::exception, _Image::filename, FxChannelStatistics(), FxEvaluateSubexpression(), GetImageDepth(), GetImageFromList(), GetImageIndexInList(), GetImageListLength(), GetMagickModule, GetPixelInfo(), GetPixelInfoIntensity(), GetValueFromSplayTree(), _PixelInfo::green, GreenPixelChannel, _RectangleInfo::height, ImageError, _FxInfo::images, IndexPixelChannel, IntensityPixelChannel, _Image::interpolate, InterpolatePixelInfo(), LocaleCompare(), LocaleNCompare(), MagentaPixelChannel, MagickFalse, MagickPathExtent, OptionError, _Image::page, ParseGeometry(), _GeometryInfo::psi, PsiValue, QuantumScale, QueryColorCompliance(), _PixelInfo::red, RedPixelChannel, _Image::resolution, _GeometryInfo::rho, RhoValue, _Image::rows, _GeometryInfo::sigma, SigmaValue, StringToDouble(), StripString(), _FxInfo::symbols, ThrowMagickException(), _FxInfo::view, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _GeometryInfo::xi, XiValue, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

Referenced by FxEvaluateSubexpression().

@@ -1902,7 +1902,7 @@ Functions

Definition at line 3899 of file fx.c.

-

References AcquireImageInfo(), AcquireString(), AllCompliance, AnnotateImage(), _TypeMetric::ascent, _Image::background_color, _Image::border_color, CloneDrawInfo(), CloneImage(), CloneString(), _Image::columns, CompositeImage(), _Image::debug, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyString(), _Image::filename, FlopImage(), FormatLocaleString(), FormatMagickCaption(), _DrawInfo::geometry, GetMagickModule, _DrawInfo::gravity, InterpretImageProperties(), LogMagickEvent(), MagickFalse, MagickMax(), MagickSignature, MagickTrue, MaxTextExtent, OpaqueAlphaChannel, OverCompositeOp, QueryColorCompliance(), RotateImage(), _Image::rows, SetImageAlphaChannel(), SetImageBackgroundColor(), SetImageExtent(), ShadowImage(), _ExceptionInfo::signature, _Image::signature, _DrawInfo::text, TraceEvent, TrimImage(), UndefinedGravity, and WaveImage().

+

References AcquireImageInfo(), AcquireString(), AllCompliance, AnnotateImage(), _TypeMetric::ascent, _Image::background_color, _Image::border_color, CloneDrawInfo(), CloneImage(), CloneString(), _Image::columns, CompositeImage(), _Image::debug, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyString(), _Image::filename, FlopImage(), FormatLocaleString(), FormatMagickCaption(), _DrawInfo::geometry, GetMagickModule, _DrawInfo::gravity, InterpretImageProperties(), LogMagickEvent(), MagickFalse, MagickMax(), MagickSignature, MagickTrue, MagickPathExtent, OpaqueAlphaChannel, OverCompositeOp, QueryColorCompliance(), RotateImage(), _Image::rows, SetImageAlphaChannel(), SetImageBackgroundColor(), SetImageExtent(), ShadowImage(), _ExceptionInfo::signature, _Image::signature, _DrawInfo::text, TraceEvent, TrimImage(), UndefinedGravity, and WaveImage().

@@ -2342,7 +2342,7 @@ Functions

Definition at line 5421 of file fx.c.

-

References AcquireString(), AllCompliance, _Image::alpha_trait, _Image::background_color, BlendPixelTrait, BlurImage(), CloneDrawInfo(), CloneImage(), _Image::colorspace, _Image::columns, CompositeImage(), _Image::debug, DestroyDrawInfo(), DestroyImage(), DirectClass, DrawImage(), _Image::filename, _DrawInfo::fill, FlattenLayer, FormatLocaleString(), GetMagickModule, IntensityCompositeOp, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, MergeImageLayers(), _DrawInfo::primitive, QueryColorCompliance(), _Image::rows, SetImageBackgroundColor(), SetImageStorageClass(), _ExceptionInfo::signature, _Image::signature, _DrawInfo::stroke, TraceEvent, TransformImageColorspace(), and UndefinedPixelTrait.

+

References AcquireString(), AllCompliance, _Image::alpha_trait, _Image::background_color, BlendPixelTrait, BlurImage(), CloneDrawInfo(), CloneImage(), _Image::colorspace, _Image::columns, CompositeImage(), _Image::debug, DestroyDrawInfo(), DestroyImage(), DirectClass, DrawImage(), _Image::filename, _DrawInfo::fill, FlattenLayer, FormatLocaleString(), GetMagickModule, IntensityCompositeOp, LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, MergeImageLayers(), _DrawInfo::primitive, QueryColorCompliance(), _Image::rows, SetImageBackgroundColor(), SetImageStorageClass(), _ExceptionInfo::signature, _Image::signature, _DrawInfo::stroke, TraceEvent, TransformImageColorspace(), and UndefinedPixelTrait.

diff --git a/www/api/MagickCore/geometry_8c.html b/www/api/MagickCore/geometry_8c.html index a82ffd4e0..1930964eb 100644 --- a/www/api/MagickCore/geometry_8c.html +++ b/www/api/MagickCore/geometry_8c.html @@ -154,7 +154,7 @@ Functions

Definition at line 95 of file geometry.c.

-

References AreaValue, AspectValue, CopyMagickString(), GreaterValue, HeightValue, LessValue, LocaleNCompare(), MaxTextExtent, MinimumValue, NoValue, PercentValue, SeparatorValue, StringToDouble(), WidthValue, XNegative, XValue, YNegative, and YValue.

+

References AreaValue, AspectValue, CopyMagickString(), GreaterValue, HeightValue, LessValue, LocaleNCompare(), MagickPathExtent, MinimumValue, NoValue, PercentValue, SeparatorValue, StringToDouble(), WidthValue, XNegative, XValue, YNegative, and YValue.

Referenced by GetMontageGeometry(), GetPageGeometry(), MontageImageList(), ParseAbsoluteGeometry(), and ParseMetaGeometry().

@@ -176,7 +176,7 @@ Functions

Definition at line 340 of file geometry.c.

-

References AcquireString(), ConcatenateMagickString(), CopyMagickString(), GetGeometry(), GetMagickModule, GreaterValue, _RectangleInfo::height, LocaleNCompare(), LogMagickEvent(), MaxTextExtent, TraceEvent, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquireString(), ConcatenateMagickString(), CopyMagickString(), GetGeometry(), GetMagickModule, GreaterValue, _RectangleInfo::height, LocaleNCompare(), LogMagickEvent(), MagickPathExtent, TraceEvent, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

Referenced by AcquireImage(), SetImageProperty(), and SyncImageSettings().

@@ -382,7 +382,7 @@ Functions

Definition at line 699 of file geometry.c.

-

References GetAffineMatrix(), GetMagickModule, GetMagickToken(), MagickEpsilon, MaxTextExtent, NoValue, OptionError, _AffineMatrix::rx, _AffineMatrix::ry, StringToDouble(), _AffineMatrix::sx, _AffineMatrix::sy, ThrowMagickException(), _AffineMatrix::tx, _AffineMatrix::ty, XValue, and YValue.

+

References GetAffineMatrix(), GetMagickModule, GetMagickToken(), MagickEpsilon, MagickPathExtent, NoValue, OptionError, _AffineMatrix::rx, _AffineMatrix::ry, StringToDouble(), _AffineMatrix::sx, _AffineMatrix::sy, ThrowMagickException(), _AffineMatrix::tx, _AffineMatrix::ty, XValue, and YValue.

@@ -412,7 +412,7 @@ Functions

Definition at line 808 of file geometry.c.

-

References AreaValue, AspectValue, _GeometryInfo::chi, ChiNegative, ChiValue, CopyMagickString(), DecimalValue, GreaterValue, LessValue, LocaleNCompare(), MaxTextExtent, MinimumValue, NoValue, PercentValue, _GeometryInfo::psi, PsiNegative, PsiValue, _GeometryInfo::rho, RhoValue, SeparatorValue, _GeometryInfo::sigma, SigmaValue, StringToDouble(), _GeometryInfo::xi, XiNegative, and XiValue.

+

References AreaValue, AspectValue, _GeometryInfo::chi, ChiNegative, ChiValue, CopyMagickString(), DecimalValue, GreaterValue, LessValue, LocaleNCompare(), MagickPathExtent, MinimumValue, NoValue, PercentValue, _GeometryInfo::psi, PsiNegative, PsiValue, _GeometryInfo::rho, RhoValue, SeparatorValue, _GeometryInfo::sigma, SigmaValue, StringToDouble(), _GeometryInfo::xi, XiNegative, and XiValue.

Referenced by AcquireImage(), AdaptiveLevelImage(), AnnotateImage(), BlackThresholdImage(), ColorizeImage(), CompositeImage(), DrawBoundingRectangles(), FxGetSymbol(), IsGeometry(), ModulateImage(), ParseGravityGeometry(), ParseKernelArray(), ParseKernelName(), ParseMetaGeometry(), QueryColorCompliance(), RandomThresholdImage(), ReadImage(), RenderPostscript(), SampleImage(), ScaleGeometryKernelInfo(), SetImageProperty(), SyncImageSettings(), TintImage(), and WhiteThresholdImage().

diff --git a/www/api/MagickCore/geometry_8h.html b/www/api/MagickCore/geometry_8h.html index 42b38a2b9..ea43295f6 100644 --- a/www/api/MagickCore/geometry_8h.html +++ b/www/api/MagickCore/geometry_8h.html @@ -411,7 +411,7 @@ Functions

Definition at line 340 of file geometry.c.

-

References AcquireString(), ConcatenateMagickString(), CopyMagickString(), GetGeometry(), GetMagickModule, GreaterValue, _RectangleInfo::height, LocaleNCompare(), LogMagickEvent(), MaxTextExtent, TraceEvent, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquireString(), ConcatenateMagickString(), CopyMagickString(), GetGeometry(), GetMagickModule, GreaterValue, _RectangleInfo::height, LocaleNCompare(), LogMagickEvent(), MagickPathExtent, TraceEvent, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

Referenced by AcquireImage(), SetImageProperty(), and SyncImageSettings().

diff --git a/www/api/MagickCore/identify_8c.html b/www/api/MagickCore/identify_8c.html index 279d1d8d1..de665f1ba 100644 --- a/www/api/MagickCore/identify_8c.html +++ b/www/api/MagickCore/identify_8c.html @@ -262,7 +262,7 @@ Functions

Definition at line 236 of file identify.c.

-

References AcquireImageInfo(), AcquireQuantumMemory(), _PixelInfo::alpha_trait, _Image::alpha_trait, AlphaPixelChannel, _Image::background_color, BlackPixelChannel, BlendPixelTrait, _ChromaticityInfo::blue_primary, BluePixelChannel, _Image::border_color, _Image::chromaticity, CloneString(), cmsUInt32Number, CMYKColorspace, _Image::colormap, _Image::colors, _Image::colorspace, _PixelInfo::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compose, CompositePixelChannel, _Image::compression, ConcatenateColorComponent(), ConcatenateMagickString(), CopyMagickString(), CyanPixelChannel, _Image::debug, _Image::delay, _ChannelStatistics::depth, _Image::depth, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _ImageInfo::filename, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetColorTuple(), GetElapsedTime(), GetImageArtifact(), GetImageDepth(), GetImageFeatures(), GetImageListLength(), GetImageProfile(), GetImageProperty(), GetImageRegistry(), GetImageStatistics(), GetImageTotalInkDensity(), GetImageType(), GetMagickDescription(), GetMagickInfo(), GetMagickModule, GetMagickVersion(), GetNextImageArtifact(), GetNextImageInList(), GetNextImageProfile(), GetNextImageProperty(), GetNextImageRegistry(), GetNumberColors(), GetPathComponent(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), GetPreviousImageInList(), GetStringInfoDatum(), GetStringInfoLength(), GetTimerInfo(), GetUserTime(), GetVirtualPixels(), GRAYColorspace, GrayPixelChannel, _ChromaticityInfo::green_primary, GreenPixelChannel, _RectangleInfo::height, IfMagickTrue, _Image::intensity, _Image::interlace, IsHistogramImage(), IsImageGray(), IsStringTrue(), _Image::iterations, LocaleCompare(), LogMagickEvent(), MagentaPixelChannel, _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickEndianOptions, MagickFalse, MagickIntentOptions, MagickInterlaceOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, _Image::matte_color, MaxPixelChannels, MaxTextExtent, _ErrorInfo::mean_error_per_pixel, _Image::montage, _Image::next, _ErrorInfo::normalized_maximum_error, _ErrorInfo::normalized_mean_error, _Image::orientation, _Image::page, _Image::previous, PrintChannelFeatures(), PrintChannelStatistics(), PrintStringInfo(), PseudoClass, _Image::quality, QuantumRange, QueryColorname(), ReadImage(), _ChromaticityInfo::red_primary, RedPixelChannel, registry, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageArtifactIterator(), ResetImageProfileIterator(), ResetImagePropertyIterator(), ResetImageRegistryIterator(), _Image::resolution, RGBColorspace, _Image::rows, _Image::scene, sentinel, SetWarningHandler(), _Image::signature, SignatureImage(), _ImageInfo::size, _Image::storage_class, StringRegistryType, StringToList(), StringToUnsignedLong(), SVGCompliance, TailPath, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::timer, _Image::total_colors, TraceEvent, _Image::transparent_color, TransparentAlpha, _Image::type, UndefinedColorspace, UndefinedCompressionQuality, UndefinedType, _Image::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, X11Compliance, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

+

References AcquireImageInfo(), AcquireQuantumMemory(), _PixelInfo::alpha_trait, _Image::alpha_trait, AlphaPixelChannel, _Image::background_color, BlackPixelChannel, BlendPixelTrait, _ChromaticityInfo::blue_primary, BluePixelChannel, _Image::border_color, _Image::chromaticity, CloneString(), cmsUInt32Number, CMYKColorspace, _Image::colormap, _Image::colors, _Image::colorspace, _PixelInfo::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compose, CompositePixelChannel, _Image::compression, ConcatenateColorComponent(), ConcatenateMagickString(), CopyMagickString(), CyanPixelChannel, _Image::debug, _Image::delay, _ChannelStatistics::depth, _Image::depth, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _ImageInfo::filename, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetColorTuple(), GetElapsedTime(), GetImageArtifact(), GetImageDepth(), GetImageFeatures(), GetImageListLength(), GetImageProfile(), GetImageProperty(), GetImageRegistry(), GetImageStatistics(), GetImageTotalInkDensity(), GetImageType(), GetMagickDescription(), GetMagickInfo(), GetMagickModule, GetMagickVersion(), GetNextImageArtifact(), GetNextImageInList(), GetNextImageProfile(), GetNextImageProperty(), GetNextImageRegistry(), GetNumberColors(), GetPathComponent(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), GetPreviousImageInList(), GetStringInfoDatum(), GetStringInfoLength(), GetTimerInfo(), GetUserTime(), GetVirtualPixels(), GRAYColorspace, GrayPixelChannel, _ChromaticityInfo::green_primary, GreenPixelChannel, _RectangleInfo::height, IfMagickTrue, _Image::intensity, _Image::interlace, IsHistogramImage(), IsImageGray(), IsStringTrue(), _Image::iterations, LocaleCompare(), LogMagickEvent(), MagentaPixelChannel, _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickEndianOptions, MagickFalse, MagickIntentOptions, MagickInterlaceOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, _Image::matte_color, MaxPixelChannels, MagickPathExtent, _ErrorInfo::mean_error_per_pixel, _Image::montage, _Image::next, _ErrorInfo::normalized_maximum_error, _ErrorInfo::normalized_mean_error, _Image::orientation, _Image::page, _Image::previous, PrintChannelFeatures(), PrintChannelStatistics(), PrintStringInfo(), PseudoClass, _Image::quality, QuantumRange, QueryColorname(), ReadImage(), _ChromaticityInfo::red_primary, RedPixelChannel, registry, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageArtifactIterator(), ResetImageProfileIterator(), ResetImagePropertyIterator(), ResetImageRegistryIterator(), _Image::resolution, RGBColorspace, _Image::rows, _Image::scene, sentinel, SetWarningHandler(), _Image::signature, SignatureImage(), _ImageInfo::size, _Image::storage_class, StringRegistryType, StringToList(), StringToUnsignedLong(), SVGCompliance, TailPath, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::timer, _Image::total_colors, TraceEvent, _Image::transparent_color, TransparentAlpha, _Image::type, UndefinedColorspace, UndefinedCompressionQuality, UndefinedType, _Image::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, X11Compliance, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

Referenced by PingImage(), ReadImage(), and WriteImage().

diff --git a/www/api/MagickCore/identify_8h.html b/www/api/MagickCore/identify_8h.html index 63e2c9eb4..eaa041695 100644 --- a/www/api/MagickCore/identify_8h.html +++ b/www/api/MagickCore/identify_8h.html @@ -110,7 +110,7 @@ Functions

Definition at line 236 of file identify.c.

-

References AcquireImageInfo(), AcquireQuantumMemory(), _PixelInfo::alpha_trait, _Image::alpha_trait, AlphaPixelChannel, _Image::background_color, BlackPixelChannel, BlendPixelTrait, _ChromaticityInfo::blue_primary, BluePixelChannel, _Image::border_color, _Image::chromaticity, CloneString(), cmsUInt32Number, CMYKColorspace, _Image::colormap, _Image::colors, _Image::colorspace, _PixelInfo::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compose, CompositePixelChannel, _Image::compression, ConcatenateColorComponent(), ConcatenateMagickString(), CopyMagickString(), CyanPixelChannel, _Image::debug, _Image::delay, _ChannelStatistics::depth, _Image::depth, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _ImageInfo::filename, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetColorTuple(), GetElapsedTime(), GetImageArtifact(), GetImageDepth(), GetImageFeatures(), GetImageListLength(), GetImageProfile(), GetImageProperty(), GetImageRegistry(), GetImageStatistics(), GetImageTotalInkDensity(), GetImageType(), GetMagickDescription(), GetMagickInfo(), GetMagickModule, GetMagickVersion(), GetNextImageArtifact(), GetNextImageInList(), GetNextImageProfile(), GetNextImageProperty(), GetNextImageRegistry(), GetNumberColors(), GetPathComponent(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), GetPreviousImageInList(), GetStringInfoDatum(), GetStringInfoLength(), GetTimerInfo(), GetUserTime(), GetVirtualPixels(), GRAYColorspace, GrayPixelChannel, _ChromaticityInfo::green_primary, GreenPixelChannel, _RectangleInfo::height, IfMagickTrue, _Image::intensity, _Image::interlace, IsHistogramImage(), IsImageGray(), IsStringTrue(), _Image::iterations, LocaleCompare(), LogMagickEvent(), MagentaPixelChannel, _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickEndianOptions, MagickFalse, MagickIntentOptions, MagickInterlaceOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, _Image::matte_color, MaxPixelChannels, MaxTextExtent, _ErrorInfo::mean_error_per_pixel, _Image::montage, _Image::next, _ErrorInfo::normalized_maximum_error, _ErrorInfo::normalized_mean_error, _Image::orientation, _Image::page, _Image::previous, PrintChannelFeatures(), PrintChannelStatistics(), PrintStringInfo(), PseudoClass, _Image::quality, QuantumRange, QueryColorname(), ReadImage(), _ChromaticityInfo::red_primary, RedPixelChannel, registry, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageArtifactIterator(), ResetImageProfileIterator(), ResetImagePropertyIterator(), ResetImageRegistryIterator(), _Image::resolution, RGBColorspace, _Image::rows, _Image::scene, sentinel, SetWarningHandler(), _Image::signature, SignatureImage(), _ImageInfo::size, _Image::storage_class, StringRegistryType, StringToList(), StringToUnsignedLong(), SVGCompliance, TailPath, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::timer, _Image::total_colors, TraceEvent, _Image::transparent_color, TransparentAlpha, _Image::type, UndefinedColorspace, UndefinedCompressionQuality, UndefinedType, _Image::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, X11Compliance, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

+

References AcquireImageInfo(), AcquireQuantumMemory(), _PixelInfo::alpha_trait, _Image::alpha_trait, AlphaPixelChannel, _Image::background_color, BlackPixelChannel, BlendPixelTrait, _ChromaticityInfo::blue_primary, BluePixelChannel, _Image::border_color, _Image::chromaticity, CloneString(), cmsUInt32Number, CMYKColorspace, _Image::colormap, _Image::colors, _Image::colorspace, _PixelInfo::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compose, CompositePixelChannel, _Image::compression, ConcatenateColorComponent(), ConcatenateMagickString(), CopyMagickString(), CyanPixelChannel, _Image::debug, _Image::delay, _ChannelStatistics::depth, _Image::depth, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _ImageInfo::filename, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetColorTuple(), GetElapsedTime(), GetImageArtifact(), GetImageDepth(), GetImageFeatures(), GetImageListLength(), GetImageProfile(), GetImageProperty(), GetImageRegistry(), GetImageStatistics(), GetImageTotalInkDensity(), GetImageType(), GetMagickDescription(), GetMagickInfo(), GetMagickModule, GetMagickVersion(), GetNextImageArtifact(), GetNextImageInList(), GetNextImageProfile(), GetNextImageProperty(), GetNextImageRegistry(), GetNumberColors(), GetPathComponent(), GetPixelAlpha(), GetPixelChannels(), GetPixelInfo(), GetPixelInfoPixel(), GetPreviousImageInList(), GetStringInfoDatum(), GetStringInfoLength(), GetTimerInfo(), GetUserTime(), GetVirtualPixels(), GRAYColorspace, GrayPixelChannel, _ChromaticityInfo::green_primary, GreenPixelChannel, _RectangleInfo::height, IfMagickTrue, _Image::intensity, _Image::interlace, IsHistogramImage(), IsImageGray(), IsStringTrue(), _Image::iterations, LocaleCompare(), LogMagickEvent(), MagentaPixelChannel, _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickEndianOptions, MagickFalse, MagickIntentOptions, MagickInterlaceOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, _Image::matte_color, MaxPixelChannels, MagickPathExtent, _ErrorInfo::mean_error_per_pixel, _Image::montage, _Image::next, _ErrorInfo::normalized_maximum_error, _ErrorInfo::normalized_mean_error, _Image::orientation, _Image::page, _Image::previous, PrintChannelFeatures(), PrintChannelStatistics(), PrintStringInfo(), PseudoClass, _Image::quality, QuantumRange, QueryColorname(), ReadImage(), _ChromaticityInfo::red_primary, RedPixelChannel, registry, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageArtifactIterator(), ResetImageProfileIterator(), ResetImagePropertyIterator(), ResetImageRegistryIterator(), _Image::resolution, RGBColorspace, _Image::rows, _Image::scene, sentinel, SetWarningHandler(), _Image::signature, SignatureImage(), _ImageInfo::size, _Image::storage_class, StringRegistryType, StringToList(), StringToUnsignedLong(), SVGCompliance, TailPath, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::timer, _Image::total_colors, TraceEvent, _Image::transparent_color, TransparentAlpha, _Image::type, UndefinedColorspace, UndefinedCompressionQuality, UndefinedType, _Image::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, X11Compliance, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, and YellowPixelChannel.

Referenced by PingImage(), ReadImage(), and WriteImage().

diff --git a/www/api/MagickCore/image_8c.html b/www/api/MagickCore/image_8c.html index db57e6da4..fd8f570d2 100644 --- a/www/api/MagickCore/image_8c.html +++ b/www/api/MagickCore/image_8c.html @@ -327,7 +327,7 @@ Variables

Definition at line 151 of file image.c.

-

References AcquireMagickMemory(), AcquirePixelCache(), AcquirePixelChannelMap(), AllCompliance, AllocateSemaphoreInfo(), _Image::background_color, _ImageInfo::background_color, BackgroundColor, _Image::blob, _ChromaticityInfo::blue_primary, _Image::border_color, _ImageInfo::border_color, BorderColor, _Image::cache, _ImageInfo::cache, _Image::channel_map, _Image::channel_mask, _Image::chromaticity, _Image::client_data, _ImageInfo::client_data, CloneBlobInfo(), ClonePixelCacheMethods(), _Image::colorspace, _Image::columns, _Image::compose, _Image::compression, _ImageInfo::compression, CopyMagickString(), _Image::debug, DefaultChannels, _Image::delay, _ImageInfo::density, _Image::depth, _ImageInfo::depth, DestroyString(), DirectClass, _Image::dispose, _Image::dither, _ImageInfo::dither, _Image::endian, _ImageInfo::endian, _ImageInfo::extract, _Image::extract_info, _ImageInfo::file, _Image::filename, _ImageInfo::filename, _Image::gamma, GetImageOption(), GetMagickModule, GetPageGeometry(), GetTimerInfo(), GreaterValue, _ChromaticityInfo::green_primary, _RectangleInfo::height, _ImageView::image, _Image::image_info, _Image::interlace, _ImageInfo::interlace, IsEventLogging(), LessValue, LogMagickEvent(), _Image::magick, _ImageInfo::magick, _Image::magick_filename, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickFalse, MagickSignature, MagickTrue, _Image::matte_color, _ImageInfo::matte_color, MatteColor, MaxTextExtent, NoInterlace, _Image::offset, OverCompositeOp, _Image::page, _ImageInfo::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::ping, _ImageInfo::ping, _Image::progress_monitor, _ImageInfo::progress_monitor, _Image::quality, _ImageInfo::quality, QueryColorCompliance(), _ChromaticityInfo::red_primary, _Image::reference_count, _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, ResourceLimitFatalError, _GeometryInfo::rho, _Image::rows, _Image::semaphore, SetBlobExempt(), _GeometryInfo::sigma, SigmaValue, _Image::signature, _ImageInfo::size, sRGBColorspace, _Image::storage_class, Swap, SyncImageSettings(), ThrowFatalException, _Image::ticks_per_second, _Image::timer, _Image::timestamp, TraceEvent, _Image::transparent_color, _ImageInfo::transparent_color, TransparentColor, UndefinedTicksPerSecond, _Image::units, _ImageInfo::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, XValue, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, YValue, and _PrimaryInfo::z.

+

References AcquireMagickMemory(), AcquirePixelCache(), AcquirePixelChannelMap(), AllCompliance, AllocateSemaphoreInfo(), _Image::background_color, _ImageInfo::background_color, BackgroundColor, _Image::blob, _ChromaticityInfo::blue_primary, _Image::border_color, _ImageInfo::border_color, BorderColor, _Image::cache, _ImageInfo::cache, _Image::channel_map, _Image::channel_mask, _Image::chromaticity, _Image::client_data, _ImageInfo::client_data, CloneBlobInfo(), ClonePixelCacheMethods(), _Image::colorspace, _Image::columns, _Image::compose, _Image::compression, _ImageInfo::compression, CopyMagickString(), _Image::debug, DefaultChannels, _Image::delay, _ImageInfo::density, _Image::depth, _ImageInfo::depth, DestroyString(), DirectClass, _Image::dispose, _Image::dither, _ImageInfo::dither, _Image::endian, _ImageInfo::endian, _ImageInfo::extract, _Image::extract_info, _ImageInfo::file, _Image::filename, _ImageInfo::filename, _Image::gamma, GetImageOption(), GetMagickModule, GetPageGeometry(), GetTimerInfo(), GreaterValue, _ChromaticityInfo::green_primary, _RectangleInfo::height, _ImageView::image, _Image::image_info, _Image::interlace, _ImageInfo::interlace, IsEventLogging(), LessValue, LogMagickEvent(), _Image::magick, _ImageInfo::magick, _Image::magick_filename, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickFalse, MagickSignature, MagickTrue, _Image::matte_color, _ImageInfo::matte_color, MatteColor, MagickPathExtent, NoInterlace, _Image::offset, OverCompositeOp, _Image::page, _ImageInfo::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::ping, _ImageInfo::ping, _Image::progress_monitor, _ImageInfo::progress_monitor, _Image::quality, _ImageInfo::quality, QueryColorCompliance(), _ChromaticityInfo::red_primary, _Image::reference_count, _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, ResourceLimitFatalError, _GeometryInfo::rho, _Image::rows, _Image::semaphore, SetBlobExempt(), _GeometryInfo::sigma, SigmaValue, _Image::signature, _ImageInfo::size, sRGBColorspace, _Image::storage_class, Swap, SyncImageSettings(), ThrowFatalException, _Image::ticks_per_second, _Image::timer, _Image::timestamp, TraceEvent, _Image::transparent_color, _ImageInfo::transparent_color, TransparentColor, UndefinedTicksPerSecond, _Image::units, _ImageInfo::units, _ChromaticityInfo::white_point, _RectangleInfo::width, _PrimaryInfo::x, _PointInfo::x, _RectangleInfo::x, XValue, _PrimaryInfo::y, _PointInfo::y, _RectangleInfo::y, YValue, and _PrimaryInfo::z.

Referenced by AcquireNextImage(), AcquireStreamInfo(), ConstituteImage(), DrawPatternPath(), MontageImageList(), NewMagickImage(), OpenDistributeCache(), ReadImage(), and SetImageInfo().

@@ -387,7 +387,7 @@ Variables

Definition at line 383 of file image.c.

-

References AcquireImage(), _Image::blob, CopyMagickString(), _Image::debug, DestroyBlob(), _Image::endian, _Image::filename, _ImageInfo::filename, GetMagickModule, GetNextImageInList(), _ImageView::image, LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, _Image::next, _Image::previous, ReferenceBlob(), _Image::scene, _Image::signature, and TraceEvent.

+

References AcquireImage(), _Image::blob, CopyMagickString(), _Image::debug, DestroyBlob(), _Image::endian, _Image::filename, _ImageInfo::filename, GetMagickModule, GetNextImageInList(), _ImageView::image, LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, _Image::next, _Image::previous, ReferenceBlob(), _Image::scene, _Image::signature, and TraceEvent.

Referenced by MontageImageList().

@@ -517,7 +517,7 @@ Variables

Definition at line 699 of file image.c.

-

References AcquireImageInfo(), AcquireString(), BlobToImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::filename, _ImageInfo::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, LogMagickEvent(), _Image::magick_filename, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, NegateImage(), OptionError, PseudoClass, SetImageMask(), SetImageStorageClass(), _Image::signature, _Image::storage_class, SyncImage(), ThrowFileException, and TraceEvent.

+

References AcquireImageInfo(), AcquireString(), BlobToImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DestroyImage(), DestroyImageInfo(), DestroyString(), DirectClass, _Image::filename, _ImageInfo::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, LogMagickEvent(), _Image::magick_filename, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, NegateImage(), OptionError, PseudoClass, SetImageMask(), SetImageStorageClass(), _Image::signature, _Image::storage_class, SyncImage(), ThrowFileException, and TraceEvent.

Referenced by ClipImage().

@@ -567,7 +567,7 @@ Variables

Definition at line 793 of file image.c.

-

References AcquireMagickMemory(), AcquireQuantumMemory(), AllocateSemaphoreInfo(), _Image::alpha_trait, _Image::ascii85, Ascii85Initialize(), _Image::blob, _Image::cache, _Image::channel_map, _Image::channel_mask, _Image::client_data, CloneBlobInfo(), CloneImageArtifacts(), CloneImageProfiles(), CloneImageProperties(), ClonePixelCache(), ClonePixelChannelMap(), CloneString(), _Image::colormap, _Image::colors, _Image::colorspace, _Image::columns, CopyMagickMemory(), CopyMagickString(), _Image::debug, _Image::directory, _Image::dither, _Image::filename, GetMagickModule, GetTimerInfo(), _RectangleInfo::height, IsEventLogging(), _Image::list, LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MaxTextExtent, _Image::metacontent_extent, _Image::montage, NewImageList(), _Image::next, _Image::number_channels, _Image::number_meta_channels, _Image::page, _Image::ping, _Image::previous, _Image::progress_monitor, _Image::read_mask, _Image::reference_count, ReferenceBlob(), ReferencePixelCache(), ResetMagickMemory(), ResourceLimitError, _Image::rows, _Image::semaphore, _ExceptionInfo::signature, _Image::signature, _Image::storage_class, ThrowImageException, _Image::tile_offset, _Image::timer, TraceEvent, _Image::type, _RectangleInfo::width, _Image::write_mask, _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquireMagickMemory(), AcquireQuantumMemory(), AllocateSemaphoreInfo(), _Image::alpha_trait, _Image::ascii85, Ascii85Initialize(), _Image::blob, _Image::cache, _Image::channel_map, _Image::channel_mask, _Image::client_data, CloneBlobInfo(), CloneImageArtifacts(), CloneImageProfiles(), CloneImageProperties(), ClonePixelCache(), ClonePixelChannelMap(), CloneString(), _Image::colormap, _Image::colors, _Image::colorspace, _Image::columns, CopyMagickMemory(), CopyMagickString(), _Image::debug, _Image::directory, _Image::dither, _Image::filename, GetMagickModule, GetTimerInfo(), _RectangleInfo::height, IsEventLogging(), _Image::list, LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MagickPathExtent, _Image::metacontent_extent, _Image::montage, NewImageList(), _Image::next, _Image::number_channels, _Image::number_meta_channels, _Image::page, _Image::ping, _Image::previous, _Image::progress_monitor, _Image::read_mask, _Image::reference_count, ReferenceBlob(), ReferencePixelCache(), ResetMagickMemory(), ResourceLimitError, _Image::rows, _Image::semaphore, _ExceptionInfo::signature, _Image::signature, _Image::storage_class, ThrowImageException, _Image::tile_offset, _Image::timer, TraceEvent, _Image::type, _RectangleInfo::width, _Image::write_mask, _RectangleInfo::x, and _RectangleInfo::y.

Referenced by AdaptiveBlurImage(), AdaptiveSharpenImage(), AdaptiveThresholdImage(), AddNoiseImage(), AppendImages(), AutoOrientImage(), BlueShiftImage(), BorderImage(), ChannelFxImage(), CharcoalImage(), ChopImage(), CloneDrawInfo(), CloneImageList(), CloneImages(), CoalesceImages(), ColorizeImage(), ColorMatrixImage(), CombineImages(), CompareImages(), CompareImagesLayers(), CompositeImage(), CompositeLayers(), ConsolidateCMYKImages(), CropImage(), CropImageToTiles(), DeskewImage(), DespeckleImage(), DisposeImages(), DistortImage(), DistortResizeImage(), DrawClipPath(), DrawStrokePolygon(), EnhanceImage(), EvaluateImages(), ExcerptImage(), ExtentImage(), FlipImage(), FloodfillPaintImage(), FlopImage(), ForwardFourierTransformImage(), FrameImage(), FxImage(), GetImageMask(), HuffmanEncodeImage(), ImplodeImage(), InjectImageBlob(), IntegralRotateImage(), InterpolativeResizeImage(), InverseFourierTransformImage(), MagnifyImage(), MergeImageLayers(), ModifyImage(), MontageImageList(), MorphImages(), MorphologyApply(), MotionBlurImage(), OilPaintImage(), OptimizeImageTransparency(), OptimizeLayerFrames(), PolaroidImage(), PolynomialImage(), PreviewImage(), RadialBlurImage(), ResizeImage(), RollImage(), RotateImage(), SampleImage(), ScaleImage(), SelectiveBlurImage(), SeparateImage(), SepiaToneImage(), ShadeImage(), ShadowImage(), ShearImage(), SimilarityImage(), SketchImage(), SmushImages(), SparseColorImage(), SpliceImage(), SpreadImage(), StatisticImage(), SteganoImage(), StereoAnaglyphImage(), SwirlImage(), TextureImage(), TintImage(), TransformImage(), TransposeImage(), TransverseImage(), TrimImage(), UniqueImageColors(), VignetteImage(), and WaveImage().

@@ -589,7 +589,7 @@ Variables

Definition at line 924 of file image.c.

-

References AcquireImageInfo(), _ImageInfo::adjoin, _ImageInfo::antialias, _ImageInfo::background_color, _ImageInfo::blob, _ImageInfo::border_color, _ImageInfo::cache, _ImageInfo::channel, _ImageInfo::client_data, CloneImageOptions(), CloneString(), CloneStringInfo(), _ImageInfo::colorspace, _ImageInfo::compression, CopyMagickString(), _ImageInfo::debug, _ImageInfo::density, _ImageInfo::depth, _ImageInfo::dither, _ImageInfo::endian, _ImageInfo::extract, _ImageInfo::file, _ImageInfo::filename, _ImageInfo::font, _ImageInfo::fuzz, _ImageInfo::group, _ImageInfo::interlace, IsEventLogging(), _ImageInfo::length, _ImageInfo::magick, _ImageInfo::matte_color, MaxTextExtent, _ImageInfo::monochrome, _ImageInfo::number_scenes, _ImageInfo::orientation, _ImageInfo::page, _ImageInfo::ping, _ImageInfo::pointsize, _ImageInfo::preview_type, _ImageInfo::profile, _ImageInfo::progress_monitor, _ImageInfo::quality, ReferencePixelCache(), _ImageInfo::sampling_factor, _ImageInfo::scene, _ImageInfo::scenes, _ImageInfo::server_name, SetImageInfoBlob(), SetImageInfoFile(), _ImageInfo::signature, _ImageInfo::size, _ImageInfo::stream, _ImageInfo::temporary, _ImageInfo::texture, _ImageInfo::transparent_color, _ImageInfo::type, _ImageInfo::unique, _ImageInfo::units, _ImageInfo::verbose, _ImageInfo::view, and _ImageInfo::zero.

+

References AcquireImageInfo(), _ImageInfo::adjoin, _ImageInfo::antialias, _ImageInfo::background_color, _ImageInfo::blob, _ImageInfo::border_color, _ImageInfo::cache, _ImageInfo::channel, _ImageInfo::client_data, CloneImageOptions(), CloneString(), CloneStringInfo(), _ImageInfo::colorspace, _ImageInfo::compression, CopyMagickString(), _ImageInfo::debug, _ImageInfo::density, _ImageInfo::depth, _ImageInfo::dither, _ImageInfo::endian, _ImageInfo::extract, _ImageInfo::file, _ImageInfo::filename, _ImageInfo::font, _ImageInfo::fuzz, _ImageInfo::group, _ImageInfo::interlace, IsEventLogging(), _ImageInfo::length, _ImageInfo::magick, _ImageInfo::matte_color, MagickPathExtent, _ImageInfo::monochrome, _ImageInfo::number_scenes, _ImageInfo::orientation, _ImageInfo::page, _ImageInfo::ping, _ImageInfo::pointsize, _ImageInfo::preview_type, _ImageInfo::profile, _ImageInfo::progress_monitor, _ImageInfo::quality, ReferencePixelCache(), _ImageInfo::sampling_factor, _ImageInfo::scene, _ImageInfo::scenes, _ImageInfo::server_name, SetImageInfoBlob(), SetImageInfoFile(), _ImageInfo::signature, _ImageInfo::size, _ImageInfo::stream, _ImageInfo::temporary, _ImageInfo::texture, _ImageInfo::transparent_color, _ImageInfo::type, _ImageInfo::unique, _ImageInfo::units, _ImageInfo::verbose, _ImageInfo::view, and _ImageInfo::zero.

Referenced by BlobToImage(), GetImageRegistry(), ImagesToBlob(), ImageToBlob(), InjectImageBlob(), InvokeDelegate(), MontageImageList(), PingBlob(), PingImage(), PingImages(), ReadImage(), ReadImages(), ReadInlineImage(), ReadStream(), SetImageRegistry(), StreamImage(), WriteImage(), WriteImages(), WriteStream(), and WriteStreamImage().

@@ -825,7 +825,7 @@ Variables

Definition at line 1437 of file image.c.

-

References ConcatenateMagickString(), CopyMagickString(), FormatLocaleString(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickProperty(), LocaleNCompare(), MagickFalse, MagickTrue, and MaxTextExtent.

+

References ConcatenateMagickString(), CopyMagickString(), FormatLocaleString(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickProperty(), LocaleNCompare(), MagickFalse, MagickTrue, and MagickPathExtent.

Referenced by OpenBlob(), PingImages(), ReadImages(), and SetImageInfo().

@@ -897,7 +897,7 @@ Variables

Definition at line 1751 of file image.c.

-

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetNextImageInList(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _Image::signature, _Image::taint, and TraceEvent.

+

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetNextImageInList(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _Image::signature, _Image::taint, and TraceEvent.

Referenced by WriteImage().

@@ -1293,7 +1293,7 @@ Variables

Definition at line 2338 of file image.c.

-

References AcquireExceptionInfo(), AcquireImage(), _ImageInfo::adjoin, _ImageInfo::affirm, CanonicalPath, CloneString(), CloseBlob(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImage(), _ImageInfo::endian, ExplicitFormatType, ExtensionPath, _ImageInfo::extract, _Image::filename, _ImageInfo::filename, _MagickInfo::format_type, GetMagicInfo(), GetMagickAdjoin(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagicName(), GetPathComponent(), _ImageView::image, ImageToFile(), InterpretImageFilename(), IsBlobExempt(), IsBlobSeekable(), IsGeometry(), IsMagickConflict(), IsSceneGeometry(), LocaleCompare(), LocaleUpper(), LogMagickEvent(), _ImageInfo::magick, MagickFalse, MagickPath, MagickSignature, MagickTrue, MaxTextExtent, _ImageInfo::number_scenes, OpenBlob(), ReadBinaryBlobMode, ReadBlob(), ResetMagickMemory(), _ImageInfo::scene, _ImageInfo::scenes, SeekBlob(), SetImageInfoFile(), _ImageInfo::signature, StringToUnsignedLong(), SubimagePath, Swap, _ImageInfo::temporary, TraceEvent, UndefinedEndian, and UndefinedFormatType.

+

References AcquireExceptionInfo(), AcquireImage(), _ImageInfo::adjoin, _ImageInfo::affirm, CanonicalPath, CloneString(), CloseBlob(), CopyMagickString(), _ImageInfo::debug, DestroyExceptionInfo(), DestroyImage(), _ImageInfo::endian, ExplicitFormatType, ExtensionPath, _ImageInfo::extract, _Image::filename, _ImageInfo::filename, _MagickInfo::format_type, GetMagicInfo(), GetMagickAdjoin(), GetMagickEndianSupport(), GetMagickInfo(), GetMagickModule, GetMagicName(), GetPathComponent(), _ImageView::image, ImageToFile(), InterpretImageFilename(), IsBlobExempt(), IsBlobSeekable(), IsGeometry(), IsMagickConflict(), IsSceneGeometry(), LocaleCompare(), LocaleUpper(), LogMagickEvent(), _ImageInfo::magick, MagickFalse, MagickPath, MagickSignature, MagickTrue, MagickPathExtent, _ImageInfo::number_scenes, OpenBlob(), ReadBinaryBlobMode, ReadBlob(), ResetMagickMemory(), _ImageInfo::scene, _ImageInfo::scenes, SeekBlob(), SetImageInfoFile(), _ImageInfo::signature, StringToUnsignedLong(), SubimagePath, Swap, _ImageInfo::temporary, TraceEvent, UndefinedEndian, and UndefinedFormatType.

Referenced by BlobToImage(), GlobExpression(), ImagesToBlob(), ImageToBlob(), InvokeDelegate(), PingImages(), ReadImage(), ReadImages(), SetImageProperty(), WriteImage(), WriteImages(), and WriteStreamImage().

@@ -1723,7 +1723,7 @@ Variables

Definition at line 3426 of file image.c.

-

References AllCompliance, _Image::background_color, _Image::black_point_compensation, _ChromaticityInfo::blue_primary, _Image::border_color, _Image::chromaticity, _Image::compose, _Image::compression, _Image::debug, _Image::depth, DestroyString(), _Image::endian, _ImageView::exception, _Image::filename, _Image::filter, FormatLocaleString(), _Image::fuzz, GetImageOption(), GetMagickModule, GetNextImageOption(), GetPageGeometry(), _Image::gravity, _ChromaticityInfo::green_primary, _Image::image_info, _Image::intensity, _Image::interlace, _Image::interpolate, _Image::iterations, LogMagickEvent(), MagickBooleanOptions, MagickComposeOptions, MagickCompressOptions, MagickEndianOptions, MagickFalse, MagickFilterOptions, MagickGravityOptions, MagickIntentOptions, MagickInterlaceOptions, MagickInterpolateOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, MagickVirtualPixelOptions, _Image::matte_color, MaxTextExtent, _Image::orientation, ParseAbsoluteGeometry(), ParseChannelOption(), ParseCommandOption(), ParseGeometry(), PixelsPerCentimeterResolution, PixelsPerInchResolution, _Image::quality, _ImageInfo::quality, QuantumRange, QueryColorCompliance(), _ChromaticityInfo::red_primary, _Image::rendering_intent, ResetImageOptionIterator(), _Image::resolution, _GeometryInfo::rho, _Image::scene, SetImageArtifact(), SetImageVirtualPixelMethod(), SetPixelChannelMask(), _GeometryInfo::sigma, SigmaValue, _Image::signature, _ImageInfo::signature, StringToDoubleInterval(), StringToUnsignedLong(), _Image::taint, _Image::tile_offset, TraceEvent, _Image::transparent_color, _Image::type, UndefinedCompressionQuality, UndefinedResolution, _Image::units, _ImageInfo::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, and _PointInfo::y.

+

References AllCompliance, _Image::background_color, _Image::black_point_compensation, _ChromaticityInfo::blue_primary, _Image::border_color, _Image::chromaticity, _Image::compose, _Image::compression, _Image::debug, _Image::depth, DestroyString(), _Image::endian, _ImageView::exception, _Image::filename, _Image::filter, FormatLocaleString(), _Image::fuzz, GetImageOption(), GetMagickModule, GetNextImageOption(), GetPageGeometry(), _Image::gravity, _ChromaticityInfo::green_primary, _Image::image_info, _Image::intensity, _Image::interlace, _Image::interpolate, _Image::iterations, LogMagickEvent(), MagickBooleanOptions, MagickComposeOptions, MagickCompressOptions, MagickEndianOptions, MagickFalse, MagickFilterOptions, MagickGravityOptions, MagickIntentOptions, MagickInterlaceOptions, MagickInterpolateOptions, MagickOrientationOptions, MagickPixelIntensityOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickTypeOptions, MagickVirtualPixelOptions, _Image::matte_color, MagickPathExtent, _Image::orientation, ParseAbsoluteGeometry(), ParseChannelOption(), ParseCommandOption(), ParseGeometry(), PixelsPerCentimeterResolution, PixelsPerInchResolution, _Image::quality, _ImageInfo::quality, QuantumRange, QueryColorCompliance(), _ChromaticityInfo::red_primary, _Image::rendering_intent, ResetImageOptionIterator(), _Image::resolution, _GeometryInfo::rho, _Image::scene, SetImageArtifact(), SetImageVirtualPixelMethod(), SetPixelChannelMask(), _GeometryInfo::sigma, SigmaValue, _Image::signature, _ImageInfo::signature, StringToDoubleInterval(), StringToUnsignedLong(), _Image::taint, _Image::tile_offset, TraceEvent, _Image::transparent_color, _Image::type, UndefinedCompressionQuality, UndefinedResolution, _Image::units, _ImageInfo::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, and _PointInfo::y.

Referenced by AcquireImage(), and SyncImagesSettings().

diff --git a/www/api/MagickCore/image_8h.html b/www/api/MagickCore/image_8h.html index 898cf019e..79f9e80d2 100644 --- a/www/api/MagickCore/image_8h.html +++ b/www/api/MagickCore/image_8h.html @@ -1079,7 +1079,7 @@ Variables

Definition at line 1437 of file image.c.

-

References ConcatenateMagickString(), CopyMagickString(), FormatLocaleString(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickProperty(), LocaleNCompare(), MagickFalse, MagickTrue, and MaxTextExtent.

+

References ConcatenateMagickString(), CopyMagickString(), FormatLocaleString(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickProperty(), LocaleNCompare(), MagickFalse, MagickTrue, and MagickPathExtent.

Referenced by OpenBlob(), PingImages(), ReadImages(), and SetImageInfo().

diff --git a/www/api/MagickCore/locale_8c.html b/www/api/MagickCore/locale_8c.html index 347fa4fa9..1eb81922c 100644 --- a/www/api/MagickCore/locale_8c.html +++ b/www/api/MagickCore/locale_8c.html @@ -587,7 +587,7 @@ Variables

Definition at line 653 of file locale.c.

-

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleString(), GetLocaleInfo_(), MaxTextExtent, and _LocaleInfo::message.

+

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleString(), GetLocaleInfo_(), MagickPathExtent, and _LocaleInfo::message.

Referenced by GetLocaleExceptionMessage().

@@ -619,7 +619,7 @@ Variables

Definition at line 701 of file locale.c.

-

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureFileToStringInfo(), CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), LocaleEvent, LogMagickEvent(), MaxTextExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), and TraceEvent.

+

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureFileToStringInfo(), CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), LocaleEvent, LogMagickEvent(), MagickPathExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), and TraceEvent.

Referenced by LoadLocaleLists().

@@ -787,7 +787,7 @@ Variables

Definition at line 1070 of file locale.c.

-

References AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), ChopLocaleComponents(), CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DestroyLocaleNode(), DirectorySeparator, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, locale_list, LocaleCompare(), LocaleFatalErrorHandler(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _LocaleInfo::message, NewSplayTree(), _LocaleInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, SetFatalErrorHandler(), _LocaleInfo::signature, _LocaleInfo::tag, ThrowFatalException, and ThrowMagickException().

+

References AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), ChopLocaleComponents(), CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DestroyLocaleNode(), DirectorySeparator, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, locale_list, LocaleCompare(), LocaleFatalErrorHandler(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _LocaleInfo::message, NewSplayTree(), _LocaleInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, SetFatalErrorHandler(), _LocaleInfo::signature, _LocaleInfo::tag, ThrowFatalException, and ThrowMagickException().

Referenced by LoadLocaleLists().

diff --git a/www/api/MagickCore/locale___8h.html b/www/api/MagickCore/locale___8h.html index e50bccf11..3754349a4 100644 --- a/www/api/MagickCore/locale___8h.html +++ b/www/api/MagickCore/locale___8h.html @@ -325,7 +325,7 @@ Functions

Definition at line 653 of file locale.c.

-

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleString(), GetLocaleInfo_(), MaxTextExtent, and _LocaleInfo::message.

+

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleString(), GetLocaleInfo_(), MagickPathExtent, and _LocaleInfo::message.

Referenced by GetLocaleExceptionMessage().

@@ -357,7 +357,7 @@ Functions

Definition at line 701 of file locale.c.

-

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureFileToStringInfo(), CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), LocaleEvent, LogMagickEvent(), MaxTextExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), and TraceEvent.

+

References AcquireStringInfo(), AppendValueToLinkedList(), ConfigureFileToStringInfo(), CopyMagickString(), DestroyLinkedList(), FormatLocaleString(), GetConfigurePaths(), GetMagickModule, GetNextValueInLinkedList(), LocaleEvent, LogMagickEvent(), MagickPathExtent, NewLinkedList(), RelinquishMagickMemory(), ResetLinkedListIterator(), SetStringInfoDatum(), SetStringInfoLength(), SetStringInfoPath(), and TraceEvent.

Referenced by LoadLocaleLists().

diff --git a/www/api/MagickCore/log_8c.html b/www/api/MagickCore/log_8c.html index e569b6b60..55f725a4f 100644 --- a/www/api/MagickCore/log_8c.html +++ b/www/api/MagickCore/log_8c.html @@ -192,7 +192,7 @@ Variables   static const LogMapInfo LogMap []   -static char log_name [MaxTextExtent] = "Magick" +static char log_name [MagickPathExtent] = "Magick"   static LinkedListInfolog_list = (LinkedListInfo *) NULL   @@ -571,7 +571,7 @@ Variables

Definition at line 610 of file log.c.

-

References FormatLocaleFile(), FormatMagickSize(), _LogInfo::generations, GetLogInfoList(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, MegabytesToBytes, _LogInfo::path, and RelinquishMagickMemory().

+

References FormatLocaleFile(), FormatMagickSize(), _LogInfo::generations, GetLogInfoList(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, MegabytesToBytes, _LogInfo::path, and RelinquishMagickMemory().

@@ -621,7 +621,7 @@ Variables

Definition at line 1281 of file log.c.

-

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConstantString(), CopyMagickString(), DestroyString(), DirectorySeparator, _LogInfo::event_mask, _LogInfo::exempt, _LogInfo::filename, FileToString(), _LogInfo::format, _LogInfo::generations, GetMagickModule, GetMagickToken(), GetPathComponent(), GetTimerInfo(), _LogInfo::handler_mask, HeadPath, _LogInfo::limit, LocaleCompare(), LocaleNCompare(), log_list, MagickFalse, MagickLogEventOptions, MagickSignature, MagickTrue, MaxTextExtent, NewLinkedList(), ParseCommandOption(), ParseLogHandlers(), _LogInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _LogInfo::signature, StringToUnsignedLong(), ThrowFatalException, ThrowFileException, ThrowMagickException(), and _LogInfo::timer.

+

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConstantString(), CopyMagickString(), DestroyString(), DirectorySeparator, _LogInfo::event_mask, _LogInfo::exempt, _LogInfo::filename, FileToString(), _LogInfo::format, _LogInfo::generations, GetMagickModule, GetMagickToken(), GetPathComponent(), GetTimerInfo(), _LogInfo::handler_mask, HeadPath, _LogInfo::limit, LocaleCompare(), LocaleNCompare(), log_list, MagickFalse, MagickLogEventOptions, MagickSignature, MagickTrue, MagickPathExtent, NewLinkedList(), ParseCommandOption(), ParseLogHandlers(), _LogInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _LogInfo::signature, StringToUnsignedLong(), ThrowFatalException, ThrowFileException, ThrowMagickException(), and _LogInfo::timer.

Referenced by LoadLogLists().

@@ -889,7 +889,7 @@ Variables

Definition at line 1112 of file log.c.

-

References AcquireExceptionInfo(), _LogInfo::append, CommandOptionToMnemonic(), ConsoleHandler, ContinueTimer(), DebugHandler, DestroyExceptionInfo(), _LogInfo::event_mask, EventHandler, _LogInfo::file, FileHandler, fopen_utf8(), FormatLocaleFile(), _LogInfo::generation, GetLogInfo(), _LogInfo::handler_mask, IsEventLogging(), IsPathAccessible(), _LogInfo::limit, LockSemaphoreInfo(), log_semaphore, MagickFalse, MagickLogEventOptions, MagickTrue, MaxTextExtent, RelinquishMagickMemory(), StderrHandler, StdoutHandler, _LogInfo::timer, TranslateEvent(), TranslateFilename(), and UnlockSemaphoreInfo().

+

References AcquireExceptionInfo(), _LogInfo::append, CommandOptionToMnemonic(), ConsoleHandler, ContinueTimer(), DebugHandler, DestroyExceptionInfo(), _LogInfo::event_mask, EventHandler, _LogInfo::file, FileHandler, fopen_utf8(), FormatLocaleFile(), _LogInfo::generation, GetLogInfo(), _LogInfo::handler_mask, IsEventLogging(), IsPathAccessible(), _LogInfo::limit, LockSemaphoreInfo(), log_semaphore, MagickFalse, MagickLogEventOptions, MagickTrue, MagickPathExtent, RelinquishMagickMemory(), StderrHandler, StdoutHandler, _LogInfo::timer, TranslateEvent(), TranslateFilename(), and UnlockSemaphoreInfo().

Referenced by LogMagickEvent().

@@ -983,7 +983,7 @@ Variables

Definition at line 1768 of file log.c.

-

References CopyMagickString(), log_name, and MaxTextExtent.

+

References CopyMagickString(), log_name, and MagickPathExtent.

@@ -1045,7 +1045,7 @@ Variables

Definition at line 788 of file log.c.

-

References AcquireExceptionInfo(), AcquireString(), CopyMagickString(), DestroyExceptionInfo(), DirectorySeparator, _LogInfo::format, FormatLocaleString(), FormatMagickTime(), _LogInfo::generation, _LogInfo::generations, GetClientName(), GetElapsedTime(), GetLogInfo(), GetLogName(), GetMagickThreadSignature(), GetUserTime(), LocaleCompare(), MagickLibVersionText, MaxTextExtent, ResizeQuantumMemory(), and _LogInfo::timer.

+

References AcquireExceptionInfo(), AcquireString(), CopyMagickString(), DestroyExceptionInfo(), DirectorySeparator, _LogInfo::format, FormatLocaleString(), FormatMagickTime(), _LogInfo::generation, _LogInfo::generations, GetClientName(), GetElapsedTime(), GetLogInfo(), GetLogName(), GetMagickThreadSignature(), GetUserTime(), LocaleCompare(), MagickLibVersionText, MagickPathExtent, ResizeQuantumMemory(), and _LogInfo::timer.

Referenced by LogMagickEventList().

@@ -1075,7 +1075,7 @@ Variables

Definition at line 1011 of file log.c.

-

References AcquireString(), CopyMagickString(), _LogInfo::filename, FormatLocaleString(), _LogInfo::generation, _LogInfo::generations, GetClientName(), GetLogName(), MagickLibVersionText, MaxTextExtent, and ResizeQuantumMemory().

+

References AcquireString(), CopyMagickString(), _LogInfo::filename, FormatLocaleString(), _LogInfo::generation, _LogInfo::generations, GetClientName(), GetLogName(), MagickLibVersionText, MagickPathExtent, and ResizeQuantumMemory().

Referenced by LogMagickEventList().

@@ -1138,7 +1138,7 @@ Variables - +
char log_name[MaxTextExtent] = "Magick"char log_name[MagickPathExtent] = "Magick"
diff --git a/www/api/MagickCore/log_8h.html b/www/api/MagickCore/log_8h.html index 14f4ea42d..35808391d 100644 --- a/www/api/MagickCore/log_8h.html +++ b/www/api/MagickCore/log_8h.html @@ -574,7 +574,7 @@ Functions

Definition at line 1768 of file log.c.

-

References CopyMagickString(), log_name, and MaxTextExtent.

+

References CopyMagickString(), log_name, and MagickPathExtent.

diff --git a/www/api/MagickCore/magic_8c.html b/www/api/MagickCore/magic_8c.html index 9603a6043..c2484ef05 100644 --- a/www/api/MagickCore/magic_8c.html +++ b/www/api/MagickCore/magic_8c.html @@ -464,7 +464,7 @@ Variables

Definition at line 665 of file magic.c.

-

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _MagicInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), _MagicInfo::length, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _MagicInfo::magic, magic_list, MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, _MagicInfo::name, NewLinkedList(), _MagicInfo::offset, _MagicInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _MagicInfo::signature, _MagicInfo::stealth, StringToLong(), _MagicInfo::target, ThrowFatalException, ThrowFileException, and ThrowMagickException().

+

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), DirectorySeparator, _MagicInfo::exempt, FileToString(), GetMagickModule, GetMagickToken(), GetPathComponent(), HeadPath, IsStringTrue(), _MagicInfo::length, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _MagicInfo::magic, magic_list, MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, _MagicInfo::name, NewLinkedList(), _MagicInfo::offset, _MagicInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _MagicInfo::signature, _MagicInfo::stealth, StringToLong(), _MagicInfo::target, ThrowFatalException, ThrowFileException, and ThrowMagickException().

Referenced by LoadMagicLists().

@@ -496,7 +496,7 @@ Variables

Definition at line 926 of file magic.c.

-

References AcquireMagickMemory(), AppendValueToLinkedList(), CopyMagickString(), DestroyConfigureOptions(), _MagicInfo::exempt, GetConfigureOptions(), GetMagickModule, GetNextValueInLinkedList(), GetStringInfoDatum(), GetStringInfoPath(), _MagicInfo::length, _MagicMapInfo::length, LoadMagicList(), _MagicInfo::magic, _MagicMapInfo::magic, magic_list, MagickFalse, MagickSignature, MagickTrue, MagicMap, MaxTextExtent, _MagicInfo::name, _MagicMapInfo::name, NewLinkedList(), _MagicInfo::offset, _MagicMapInfo::offset, _MagicInfo::path, ResetMagickMemory(), ResourceLimitError, _MagicInfo::signature, _MagicInfo::target, ThrowFileException, and ThrowMagickException().

+

References AcquireMagickMemory(), AppendValueToLinkedList(), CopyMagickString(), DestroyConfigureOptions(), _MagicInfo::exempt, GetConfigureOptions(), GetMagickModule, GetNextValueInLinkedList(), GetStringInfoDatum(), GetStringInfoPath(), _MagicInfo::length, _MagicMapInfo::length, LoadMagicList(), _MagicInfo::magic, _MagicMapInfo::magic, magic_list, MagickFalse, MagickSignature, MagickTrue, MagicMap, MagickPathExtent, _MagicInfo::name, _MagicMapInfo::name, NewLinkedList(), _MagicInfo::offset, _MagicMapInfo::offset, _MagicInfo::path, ResetMagickMemory(), ResourceLimitError, _MagicInfo::signature, _MagicInfo::target, ThrowFileException, and ThrowMagickException().

Referenced by InitializeMagicList().

diff --git a/www/api/MagickCore/magick_8c.html b/www/api/MagickCore/magick_8c.html index dad995fbe..fa6766146 100644 --- a/www/api/MagickCore/magick_8c.html +++ b/www/api/MagickCore/magick_8c.html @@ -409,7 +409,7 @@ Variables

Definition at line 222 of file magick.c.

-

References AcquireExceptionInfo(), CopyMagickString(), DestroyExceptionInfo(), GetMagickInfo(), GetMagickModule, GetNextValueInSplayTree(), LockSemaphoreInfo(), LogMagickEvent(), _MagickInfo::magick, magick_list, magick_semaphore, MagickFalse, MagickTrue, MaxTextExtent, _MagickInfo::name, ResetSplayTreeIterator(), TraceEvent, and UnlockSemaphoreInfo().

+

References AcquireExceptionInfo(), CopyMagickString(), DestroyExceptionInfo(), GetMagickInfo(), GetMagickModule, GetNextValueInSplayTree(), LockSemaphoreInfo(), LogMagickEvent(), _MagickInfo::magick, magick_list, magick_semaphore, MagickFalse, MagickTrue, MagickPathExtent, _MagickInfo::name, ResetSplayTreeIterator(), TraceEvent, and UnlockSemaphoreInfo().

@@ -791,7 +791,7 @@ Variables

Definition at line 924 of file magick.c.

-

References _ImageInfo::adjoin, _MagickInfo::blob_support, ClearMagickException(), ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetMagickInfoList(), MagickFalse, MagickTrue, MaxTextExtent, _MagickInfo::name, RelinquishMagickMemory(), and StringToList().

+

References _ImageInfo::adjoin, _MagickInfo::blob_support, ClearMagickException(), ConcatenateMagickString(), CopyMagickString(), DestroyString(), FormatLocaleFile(), GetMagickInfoList(), MagickFalse, MagickTrue, MagickPathExtent, _MagickInfo::name, RelinquishMagickMemory(), and StringToList().

@@ -905,7 +905,7 @@ Variables

Definition at line 1218 of file magick.c.

-

References AnnotateComponentGenesis(), CacheComponentGenesis(), CoderComponentGenesis(), ColorComponentGenesis(), ConfigureComponentGenesis(), ConstituteComponentGenesis(), CopyMagickString(), DelegateComponentGenesis(), DestroyString(), DirectorySeparator, GetEnvironmentValue(), GetExecutionPath(), GetPathComponent(), HeadPath, instantiate_magickcore, IsEventLogging(), IsPathAccessible(), LocaleComponentGenesis(), LockMagickMutex(), LogComponentGenesis(), MagicComponentGenesis(), MagickComponentGenesis(), MagickFalse, MagickTrue, MaxTextExtent, MimeComponentGenesis(), ModuleComponentGenesis(), PolicyComponentGenesis(), RandomComponentGenesis(), RegisterMagickSignalHandler(), RegistryComponentGenesis(), ResourceComponentGenesis(), SemaphoreComponentGenesis(), SetClientName(), SetClientPath(), SetLogEventMask(), signal_handlers, TailPath, TypeComponentGenesis(), UnlockMagickMutex(), and XComponentGenesis().

+

References AnnotateComponentGenesis(), CacheComponentGenesis(), CoderComponentGenesis(), ColorComponentGenesis(), ConfigureComponentGenesis(), ConstituteComponentGenesis(), CopyMagickString(), DelegateComponentGenesis(), DestroyString(), DirectorySeparator, GetEnvironmentValue(), GetExecutionPath(), GetPathComponent(), HeadPath, instantiate_magickcore, IsEventLogging(), IsPathAccessible(), LocaleComponentGenesis(), LockMagickMutex(), LogComponentGenesis(), MagicComponentGenesis(), MagickComponentGenesis(), MagickFalse, MagickTrue, MagickPathExtent, MimeComponentGenesis(), ModuleComponentGenesis(), PolicyComponentGenesis(), RandomComponentGenesis(), RegisterMagickSignalHandler(), RegistryComponentGenesis(), ResourceComponentGenesis(), SemaphoreComponentGenesis(), SetClientName(), SetClientPath(), SetLogEventMask(), signal_handlers, TailPath, TypeComponentGenesis(), UnlockMagickMutex(), and XComponentGenesis().

diff --git a/www/api/MagickCore/mime_8c.html b/www/api/MagickCore/mime_8c.html index c08589d9f..d78848266 100644 --- a/www/api/MagickCore/mime_8c.html +++ b/www/api/MagickCore/mime_8c.html @@ -456,7 +456,7 @@ Variables

Definition at line 738 of file mime.c.

-

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _MimeInfo::data_type, _MimeInfo::description, DestroyString(), DestroyXMLTree(), DirectorySeparator, _MimeInfo::endian, _MimeInfo::extent, FileToString(), GetMagickModule, GetNextXMLTreeTag(), GetPathComponent(), GetXMLTreeAttribute(), GetXMLTreeChild(), HeadPath, IsStringTrue(), _MimeInfo::length, LogMagickEvent(), _MimeInfo::magic, MagickDataTypeOptions, MagickEndianOptions, MagickFalse, MagickSignature, MagickTrue, _MimeInfo::mask, MaxTextExtent, mime_list, NewLinkedList(), NewXMLTree(), _MimeInfo::offset, ParseCommandOption(), _MimeInfo::path, _MimeInfo::pattern, _MimeInfo::priority, ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _MimeInfo::signature, _MimeInfo::stealth, StringData, SubstituteString(), ThrowFatalException, ThrowFileException, ThrowMagickException(), _MimeInfo::type, and _MimeInfo::value.

+

References AcquireMagickMemory(), AcquireString(), AppendValueToLinkedList(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _MimeInfo::data_type, _MimeInfo::description, DestroyString(), DestroyXMLTree(), DirectorySeparator, _MimeInfo::endian, _MimeInfo::extent, FileToString(), GetMagickModule, GetNextXMLTreeTag(), GetPathComponent(), GetXMLTreeAttribute(), GetXMLTreeChild(), HeadPath, IsStringTrue(), _MimeInfo::length, LogMagickEvent(), _MimeInfo::magic, MagickDataTypeOptions, MagickEndianOptions, MagickFalse, MagickSignature, MagickTrue, _MimeInfo::mask, MagickPathExtent, mime_list, NewLinkedList(), NewXMLTree(), _MimeInfo::offset, ParseCommandOption(), _MimeInfo::path, _MimeInfo::pattern, _MimeInfo::priority, ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _MimeInfo::signature, _MimeInfo::stealth, StringData, SubstituteString(), ThrowFatalException, ThrowFileException, ThrowMagickException(), _MimeInfo::type, and _MimeInfo::value.

Referenced by LoadMimeLists().

@@ -510,7 +510,7 @@ Variables

Definition at line 1015 of file mime.c.

-

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), FormatLocaleString(), GetMimeInfo(), GetMimeType(), LocaleLower(), and MaxTextExtent.

+

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), FormatLocaleString(), GetMimeInfo(), GetMimeType(), LocaleLower(), and MagickPathExtent.

diff --git a/www/api/MagickCore/mime_8h.html b/www/api/MagickCore/mime_8h.html index 7cdf2cd5b..dca68096d 100644 --- a/www/api/MagickCore/mime_8h.html +++ b/www/api/MagickCore/mime_8h.html @@ -327,7 +327,7 @@ Functions

Definition at line 1015 of file mime.c.

-

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), FormatLocaleString(), GetMimeInfo(), GetMimeType(), LocaleLower(), and MaxTextExtent.

+

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), FormatLocaleString(), GetMimeInfo(), GetMimeType(), LocaleLower(), and MagickPathExtent.

diff --git a/www/api/MagickCore/montage_8c.html b/www/api/MagickCore/montage_8c.html index 328fb6afa..da8d6266e 100644 --- a/www/api/MagickCore/montage_8c.html +++ b/www/api/MagickCore/montage_8c.html @@ -183,7 +183,7 @@ Functions

Definition at line 103 of file montage.c.

-

References AcquireMagickMemory(), AcquireString(), _MontageInfo::background_color, _MontageInfo::border_color, _MontageInfo::border_width, CopyMagickString(), _MontageInfo::debug, _MontageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _MontageInfo::frame, _MontageInfo::geometry, GetMontageInfo(), _MontageInfo::gravity, IsEventLogging(), _MontageInfo::matte_color, MaxTextExtent, _MontageInfo::pointsize, ResourceLimitFatalError, _MontageInfo::shadow, _MontageInfo::stroke, _MontageInfo::texture, ThrowFatalException, _MontageInfo::tile, and _MontageInfo::title.

+

References AcquireMagickMemory(), AcquireString(), _MontageInfo::background_color, _MontageInfo::border_color, _MontageInfo::border_width, CopyMagickString(), _MontageInfo::debug, _MontageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _MontageInfo::frame, _MontageInfo::geometry, GetMontageInfo(), _MontageInfo::gravity, IsEventLogging(), _MontageInfo::matte_color, MagickPathExtent, _MontageInfo::pointsize, ResourceLimitFatalError, _MontageInfo::shadow, _MontageInfo::stroke, _MontageInfo::texture, ThrowFatalException, _MontageInfo::tile, and _MontageInfo::title.

Referenced by PreviewImage().

@@ -301,7 +301,7 @@ Functions

Definition at line 215 of file montage.c.

-

References AcquireString(), _PixelInfo::alpha, _MontageInfo::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, CenterGravity, CopyMagickString(), _MontageInfo::debug, _ImageInfo::debug, DefaultTileGeometry, _MontageInfo::filename, _ImageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _ImageInfo::font, _MontageInfo::geometry, GetMagickModule, _MontageInfo::gravity, IsEventLogging(), LogMagickEvent(), MagickFalse, MagickSignature, _MontageInfo::matte_color, _ImageInfo::matte_color, MaxTextExtent, OpaqueAlpha, _MontageInfo::pointsize, _ImageInfo::pointsize, ResetMagickMemory(), _MontageInfo::signature, _ImageInfo::signature, _MontageInfo::stroke, TraceEvent, and TransparentAlpha.

+

References AcquireString(), _PixelInfo::alpha, _MontageInfo::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, CenterGravity, CopyMagickString(), _MontageInfo::debug, _ImageInfo::debug, DefaultTileGeometry, _MontageInfo::filename, _ImageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _ImageInfo::font, _MontageInfo::geometry, GetMagickModule, _MontageInfo::gravity, IsEventLogging(), LogMagickEvent(), MagickFalse, MagickSignature, _MontageInfo::matte_color, _ImageInfo::matte_color, MagickPathExtent, OpaqueAlpha, _MontageInfo::pointsize, _ImageInfo::pointsize, ResetMagickMemory(), _MontageInfo::signature, _ImageInfo::signature, _MontageInfo::stroke, TraceEvent, and TransparentAlpha.

Referenced by CloneMontageInfo().

@@ -421,7 +421,7 @@ Functions

Definition at line 338 of file montage.c.

-

References AcquireImage(), AcquireNextImage(), AcquireQuantumMemory(), AcquireString(), AllCompliance, AlphaChannel, AnnotateImage(), _TypeMetric::ascent, _MontageInfo::background_color, _Image::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, _MontageInfo::border_width, BorderImage(), CenterGravity, _Image::client_data, CloneDrawInfo(), CloneImage(), CloneImageInfo(), CloneString(), _Image::columns, _Image::compose, CompositeImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DefaultChannels, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::directory, DstOutCompositeOp, _MontageInfo::filename, _Image::filename, _ImageInfo::filename, _MontageInfo::fill, _DrawInfo::fill, _MontageInfo::font, _DrawInfo::font, FormatLocaleString(), _MontageInfo::frame, FrameImage(), _MontageInfo::geometry, _DrawInfo::geometry, GetFirstImageInList(), GetGeometry(), GetImageListLength(), GetImageProperty(), GetMagickModule, GetMontageGeometry(), GetNextImageInList(), GetTypeMetrics(), _MontageInfo::gravity, _Image::gravity, _DrawInfo::gravity, _FrameInfo::height, _RectangleInfo::height, HeightValue, ImageListToArray(), _FrameInfo::inner_bevel, InterpretImageProperties(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickMax(), MagickMin(), MagickSignature, MagickTrue, MaxTextExtent, _Image::montage, MontageImageTag, MultilineCensus(), NegateImage(), NewImageList(), _FrameInfo::outer_bevel, OverCompositeOp, _Image::page, ParseAbsoluteGeometry(), ParseGravityGeometry(), ParseMetaGeometry(), ParseRegionGeometry(), _MontageInfo::pointsize, _DrawInfo::pointsize, _Image::progress_monitor, PsiValue, QueryColorCompliance(), ReadImage(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RhoValue, _Image::rows, _Image::scene, SceneCompare(), SetGeometry(), SetImageBackgroundColor(), SetImageProgress(), SetImageProgressMonitor(), SetPixelChannelMask(), _MontageInfo::shadow, ShadowImage(), SigmaValue, _MontageInfo::signature, _ExceptionInfo::signature, _Image::signature, _MontageInfo::stroke, _DrawInfo::stroke, _DrawInfo::text, _MontageInfo::texture, TextureImage(), ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TileImageTag, _MontageInfo::title, TraceEvent, UndefinedGravity, _FrameInfo::width, _RectangleInfo::width, _FrameInfo::x, _RectangleInfo::x, XiValue, _FrameInfo::y, and _RectangleInfo::y.

+

References AcquireImage(), AcquireNextImage(), AcquireQuantumMemory(), AcquireString(), AllCompliance, AlphaChannel, AnnotateImage(), _TypeMetric::ascent, _MontageInfo::background_color, _Image::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, _MontageInfo::border_width, BorderImage(), CenterGravity, _Image::client_data, CloneDrawInfo(), CloneImage(), CloneImageInfo(), CloneString(), _Image::columns, _Image::compose, CompositeImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DefaultChannels, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::directory, DstOutCompositeOp, _MontageInfo::filename, _Image::filename, _ImageInfo::filename, _MontageInfo::fill, _DrawInfo::fill, _MontageInfo::font, _DrawInfo::font, FormatLocaleString(), _MontageInfo::frame, FrameImage(), _MontageInfo::geometry, _DrawInfo::geometry, GetFirstImageInList(), GetGeometry(), GetImageListLength(), GetImageProperty(), GetMagickModule, GetMontageGeometry(), GetNextImageInList(), GetTypeMetrics(), _MontageInfo::gravity, _Image::gravity, _DrawInfo::gravity, _FrameInfo::height, _RectangleInfo::height, HeightValue, ImageListToArray(), _FrameInfo::inner_bevel, InterpretImageProperties(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickMax(), MagickMin(), MagickSignature, MagickTrue, MagickPathExtent, _Image::montage, MontageImageTag, MultilineCensus(), NegateImage(), NewImageList(), _FrameInfo::outer_bevel, OverCompositeOp, _Image::page, ParseAbsoluteGeometry(), ParseGravityGeometry(), ParseMetaGeometry(), ParseRegionGeometry(), _MontageInfo::pointsize, _DrawInfo::pointsize, _Image::progress_monitor, PsiValue, QueryColorCompliance(), ReadImage(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RhoValue, _Image::rows, _Image::scene, SceneCompare(), SetGeometry(), SetImageBackgroundColor(), SetImageProgress(), SetImageProgressMonitor(), SetPixelChannelMask(), _MontageInfo::shadow, ShadowImage(), SigmaValue, _MontageInfo::signature, _ExceptionInfo::signature, _Image::signature, _MontageInfo::stroke, _DrawInfo::stroke, _DrawInfo::text, _MontageInfo::texture, TextureImage(), ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TileImageTag, _MontageInfo::title, TraceEvent, UndefinedGravity, _FrameInfo::width, _RectangleInfo::width, _FrameInfo::x, _RectangleInfo::x, XiValue, _FrameInfo::y, and _RectangleInfo::y.

Referenced by MontageImages().

diff --git a/www/api/MagickCore/montage_8h.html b/www/api/MagickCore/montage_8h.html index 5ebff8764..bb6e417ce 100644 --- a/www/api/MagickCore/montage_8h.html +++ b/www/api/MagickCore/montage_8h.html @@ -214,7 +214,7 @@ Functions

Definition at line 215 of file montage.c.

-

References AcquireString(), _PixelInfo::alpha, _MontageInfo::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, CenterGravity, CopyMagickString(), _MontageInfo::debug, _ImageInfo::debug, DefaultTileGeometry, _MontageInfo::filename, _ImageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _ImageInfo::font, _MontageInfo::geometry, GetMagickModule, _MontageInfo::gravity, IsEventLogging(), LogMagickEvent(), MagickFalse, MagickSignature, _MontageInfo::matte_color, _ImageInfo::matte_color, MaxTextExtent, OpaqueAlpha, _MontageInfo::pointsize, _ImageInfo::pointsize, ResetMagickMemory(), _MontageInfo::signature, _ImageInfo::signature, _MontageInfo::stroke, TraceEvent, and TransparentAlpha.

+

References AcquireString(), _PixelInfo::alpha, _MontageInfo::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, CenterGravity, CopyMagickString(), _MontageInfo::debug, _ImageInfo::debug, DefaultTileGeometry, _MontageInfo::filename, _ImageInfo::filename, _MontageInfo::fill, _MontageInfo::font, _ImageInfo::font, _MontageInfo::geometry, GetMagickModule, _MontageInfo::gravity, IsEventLogging(), LogMagickEvent(), MagickFalse, MagickSignature, _MontageInfo::matte_color, _ImageInfo::matte_color, MagickPathExtent, OpaqueAlpha, _MontageInfo::pointsize, _ImageInfo::pointsize, ResetMagickMemory(), _MontageInfo::signature, _ImageInfo::signature, _MontageInfo::stroke, TraceEvent, and TransparentAlpha.

Referenced by CloneMontageInfo().

@@ -258,7 +258,7 @@ Functions

Definition at line 338 of file montage.c.

-

References AcquireImage(), AcquireNextImage(), AcquireQuantumMemory(), AcquireString(), AllCompliance, AlphaChannel, AnnotateImage(), _TypeMetric::ascent, _MontageInfo::background_color, _Image::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, _MontageInfo::border_width, BorderImage(), CenterGravity, _Image::client_data, CloneDrawInfo(), CloneImage(), CloneImageInfo(), CloneString(), _Image::columns, _Image::compose, CompositeImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DefaultChannels, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::directory, DstOutCompositeOp, _MontageInfo::filename, _Image::filename, _ImageInfo::filename, _MontageInfo::fill, _DrawInfo::fill, _MontageInfo::font, _DrawInfo::font, FormatLocaleString(), _MontageInfo::frame, FrameImage(), _MontageInfo::geometry, _DrawInfo::geometry, GetFirstImageInList(), GetGeometry(), GetImageListLength(), GetImageProperty(), GetMagickModule, GetMontageGeometry(), GetNextImageInList(), GetTypeMetrics(), _MontageInfo::gravity, _Image::gravity, _DrawInfo::gravity, _FrameInfo::height, _RectangleInfo::height, HeightValue, ImageListToArray(), _FrameInfo::inner_bevel, InterpretImageProperties(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickMax(), MagickMin(), MagickSignature, MagickTrue, MaxTextExtent, _Image::montage, MontageImageTag, MultilineCensus(), NegateImage(), NewImageList(), _FrameInfo::outer_bevel, OverCompositeOp, _Image::page, ParseAbsoluteGeometry(), ParseGravityGeometry(), ParseMetaGeometry(), ParseRegionGeometry(), _MontageInfo::pointsize, _DrawInfo::pointsize, _Image::progress_monitor, PsiValue, QueryColorCompliance(), ReadImage(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RhoValue, _Image::rows, _Image::scene, SceneCompare(), SetGeometry(), SetImageBackgroundColor(), SetImageProgress(), SetImageProgressMonitor(), SetPixelChannelMask(), _MontageInfo::shadow, ShadowImage(), SigmaValue, _MontageInfo::signature, _ExceptionInfo::signature, _Image::signature, _MontageInfo::stroke, _DrawInfo::stroke, _DrawInfo::text, _MontageInfo::texture, TextureImage(), ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TileImageTag, _MontageInfo::title, TraceEvent, UndefinedGravity, _FrameInfo::width, _RectangleInfo::width, _FrameInfo::x, _RectangleInfo::x, XiValue, _FrameInfo::y, and _RectangleInfo::y.

+

References AcquireImage(), AcquireNextImage(), AcquireQuantumMemory(), AcquireString(), AllCompliance, AlphaChannel, AnnotateImage(), _TypeMetric::ascent, _MontageInfo::background_color, _Image::background_color, _ImageInfo::background_color, _MontageInfo::border_color, _ImageInfo::border_color, _MontageInfo::border_width, BorderImage(), CenterGravity, _Image::client_data, CloneDrawInfo(), CloneImage(), CloneImageInfo(), CloneString(), _Image::columns, _Image::compose, CompositeImage(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, DefaultChannels, _TypeMetric::descent, DestroyDrawInfo(), DestroyImage(), DestroyImageInfo(), DestroyImageList(), DestroyString(), _Image::directory, DstOutCompositeOp, _MontageInfo::filename, _Image::filename, _ImageInfo::filename, _MontageInfo::fill, _DrawInfo::fill, _MontageInfo::font, _DrawInfo::font, FormatLocaleString(), _MontageInfo::frame, FrameImage(), _MontageInfo::geometry, _DrawInfo::geometry, GetFirstImageInList(), GetGeometry(), GetImageListLength(), GetImageProperty(), GetMagickModule, GetMontageGeometry(), GetNextImageInList(), GetTypeMetrics(), _MontageInfo::gravity, _Image::gravity, _DrawInfo::gravity, _FrameInfo::height, _RectangleInfo::height, HeightValue, ImageListToArray(), _FrameInfo::inner_bevel, InterpretImageProperties(), LocaleCompare(), LogMagickEvent(), _Image::magick, MagickFalse, MagickMax(), MagickMin(), MagickSignature, MagickTrue, MagickPathExtent, _Image::montage, MontageImageTag, MultilineCensus(), NegateImage(), NewImageList(), _FrameInfo::outer_bevel, OverCompositeOp, _Image::page, ParseAbsoluteGeometry(), ParseGravityGeometry(), ParseMetaGeometry(), ParseRegionGeometry(), _MontageInfo::pointsize, _DrawInfo::pointsize, _Image::progress_monitor, PsiValue, QueryColorCompliance(), ReadImage(), RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RhoValue, _Image::rows, _Image::scene, SceneCompare(), SetGeometry(), SetImageBackgroundColor(), SetImageProgress(), SetImageProgressMonitor(), SetPixelChannelMask(), _MontageInfo::shadow, ShadowImage(), SigmaValue, _MontageInfo::signature, _ExceptionInfo::signature, _Image::signature, _MontageInfo::stroke, _DrawInfo::stroke, _DrawInfo::text, _MontageInfo::texture, TextureImage(), ThrowImageException, ThumbnailImage(), _MontageInfo::tile, TileImageTag, _MontageInfo::title, TraceEvent, UndefinedGravity, _FrameInfo::width, _RectangleInfo::width, _FrameInfo::x, _RectangleInfo::x, XiValue, _FrameInfo::y, and _RectangleInfo::y.

Referenced by MontageImages().

diff --git a/www/api/MagickCore/option_8c.html b/www/api/MagickCore/option_8c.html index 6678ad313..ff1b4de3f 100644 --- a/www/api/MagickCore/option_8c.html +++ b/www/api/MagickCore/option_8c.html @@ -353,7 +353,7 @@ Variables

Definition at line 1835 of file option.c.

-

References CopyMagickString(), MaxTextExtent, SetImageOption(), and _GhostInfo::void().

+

References CopyMagickString(), MagickPathExtent, SetImageOption(), and _GhostInfo::void().

@@ -443,7 +443,7 @@ Variables

Definition at line 2004 of file option.c.

-

References CopyMagickString(), _OptionInfo::flags, GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _OptionInfo::mnemonic, sentinel, UndefinedOptionFlag, and _GhostInfo::void().

+

References CopyMagickString(), _OptionInfo::flags, GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _OptionInfo::mnemonic, sentinel, UndefinedOptionFlag, and _GhostInfo::void().

@@ -681,7 +681,7 @@ Variables

Definition at line 2525 of file option.c.

-

References CopyMagickString(), GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _OptionInfo::mnemonic, sentinel, _OptionInfo::type, and _GhostInfo::void().

+

References CopyMagickString(), GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _OptionInfo::mnemonic, sentinel, _OptionInfo::type, and _GhostInfo::void().

Referenced by AcquireImage(), AcquireQuantizeInfo(), AcquireResizeFilter(), DrawImage(), ExpandFilenames(), FxChannelStatistics(), GetDrawInfo(), GetQuantumInfo(), LoadLogList(), LoadMimeList(), LoadPolicyList(), LoadTypeList(), ModulateImage(), MorphologyImage(), ParseChannelOption(), ParseKernelName(), ParsePixelChannelOption(), QueryColorCompliance(), ReadImage(), SetImageProperty(), SetLogEventMask(), and SyncImageSettings().

@@ -703,7 +703,7 @@ Variables

Definition at line 2634 of file option.c.

-

References GetMagickToken(), InterpretLocaleValue(), MagickPixelChannelOptions, MagickTrue, MaxPixelChannels, MaxTextExtent, ParseCommandOption(), and RedPixelChannel.

+

References GetMagickToken(), InterpretLocaleValue(), MagickPixelChannelOptions, MagickTrue, MaxPixelChannels, MagickPathExtent, ParseCommandOption(), and RedPixelChannel.

Referenced by ChannelFxImage().

diff --git a/www/api/MagickCore/option_8h.html b/www/api/MagickCore/option_8h.html index 4a5f9b4e2..62130b65c 100644 --- a/www/api/MagickCore/option_8h.html +++ b/www/api/MagickCore/option_8h.html @@ -867,7 +867,7 @@ Functions

Definition at line 2525 of file option.c.

-

References CopyMagickString(), GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, _OptionInfo::mnemonic, sentinel, _OptionInfo::type, and _GhostInfo::void().

+

References CopyMagickString(), GetOptionInfo(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, _OptionInfo::mnemonic, sentinel, _OptionInfo::type, and _GhostInfo::void().

Referenced by AcquireImage(), AcquireQuantizeInfo(), AcquireResizeFilter(), DrawImage(), ExpandFilenames(), FxChannelStatistics(), GetDrawInfo(), GetQuantumInfo(), LoadLogList(), LoadMimeList(), LoadPolicyList(), LoadTypeList(), ModulateImage(), MorphologyImage(), ParseChannelOption(), ParseKernelName(), ParsePixelChannelOption(), QueryColorCompliance(), ReadImage(), SetImageProperty(), SetLogEventMask(), and SyncImageSettings().

diff --git a/www/api/MagickCore/pixel_8c.html b/www/api/MagickCore/pixel_8c.html index 139af2146..23d7f1c8a 100644 --- a/www/api/MagickCore/pixel_8c.html +++ b/www/api/MagickCore/pixel_8c.html @@ -1918,7 +1918,7 @@ Functions

Definition at line 4142 of file pixel.c.

-

References AlphaPixelChannel, BlackPixelChannel, BlendPixelTrait, BluePixelChannel, CMYKColorspace, _Image::colorspace, ConcatenateMagickString(), CopyPixelTrait, _Image::filename, GetMagickModule, GetPixelChannelChannel(), GetPixelChannelTraits(), GRAYColorspace, GreenPixelChannel, IndexPixelChannel, LogMagickEvent(), MaxTextExtent, MetaPixelChannel, _Image::number_channels, PixelEvent, PseudoClass, ReadMaskPixelChannel, RedPixelChannel, _Image::storage_class, UpdatePixelTrait, and WriteMaskPixelChannel.

+

References AlphaPixelChannel, BlackPixelChannel, BlendPixelTrait, BluePixelChannel, CMYKColorspace, _Image::colorspace, ConcatenateMagickString(), CopyPixelTrait, _Image::filename, GetMagickModule, GetPixelChannelChannel(), GetPixelChannelTraits(), GRAYColorspace, GreenPixelChannel, IndexPixelChannel, LogMagickEvent(), MagickPathExtent, MetaPixelChannel, _Image::number_channels, PixelEvent, PseudoClass, ReadMaskPixelChannel, RedPixelChannel, _Image::storage_class, UpdatePixelTrait, and WriteMaskPixelChannel.

Referenced by InitializePixelChannelMap(), and SetPixelChannelMask().

diff --git a/www/api/MagickCore/profile_8c.html b/www/api/MagickCore/profile_8c.html index c7e5d6e78..5cc3239c3 100644 --- a/www/api/MagickCore/profile_8c.html +++ b/www/api/MagickCore/profile_8c.html @@ -751,7 +751,7 @@ Functions

Definition at line 258 of file profile.c.

-

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetValueFromSplayTree(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, _Image::profiles, _Image::signature, and TraceEvent.

+

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetValueFromSplayTree(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, _Image::profiles, _Image::signature, and TraceEvent.

Referenced by Get8BIMProperty(), GetEXIFProperty(), GetIPTCProperty(), GetXMPProperty(), IdentifyImage(), ProfileImage(), ReadImage(), and SyncImageProfiles().

@@ -1237,7 +1237,7 @@ Functions

Definition at line 1260 of file profile.c.

-

References AddValueToSplayTree(), CloneStringInfo(), CompareSplayTreeString(), ConstantString(), CopyMagickString(), _Image::debug, DestroyProfile(), _Image::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, GetProfilesFromResourceBlock(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, NewSplayTree(), _Image::profiles, RelinquishMagickMemory(), _Image::signature, and TraceEvent.

+

References AddValueToSplayTree(), CloneStringInfo(), CompareSplayTreeString(), ConstantString(), CopyMagickString(), _Image::debug, DestroyProfile(), _Image::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, GetProfilesFromResourceBlock(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, NewSplayTree(), _Image::profiles, RelinquishMagickMemory(), _Image::signature, and TraceEvent.

Referenced by GetProfilesFromResourceBlock(), ProfileImage(), and SetImageProperty().

diff --git a/www/api/MagickCore/profile_8h.html b/www/api/MagickCore/profile_8h.html index 33e23e9fe..3ba7f57d4 100644 --- a/www/api/MagickCore/profile_8h.html +++ b/www/api/MagickCore/profile_8h.html @@ -252,7 +252,7 @@ Functions

Definition at line 258 of file profile.c.

-

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetValueFromSplayTree(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, _Image::profiles, _Image::signature, and TraceEvent.

+

References CopyMagickString(), _Image::debug, _Image::filename, GetMagickModule, GetValueFromSplayTree(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, _Image::profiles, _Image::signature, and TraceEvent.

Referenced by Get8BIMProperty(), GetEXIFProperty(), GetIPTCProperty(), GetXMPProperty(), IdentifyImage(), ProfileImage(), ReadImage(), and SyncImageProfiles().

@@ -414,7 +414,7 @@ Functions

Definition at line 1260 of file profile.c.

-

References AddValueToSplayTree(), CloneStringInfo(), CompareSplayTreeString(), ConstantString(), CopyMagickString(), _Image::debug, DestroyProfile(), _Image::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, GetProfilesFromResourceBlock(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MaxTextExtent, NewSplayTree(), _Image::profiles, RelinquishMagickMemory(), _Image::signature, and TraceEvent.

+

References AddValueToSplayTree(), CloneStringInfo(), CompareSplayTreeString(), ConstantString(), CopyMagickString(), _Image::debug, DestroyProfile(), _Image::filename, FormatLocaleString(), GetImageProperty(), GetMagickModule, GetProfilesFromResourceBlock(), LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickPathExtent, NewSplayTree(), _Image::profiles, RelinquishMagickMemory(), _Image::signature, and TraceEvent.

Referenced by GetProfilesFromResourceBlock(), ProfileImage(), and SetImageProperty().

diff --git a/www/api/MagickCore/property_8c.html b/www/api/MagickCore/property_8c.html index ccd8a0956..557207f7e 100644 --- a/www/api/MagickCore/property_8c.html +++ b/www/api/MagickCore/property_8c.html @@ -249,7 +249,7 @@ Functions
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); \
@@ -281,7 +281,7 @@ Functions
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); \
@@ -537,10 +537,10 @@ Functions
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) \
@@ -595,10 +595,10 @@ Functions
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) \
@@ -628,7 +628,7 @@ Functions
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); \
@@ -787,7 +787,7 @@ Functions

Definition at line 112 of file property.c.

-

References _Image::background_color, _Image::black_point_compensation, _Image::border_color, _Image::chromaticity, _Image::client_data, CloneSplayTree(), CloneString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, _Image::depth, DestroyImageProperties(), _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _Image::filter, _Image::fuzz, _Image::gamma, _Image::geometry, GetMagickModule, _Image::gravity, IfMagickTrue, _Image::intensity, _Image::interlace, _Image::interpolate, _Image::iterations, LogMagickEvent(), _Image::magick_filename, MagickSignature, MagickTrue, _Image::matte_color, MaxTextExtent, _Image::montage, _Image::offset, _Image::orientation, _Image::page, _Image::progress_monitor, _Image::properties, _Image::quality, _Image::rendering_intent, _Image::resolution, _Image::scene, _Image::signature, _Image::start_loop, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::total_colors, TraceEvent, _Image::transparent_color, _Image::units, _PointInfo::x, and _PointInfo::y.

+

References _Image::background_color, _Image::black_point_compensation, _Image::border_color, _Image::chromaticity, _Image::client_data, CloneSplayTree(), CloneString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, _Image::depth, DestroyImageProperties(), _Image::directory, _Image::dispose, _Image::endian, _Image::error, _Image::extract_info, _Image::filename, _Image::filter, _Image::fuzz, _Image::gamma, _Image::geometry, GetMagickModule, _Image::gravity, IfMagickTrue, _Image::intensity, _Image::interlace, _Image::interpolate, _Image::iterations, LogMagickEvent(), _Image::magick_filename, MagickSignature, MagickTrue, _Image::matte_color, MagickPathExtent, _Image::montage, _Image::offset, _Image::orientation, _Image::page, _Image::progress_monitor, _Image::properties, _Image::quality, _Image::rendering_intent, _Image::resolution, _Image::scene, _Image::signature, _Image::start_loop, _Image::taint, _Image::ticks_per_second, _Image::tile_offset, _Image::total_colors, TraceEvent, _Image::transparent_color, _Image::units, _PointInfo::x, and _PointInfo::y.

Referenced by CloneImage(), CoalesceImages(), and DisposeImages().

@@ -825,7 +825,7 @@ Functions

Definition at line 209 of file property.c.

-

References CopyMagickString(), MaxTextExtent, and SetImageProperty().

+

References CopyMagickString(), MagickPathExtent, and SetImageProperty().

@@ -921,7 +921,7 @@ Functions

Definition at line 333 of file property.c.

-

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleStringList(), MaxTextExtent, and SetImageProperty().

+

References AcquireExceptionInfo(), DestroyExceptionInfo(), FormatLocaleStringList(), MagickPathExtent, and SetImageProperty().

@@ -965,7 +965,7 @@ Functions

Definition at line 553 of file property.c.

-

References AcquireQuantumMemory(), _Image::columns, CopyMagickMemory(), CopyMagickString(), DestroyString(), GetImageProfile(), GetStringInfoDatum(), GetStringInfoLength(), IfMagickFalse, _ProfileInfo::info, _ProfileInfo::length, LocaleCompare(), MagickFalse, MagickMax(), MagickMin(), MagickTrue, MaxTextExtent, _ProfileInfo::name, ReadPropertyByte(), ReadPropertyMSBLong(), ReadPropertyMSBShort(), _Image::rows, SetImageProperty(), StringToLong(), TracePSClippath(), and TraceSVGClippath().

+

References AcquireQuantumMemory(), _Image::columns, CopyMagickMemory(), CopyMagickString(), DestroyString(), GetImageProfile(), GetStringInfoDatum(), GetStringInfoLength(), IfMagickFalse, _ProfileInfo::info, _ProfileInfo::length, LocaleCompare(), MagickFalse, MagickMax(), MagickMin(), MagickTrue, MagickPathExtent, _ProfileInfo::name, ReadPropertyByte(), ReadPropertyMSBLong(), ReadPropertyMSBShort(), _Image::rows, SetImageProperty(), StringToLong(), TracePSClippath(), and TraceSVGClippath().

Referenced by GetImageProperty().

@@ -1011,7 +1011,7 @@ Functions

Definition at line 735 of file property.c.

-

References AcquireQuantumMemory(), AcquireString(), AddValueToSplayTree(), DestroySplayTree(), DestroyString(), EXIF_FMT_BYTE, EXIF_FMT_DOUBLE, EXIF_FMT_SBYTE, EXIF_FMT_SINGLE, EXIF_FMT_SLONG, EXIF_FMT_SRATIONAL, EXIF_FMT_SSHORT, EXIF_FMT_STRING, EXIF_FMT_ULONG, EXIF_FMT_UNDEFINED, EXIF_FMT_URATIONAL, EXIF_FMT_USHORT, EXIFMultipleFractions, EXIFMultipleValues, FormatLocaleString(), GetImageProfile(), GetStringInfoDatum(), GetStringInfoLength(), GetValueFromSplayTree(), LocaleCompare(), LSBEndian, MagickFalse, MagickTrue, MaxDirectoryStack, MaxTextExtent, MSBEndian, NewSplayTree(), _Image::properties, ReadPropertyByte(), ReadPropertyLong(), ReadPropertyShort(), SetImageProperty(), SubstituteString(), TAG_EXIF_OFFSET, TAG_GPS_OFFSET, and TAG_INTEROP_OFFSET.

+

References AcquireQuantumMemory(), AcquireString(), AddValueToSplayTree(), DestroySplayTree(), DestroyString(), EXIF_FMT_BYTE, EXIF_FMT_DOUBLE, EXIF_FMT_SBYTE, EXIF_FMT_SINGLE, EXIF_FMT_SLONG, EXIF_FMT_SRATIONAL, EXIF_FMT_SSHORT, EXIF_FMT_STRING, EXIF_FMT_ULONG, EXIF_FMT_UNDEFINED, EXIF_FMT_URATIONAL, EXIF_FMT_USHORT, EXIFMultipleFractions, EXIFMultipleValues, FormatLocaleString(), GetImageProfile(), GetStringInfoDatum(), GetStringInfoLength(), GetValueFromSplayTree(), LocaleCompare(), LSBEndian, MagickFalse, MagickTrue, MaxDirectoryStack, MagickPathExtent, MSBEndian, NewSplayTree(), _Image::properties, ReadPropertyByte(), ReadPropertyLong(), ReadPropertyShort(), SetImageProperty(), SubstituteString(), TAG_EXIF_OFFSET, TAG_GPS_OFFSET, and TAG_INTEROP_OFFSET.

Referenced by GetImageProperty().

@@ -1139,7 +1139,7 @@ Functions

Definition at line 2502 of file property.c.

-

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, CommandOptionToMnemonic(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, _ImageInfo::debug, _Image::depth, ExtensionPath, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetImageArtifact(), GetImageKurtosis(), GetImageListLength(), GetImageMean(), GetImageOption(), GetImageRange(), GetImageType(), GetMagickCopyright(), GetMagickModule, GetMagickPrecision(), GetMagickPropertyLetter(), GetMagickVersion(), GetPathComponent(), _ImageInfo::group, HeadPath, IfMagickTrue, IsImageOpaque(), LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickColorspaceOptions, MagickFalse, MagickOrientationOptions, MagickTypeOptions, MaxTextExtent, _ImageInfo::number_scenes, _Image::orientation, _Image::resolution, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), TraceEvent, _ImageInfo::unique, WarnNoImageInfoReturn, WarnNoImageReturn, _PointInfo::x, _PointInfo::y, and _ImageInfo::zero.

+

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, CommandOptionToMnemonic(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, _ImageInfo::debug, _Image::depth, ExtensionPath, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetImageArtifact(), GetImageKurtosis(), GetImageListLength(), GetImageMean(), GetImageOption(), GetImageRange(), GetImageType(), GetMagickCopyright(), GetMagickModule, GetMagickPrecision(), GetMagickPropertyLetter(), GetMagickVersion(), GetPathComponent(), _ImageInfo::group, HeadPath, IfMagickTrue, IsImageOpaque(), LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickColorspaceOptions, MagickFalse, MagickOrientationOptions, MagickTypeOptions, MagickPathExtent, _ImageInfo::number_scenes, _Image::orientation, _Image::resolution, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), TraceEvent, _ImageInfo::unique, WarnNoImageInfoReturn, WarnNoImageReturn, _PointInfo::x, _PointInfo::y, and _ImageInfo::zero.

Referenced by InterpretImageFilename(), and InterpretImageProperties().

@@ -1191,7 +1191,7 @@ Functions

Definition at line 2143 of file property.c.

-

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compression, ConcatenateMagickString(), _Image::debug, _ImageInfo::debug, _Image::delay, _Image::depth, _Image::dispose, ExtensionPath, _Image::extent, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), GetImageArtifact(), GetImageBoundingBox(), GetImageIndexInList(), GetImageListLength(), GetImageOption(), GetImageProperty(), GetMagickModule, GetNumberColors(), GetPathComponent(), GRAYColorspace, HeadPath, _RectangleInfo::height, IfMagickTrue, IsImageGray(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickFalse, MagickResolutionOptions, MaxTextExtent, _ImageInfo::number_scenes, _Image::page, _Image::quality, _Image::resolution, _Image::rows, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), SignatureImage(), _Image::storage_class, TailPath, TraceEvent, _ImageInfo::unique, _Image::units, WarnNoImageInfoReturn, WarnNoImageReturn, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, _RectangleInfo::y, and _ImageInfo::zero.

+

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, _Image::columns, CommandOptionToMnemonic(), _Image::compression, ConcatenateMagickString(), _Image::debug, _ImageInfo::debug, _Image::delay, _Image::depth, _Image::dispose, ExtensionPath, _Image::extent, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), GetImageArtifact(), GetImageBoundingBox(), GetImageIndexInList(), GetImageListLength(), GetImageOption(), GetImageProperty(), GetMagickModule, GetNumberColors(), GetPathComponent(), GRAYColorspace, HeadPath, _RectangleInfo::height, IfMagickTrue, IsImageGray(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickClassOptions, MagickColorspaceOptions, MagickCompressOptions, MAGICKCORE_QUANTUM_DEPTH, MagickDisposeOptions, MagickFalse, MagickResolutionOptions, MagickPathExtent, _ImageInfo::number_scenes, _Image::page, _Image::quality, _Image::resolution, _Image::rows, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), SignatureImage(), _Image::storage_class, TailPath, TraceEvent, _ImageInfo::unique, _Image::units, WarnNoImageInfoReturn, WarnNoImageReturn, _RectangleInfo::width, _PointInfo::x, _RectangleInfo::x, _PointInfo::y, _RectangleInfo::y, and _ImageInfo::zero.

Referenced by GetMagickProperty(), and InterpretImageProperties().

@@ -1297,7 +1297,7 @@ Functions

Definition at line 3038 of file property.c.

-

References AcquireFxInfo(), AcquireString(), _PixelInfo::alpha, AlphaPixelChannel, AppendKeyValue2Text, AppendString2Text, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _Image::colorspace, ConstantString(), _Image::debug, _ImageInfo::debug, DeleteImageArtifact(), DeleteImageOption(), DestroyFxInfo(), DestroyString(), ExtendInterpretText, _Image::filename, FileToString(), FormatLocaleString(), FxEvaluateChannelExpression(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickModule, GetMagickPrecision(), GetMagickProperty(), GetMagickPropertyLetter(), GetNextImageArtifact(), GetNextImageOption(), GetNextImageProperty(), GetPixelInfo(), GlobExpression(), _PixelInfo::green, GreenPixelChannel, IfMagickFalse, IfMagickTrue, IntensityPixelChannel, IsGlob(), IsMagickTrue, IsPathAccessible(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MaxTextExtent, OptionError, OptionWarning, QuantumRange, QueryColorname(), _PixelInfo::red, RedPixelChannel, ResetImageArtifactIterator(), ResetImageOptionIterator(), ResetImagePropertyIterator(), _Image::signature, _ImageInfo::signature, SVGCompliance, ThrowMagickException(), and TraceEvent.

+

References AcquireFxInfo(), AcquireString(), _PixelInfo::alpha, AlphaPixelChannel, AppendKeyValue2Text, AppendString2Text, _PixelInfo::black, BlackPixelChannel, _PixelInfo::blue, BluePixelChannel, CMYKColorspace, _Image::colorspace, ConstantString(), _Image::debug, _ImageInfo::debug, DeleteImageArtifact(), DeleteImageOption(), DestroyFxInfo(), DestroyString(), ExtendInterpretText, _Image::filename, FileToString(), FormatLocaleString(), FxEvaluateChannelExpression(), GetImageArtifact(), GetImageOption(), GetImageProperty(), GetMagickModule, GetMagickPrecision(), GetMagickProperty(), GetMagickPropertyLetter(), GetNextImageArtifact(), GetNextImageOption(), GetNextImageProperty(), GetPixelInfo(), GlobExpression(), _PixelInfo::green, GreenPixelChannel, IfMagickFalse, IfMagickTrue, IntensityPixelChannel, IsGlob(), IsMagickTrue, IsPathAccessible(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MagickPathExtent, OptionError, OptionWarning, QuantumRange, QueryColorname(), _PixelInfo::red, RedPixelChannel, ResetImageArtifactIterator(), ResetImageOptionIterator(), ResetImagePropertyIterator(), _Image::signature, _ImageInfo::signature, SVGCompliance, ThrowMagickException(), and TraceEvent.

Referenced by GetDelegateCommand(), InvokeDelegate(), MontageImageList(), PolaroidImage(), and ReadImage().

@@ -1663,7 +1663,7 @@ Functions

Definition at line 3608 of file property.c.

-

References AcquireImageInfo(), AddValueToSplayTree(), AllCompliance, _Image::background_color, _ChromaticityInfo::blue_primary, _Image::chromaticity, _Image::colorspace, CompareSplayTreeString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, DeleteImageProperty(), _Image::depth, DestroyImageInfo(), DestroyString(), _Image::dispose, _Image::filename, _ImageInfo::filename, FileToStringInfo(), _Image::gamma, GetMagickModule, GetPageGeometry(), _Image::gravity, GreaterValue, _ChromaticityInfo::green_primary, IfMagickTrue, _Image::intensity, _Image::interpolate, IssRGBColorspace(), _Image::iterations, LessValue, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MagickDisposeOptions, MagickFalse, MagickGravityOptions, MagickIntentOptions, MagickInterpolateOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MaxTextExtent, NewSplayTree(), OptionError, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::properties, QueryColorCompliance(), _ChromaticityInfo::red_primary, RelinquishMagickMemory(), _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, _GeometryInfo::rho, SetImageInfo(), SetImageProfile(), _GeometryInfo::sigma, SigmaValue, _Image::signature, StringToDouble(), StringToUnsignedLong(), ThrowMagickException(), _Image::ticks_per_second, _Image::tile_offset, TraceEvent, UndefinedIntent, _Image::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, _PointInfo::y, and _PrimaryInfo::z.

+

References AcquireImageInfo(), AddValueToSplayTree(), AllCompliance, _Image::background_color, _ChromaticityInfo::blue_primary, _Image::chromaticity, _Image::colorspace, CompareSplayTreeString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, DeleteImageProperty(), _Image::depth, DestroyImageInfo(), DestroyString(), _Image::dispose, _Image::filename, _ImageInfo::filename, FileToStringInfo(), _Image::gamma, GetMagickModule, GetPageGeometry(), _Image::gravity, GreaterValue, _ChromaticityInfo::green_primary, IfMagickTrue, _Image::intensity, _Image::interpolate, IssRGBColorspace(), _Image::iterations, LessValue, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MagickDisposeOptions, MagickFalse, MagickGravityOptions, MagickIntentOptions, MagickInterpolateOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickPathExtent, NewSplayTree(), OptionError, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::properties, QueryColorCompliance(), _ChromaticityInfo::red_primary, RelinquishMagickMemory(), _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, _GeometryInfo::rho, SetImageInfo(), SetImageProfile(), _GeometryInfo::sigma, SigmaValue, _Image::signature, StringToDouble(), StringToUnsignedLong(), ThrowMagickException(), _Image::ticks_per_second, _Image::tile_offset, TraceEvent, UndefinedIntent, _Image::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, _PointInfo::y, and _PrimaryInfo::z.

Referenced by DefineImageProperty(), FormatImageProperty(), Get8BIMProperty(), GetEXIFProperty(), GetIPTCProperty(), PreviewImage(), ReadImage(), SignatureImage(), and ThumbnailImage().

@@ -1763,7 +1763,7 @@ Functions

Definition at line 1610 of file property.c.

-

References AcquireString(), ConcatenateString(), DestroyString(), FormatLocaleString(), IfMagickFalse, MagickFalse, MagickMin(), MagickTrue, MaxTextExtent, ReadPropertyMSBLong(), ReadPropertyMSBShort(), ResetMagickMemory(), _PointInfo::x, and _PointInfo::y.

+

References AcquireString(), ConcatenateString(), DestroyString(), FormatLocaleString(), IfMagickFalse, MagickFalse, MagickMin(), MagickTrue, MagickPathExtent, ReadPropertyMSBLong(), ReadPropertyMSBShort(), ResetMagickMemory(), _PointInfo::x, and _PointInfo::y.

@@ -1805,7 +1805,7 @@ Functions

Definition at line 1818 of file property.c.

-

References AcquireString(), ConcatenateString(), DestroyString(), FormatLocaleString(), IfMagickFalse, MagickFalse, MagickMin(), MagickTrue, MaxTextExtent, ReadPropertyMSBLong(), ReadPropertyMSBShort(), ResetMagickMemory(), _PointInfo::x, and _PointInfo::y.

+

References AcquireString(), ConcatenateString(), DestroyString(), FormatLocaleString(), IfMagickFalse, MagickFalse, MagickMin(), MagickTrue, MagickPathExtent, ReadPropertyMSBLong(), ReadPropertyMSBShort(), ResetMagickMemory(), _PointInfo::x, and _PointInfo::y.

Referenced by Get8BIMProperty().

diff --git a/www/api/MagickCore/property_8h.html b/www/api/MagickCore/property_8h.html index 0252fd064..9824b8e84 100644 --- a/www/api/MagickCore/property_8h.html +++ b/www/api/MagickCore/property_8h.html @@ -302,7 +302,7 @@ Functions

Definition at line 2502 of file property.c.

-

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, CommandOptionToMnemonic(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, _ImageInfo::debug, _Image::depth, ExtensionPath, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetImageArtifact(), GetImageKurtosis(), GetImageListLength(), GetImageMean(), GetImageOption(), GetImageRange(), GetImageType(), GetMagickCopyright(), GetMagickModule, GetMagickPrecision(), GetMagickPropertyLetter(), GetMagickVersion(), GetPathComponent(), _ImageInfo::group, HeadPath, IfMagickTrue, IsImageOpaque(), LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickColorspaceOptions, MagickFalse, MagickOrientationOptions, MagickTypeOptions, MaxTextExtent, _ImageInfo::number_scenes, _Image::orientation, _Image::resolution, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), TraceEvent, _ImageInfo::unique, WarnNoImageInfoReturn, WarnNoImageReturn, _PointInfo::x, _PointInfo::y, and _ImageInfo::zero.

+

References _Image::alpha_trait, BasePath, BlendPixelTrait, _Image::colorspace, CommandOptionToMnemonic(), ConcatenateMagickString(), CopyMagickString(), _Image::debug, _ImageInfo::debug, _Image::depth, ExtensionPath, _Image::filename, _ImageInfo::filename, FormatLocaleString(), FormatMagickSize(), _Image::gamma, GetBlobSize(), GetImageArtifact(), GetImageKurtosis(), GetImageListLength(), GetImageMean(), GetImageOption(), GetImageRange(), GetImageType(), GetMagickCopyright(), GetMagickModule, GetMagickPrecision(), GetMagickPropertyLetter(), GetMagickVersion(), GetPathComponent(), _ImageInfo::group, HeadPath, IfMagickTrue, IsImageOpaque(), LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickBooleanOptions, MagickColorspaceOptions, MagickFalse, MagickOrientationOptions, MagickTypeOptions, MagickPathExtent, _ImageInfo::number_scenes, _Image::orientation, _Image::resolution, _Image::scene, _ImageInfo::scene, SetImageArtifact(), SetImageOption(), TraceEvent, _ImageInfo::unique, WarnNoImageInfoReturn, WarnNoImageReturn, _PointInfo::x, _PointInfo::y, and _ImageInfo::zero.

Referenced by InterpretImageFilename(), and InterpretImageProperties().

@@ -452,7 +452,7 @@ Functions

Definition at line 3608 of file property.c.

-

References AcquireImageInfo(), AddValueToSplayTree(), AllCompliance, _Image::background_color, _ChromaticityInfo::blue_primary, _Image::chromaticity, _Image::colorspace, CompareSplayTreeString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, DeleteImageProperty(), _Image::depth, DestroyImageInfo(), DestroyString(), _Image::dispose, _Image::filename, _ImageInfo::filename, FileToStringInfo(), _Image::gamma, GetMagickModule, GetPageGeometry(), _Image::gravity, GreaterValue, _ChromaticityInfo::green_primary, IfMagickTrue, _Image::intensity, _Image::interpolate, IssRGBColorspace(), _Image::iterations, LessValue, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MagickDisposeOptions, MagickFalse, MagickGravityOptions, MagickIntentOptions, MagickInterpolateOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MaxTextExtent, NewSplayTree(), OptionError, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::properties, QueryColorCompliance(), _ChromaticityInfo::red_primary, RelinquishMagickMemory(), _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, _GeometryInfo::rho, SetImageInfo(), SetImageProfile(), _GeometryInfo::sigma, SigmaValue, _Image::signature, StringToDouble(), StringToUnsignedLong(), ThrowMagickException(), _Image::ticks_per_second, _Image::tile_offset, TraceEvent, UndefinedIntent, _Image::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, _PointInfo::y, and _PrimaryInfo::z.

+

References AcquireImageInfo(), AddValueToSplayTree(), AllCompliance, _Image::background_color, _ChromaticityInfo::blue_primary, _Image::chromaticity, _Image::colorspace, CompareSplayTreeString(), _Image::compose, _Image::compression, ConstantString(), CopyMagickString(), _Image::debug, _Image::delay, DeleteImageProperty(), _Image::depth, DestroyImageInfo(), DestroyString(), _Image::dispose, _Image::filename, _ImageInfo::filename, FileToStringInfo(), _Image::gamma, GetMagickModule, GetPageGeometry(), _Image::gravity, GreaterValue, _ChromaticityInfo::green_primary, IfMagickTrue, _Image::intensity, _Image::interpolate, IssRGBColorspace(), _Image::iterations, LessValue, LocaleCompare(), LocaleNCompare(), LogMagickEvent(), _ImageInfo::magick, MagickColorspaceOptions, MagickComposeOptions, MagickCompressOptions, MagickDisposeOptions, MagickFalse, MagickGravityOptions, MagickIntentOptions, MagickInterpolateOptions, MagickResolutionOptions, MagickSignature, MagickTrue, MagickPathExtent, NewSplayTree(), OptionError, _Image::page, ParseAbsoluteGeometry(), ParseCommandOption(), ParseGeometry(), PerceptualIntent, _Image::properties, QueryColorCompliance(), _ChromaticityInfo::red_primary, RelinquishMagickMemory(), _Image::rendering_intent, ResetMagickMemory(), _Image::resolution, _GeometryInfo::rho, SetImageInfo(), SetImageProfile(), _GeometryInfo::sigma, SigmaValue, _Image::signature, StringToDouble(), StringToUnsignedLong(), ThrowMagickException(), _Image::ticks_per_second, _Image::tile_offset, TraceEvent, UndefinedIntent, _Image::units, _ChromaticityInfo::white_point, _PrimaryInfo::x, _PointInfo::x, _PrimaryInfo::y, _PointInfo::y, and _PrimaryInfo::z.

Referenced by DefineImageProperty(), FormatImageProperty(), Get8BIMProperty(), GetEXIFProperty(), GetIPTCProperty(), PreviewImage(), ReadImage(), SignatureImage(), and ThumbnailImage().

diff --git a/www/api/MagickCore/registry_8c.html b/www/api/MagickCore/registry_8c.html index 1b8182e0d..106a03bbc 100644 --- a/www/api/MagickCore/registry_8c.html +++ b/www/api/MagickCore/registry_8c.html @@ -168,7 +168,7 @@ Variables

Definition at line 109 of file registry.c.

-

References CopyMagickString(), MaxTextExtent, and SetImageRegistry().

+

References CopyMagickString(), MagickPathExtent, and SetImageRegistry().

diff --git a/www/api/MagickCore/resize_8c.html b/www/api/MagickCore/resize_8c.html index 0ecc4b856..7be52a327 100644 --- a/www/api/MagickCore/resize_8c.html +++ b/www/api/MagickCore/resize_8c.html @@ -1830,7 +1830,7 @@ Functions

Definition at line 3582 of file resize.c.

-

References _Image::alpha_trait, BlendPixelTrait, _Image::columns, ConcatenateMagickString(), CopyMagickString(), _Image::debug, DeleteImageProfile(), DeleteImageProperty(), _Image::depth, DestroyImage(), _Image::filename, _Image::filter, FormatLocaleString(), FormatMagickSize(), GetBlobSize(), GetImageListLength(), GetMagickModule, GetMagickVersion(), GetNextImageProfile(), GetPathAttributes(), IfMagickTrue, _Image::interlace, LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MaxTextExtent, NoInterlace, OpaqueAlphaChannel, _Image::page, ParseAbsoluteGeometry(), ResetImageProfileIterator(), ResizeImage(), _Image::rows, SampleFactor, SampleImage(), SetImageAlphaChannel(), SetImageProperty(), _ExceptionInfo::signature, _Image::signature, and TraceEvent.

+

References _Image::alpha_trait, BlendPixelTrait, _Image::columns, ConcatenateMagickString(), CopyMagickString(), _Image::debug, DeleteImageProfile(), DeleteImageProperty(), _Image::depth, DestroyImage(), _Image::filename, _Image::filter, FormatLocaleString(), FormatMagickSize(), GetBlobSize(), GetImageListLength(), GetMagickModule, GetMagickVersion(), GetNextImageProfile(), GetPathAttributes(), IfMagickTrue, _Image::interlace, LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MagickPathExtent, NoInterlace, OpaqueAlphaChannel, _Image::page, ParseAbsoluteGeometry(), ResetImageProfileIterator(), ResizeImage(), _Image::rows, SampleFactor, SampleImage(), SetImageAlphaChannel(), SetImageProperty(), _ExceptionInfo::signature, _Image::signature, and TraceEvent.

Referenced by MontageImageList(), and PreviewImage().

diff --git a/www/api/MagickCore/resize_8h.html b/www/api/MagickCore/resize_8h.html index 357fed846..817c85467 100644 --- a/www/api/MagickCore/resize_8h.html +++ b/www/api/MagickCore/resize_8h.html @@ -476,7 +476,7 @@ Functions

Definition at line 3582 of file resize.c.

-

References _Image::alpha_trait, BlendPixelTrait, _Image::columns, ConcatenateMagickString(), CopyMagickString(), _Image::debug, DeleteImageProfile(), DeleteImageProperty(), _Image::depth, DestroyImage(), _Image::filename, _Image::filter, FormatLocaleString(), FormatMagickSize(), GetBlobSize(), GetImageListLength(), GetMagickModule, GetMagickVersion(), GetNextImageProfile(), GetPathAttributes(), IfMagickTrue, _Image::interlace, LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MaxTextExtent, NoInterlace, OpaqueAlphaChannel, _Image::page, ParseAbsoluteGeometry(), ResetImageProfileIterator(), ResizeImage(), _Image::rows, SampleFactor, SampleImage(), SetImageAlphaChannel(), SetImageProperty(), _ExceptionInfo::signature, _Image::signature, and TraceEvent.

+

References _Image::alpha_trait, BlendPixelTrait, _Image::columns, ConcatenateMagickString(), CopyMagickString(), _Image::debug, DeleteImageProfile(), DeleteImageProperty(), _Image::depth, DestroyImage(), _Image::filename, _Image::filter, FormatLocaleString(), FormatMagickSize(), GetBlobSize(), GetImageListLength(), GetMagickModule, GetMagickVersion(), GetNextImageProfile(), GetPathAttributes(), IfMagickTrue, _Image::interlace, LocaleCompare(), LocaleLower(), LogMagickEvent(), _Image::magick, _Image::magick_columns, _Image::magick_filename, _Image::magick_rows, MagickFalse, MagickSignature, MagickPathExtent, NoInterlace, OpaqueAlphaChannel, _Image::page, ParseAbsoluteGeometry(), ResetImageProfileIterator(), ResizeImage(), _Image::rows, SampleFactor, SampleImage(), SetImageAlphaChannel(), SetImageProperty(), _ExceptionInfo::signature, _Image::signature, and TraceEvent.

Referenced by MontageImageList(), and PreviewImage().

diff --git a/www/api/MagickCore/resource_8c.html b/www/api/MagickCore/resource_8c.html index e8127d588..61859943b 100644 --- a/www/api/MagickCore/resource_8c.html +++ b/www/api/MagickCore/resource_8c.html @@ -226,7 +226,7 @@ Variables

Definition at line 153 of file resource.c.

-

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceInfinity, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MaxTextExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

+

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceInfinity, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MagickPathExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

Referenced by AcquireRadonInfo(), OpenBlob(), OpenPixelCache(), OpenPixelCacheOnDisk(), and SetBlobExtent().

@@ -362,7 +362,7 @@ Variables

Definition at line 355 of file resource.c.

-

References AcquireExceptionInfo(), CloneString(), ConstantString(), DestroyExceptionInfo(), DestroyString(), DirectorySeparator, FormatLocaleString(), GetEnvironmentValue(), GetImageRegistry(), GetPathAttributes(), GetPolicyValue(), MagickFalse, MagickTrue, MaxTextExtent, S_ISDIR, and StringRegistryType.

+

References AcquireExceptionInfo(), CloneString(), ConstantString(), DestroyExceptionInfo(), DestroyString(), DirectorySeparator, FormatLocaleString(), GetEnvironmentValue(), GetImageRegistry(), GetPathAttributes(), GetPolicyValue(), MagickFalse, MagickTrue, MagickPathExtent, S_ISDIR, and StringRegistryType.

Referenced by AcquireUniqueFileResource().

@@ -394,7 +394,7 @@ Variables

Definition at line 698 of file resource.c.

-

References AcquireSemaphoreInfo(), _ResourceInfo::area_limit, CopyMagickString(), _ResourceInfo::disk_limit, _ResourceInfo::file_limit, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), LockSemaphoreInfo(), MagickFalse, MagickResourceInfinity, MagickTrue, _ResourceInfo::map_limit, MaxTextExtent, _ResourceInfo::memory_limit, resource_info, resource_semaphore, _ResourceInfo::thread_limit, _ResourceInfo::throttle_limit, _ResourceInfo::time_limit, and UnlockSemaphoreInfo().

+

References AcquireSemaphoreInfo(), _ResourceInfo::area_limit, CopyMagickString(), _ResourceInfo::disk_limit, _ResourceInfo::file_limit, FormatLocaleFile(), FormatLocaleString(), FormatMagickSize(), LockSemaphoreInfo(), MagickFalse, MagickResourceInfinity, MagickTrue, _ResourceInfo::map_limit, MagickPathExtent, _ResourceInfo::memory_limit, resource_info, resource_semaphore, _ResourceInfo::thread_limit, _ResourceInfo::throttle_limit, _ResourceInfo::time_limit, and UnlockSemaphoreInfo().

@@ -500,7 +500,7 @@ Variables

Definition at line 763 of file resource.c.

-

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MaxTextExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

+

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MagickPathExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

Referenced by AcquireRadonInfo(), ClosePixelCacheOnDisk(), DestroyBlob(), DestroyRadonInfo(), DetachBlob(), OpenBlob(), OpenPixelCache(), RelinquishPixelCachePixels(), and SetBlobExtent().

@@ -522,7 +522,7 @@ Variables

Definition at line 878 of file resource.c.

-

References AppendImageFormat(), CopyMagickString(), DeleteNodeFromSplayTree(), GetMagickModule, GetNextKeyInSplayTree(), LocaleCompare(), LogMagickEvent(), MaxTextExtent, ResetSplayTreeIterator(), ResourceEvent, ShredFile(), and temporary_resources.

+

References AppendImageFormat(), CopyMagickString(), DeleteNodeFromSplayTree(), GetMagickModule, GetNextKeyInSplayTree(), LocaleCompare(), LogMagickEvent(), MagickPathExtent, ResetSplayTreeIterator(), ResourceEvent, ShredFile(), and temporary_resources.

Referenced by AcquireUniqueSymbolicLink(), BlobToImage(), DestroyRadonInfo(), ImagesToBlob(), ImageToBlob(), InjectImageBlob(), InvokeDelegate(), PreviewImage(), ReadImage(), RelinquishPixelCachePixels(), RenderPostscript(), and WriteImage().

diff --git a/www/api/MagickCore/resource___8h.html b/www/api/MagickCore/resource___8h.html index 3dee17b25..79ef6e32c 100644 --- a/www/api/MagickCore/resource___8h.html +++ b/www/api/MagickCore/resource___8h.html @@ -319,7 +319,7 @@ Functions

Definition at line 763 of file resource.c.

-

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MaxTextExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

+

References AcquireSemaphoreInfo(), _ResourceInfo::area, _ResourceInfo::area_limit, AreaResource, CommandOptionToMnemonic(), _ResourceInfo::disk, _ResourceInfo::disk_limit, DiskResource, _ResourceInfo::file, _ResourceInfo::file_limit, FileResource, FormatMagickSize(), GetMagickModule, LockSemaphoreInfo(), LogMagickEvent(), MagickFalse, MagickResourceOptions, MagickTrue, _ResourceInfo::map, _ResourceInfo::map_limit, MapResource, MagickPathExtent, _ResourceInfo::memory, _ResourceInfo::memory_limit, MemoryResource, resource_info, resource_semaphore, ResourceEvent, _ResourceInfo::thread, _ResourceInfo::thread_limit, ThreadResource, _ResourceInfo::throttle, _ResourceInfo::throttle_limit, ThrottleResource, _ResourceInfo::time, _ResourceInfo::time_limit, TimeResource, and UnlockSemaphoreInfo().

Referenced by AcquireRadonInfo(), ClosePixelCacheOnDisk(), DestroyBlob(), DestroyRadonInfo(), DetachBlob(), OpenBlob(), OpenPixelCache(), RelinquishPixelCachePixels(), and SetBlobExtent().

diff --git a/www/api/MagickCore/shear_8c.html b/www/api/MagickCore/shear_8c.html index baf5b71ec..9ac8ddf42 100644 --- a/www/api/MagickCore/shear_8c.html +++ b/www/api/MagickCore/shear_8c.html @@ -372,7 +372,7 @@ Functions

Definition at line 832 of file shear.c.

-

References AcquireQuantumMemory(), AffineTransformImage(), BackgroundVirtualPixelMethod, CloneImage(), _Image::columns, CropImage(), _Image::debug, DegreesToRadians(), DestroyImage(), FormatLocaleString(), GetImageArtifact(), GetImageBackgroundColor(), GetImageBoundingBox(), GetMagickModule, _RectangleInfo::height, LogMagickEvent(), MagickFalse, MagickTrue, MaxTextExtent, MedianStatistic, RadiansToDegrees(), RadonTransform(), RelinquishMagickMemory(), ResourceLimitError, _AffineMatrix::rx, _AffineMatrix::ry, SetImageArtifact(), SetImageVirtualPixelMethod(), StatisticImage(), StringToLong(), _AffineMatrix::sx, _AffineMatrix::sy, ThrowImageException, TransformEvent, _AffineMatrix::tx, _AffineMatrix::ty, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

+

References AcquireQuantumMemory(), AffineTransformImage(), BackgroundVirtualPixelMethod, CloneImage(), _Image::columns, CropImage(), _Image::debug, DegreesToRadians(), DestroyImage(), FormatLocaleString(), GetImageArtifact(), GetImageBackgroundColor(), GetImageBoundingBox(), GetMagickModule, _RectangleInfo::height, LogMagickEvent(), MagickFalse, MagickTrue, MagickPathExtent, MedianStatistic, RadiansToDegrees(), RadonTransform(), RelinquishMagickMemory(), ResourceLimitError, _AffineMatrix::rx, _AffineMatrix::ry, SetImageArtifact(), SetImageVirtualPixelMethod(), StatisticImage(), StringToLong(), _AffineMatrix::sx, _AffineMatrix::sy, ThrowImageException, TransformEvent, _AffineMatrix::tx, _AffineMatrix::ty, _RectangleInfo::width, _RectangleInfo::x, and _RectangleInfo::y.

diff --git a/www/api/MagickCore/stream_8c.html b/www/api/MagickCore/stream_8c.html index b87bb0158..8d7a63e1c 100644 --- a/www/api/MagickCore/stream_8c.html +++ b/www/api/MagickCore/stream_8c.html @@ -767,7 +767,7 @@ Functions

Definition at line 806 of file stream.c.

-

References CopyMagickString(), _Image::filename, MaxTextExtent, OpenBlob(), _StreamInfo::stream, and WriteBinaryBlobMode.

+

References CopyMagickString(), _Image::filename, MagickPathExtent, OpenBlob(), _StreamInfo::stream, and WriteBinaryBlobMode.

diff --git a/www/api/MagickCore/string_8c.html b/www/api/MagickCore/string_8c.html index 58371aa6f..71d9a3c36 100644 --- a/www/api/MagickCore/string_8c.html +++ b/www/api/MagickCore/string_8c.html @@ -204,7 +204,7 @@ Variables

Definition at line 119 of file string.c.

-

References AcquireQuantumMemory(), MaxTextExtent, ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), MagickPathExtent, ResourceLimitFatalError, and ThrowFatalException.

Referenced by CanonicalXMLContent(), ClipImagePath(), CloneMontageInfo(), CloneString(), ColorMatrixImage(), ConcatenateString(), DrawImage(), DrawPatternPath(), EncodePredefinedEntities(), EscapeParenthesis(), ExpandFilenames(), FormatMagickCaption(), GenerateEntropicChaos(), GetCommandOptions(), GetDrawInfo(), GetEXIFProperty(), GetHostname(), GetMontageInfo(), GetPageGeometry(), InterpretImageProperties(), ListFiles(), LoadCoderList(), LoadColorList(), LoadConfigureList(), LoadDelegateList(), LoadLocaleList(), LoadLogList(), LoadMagicList(), LoadMimeList(), LoadPolicyList(), LoadTypeList(), MontageImageList(), PolaroidImage(), QueryColorCompliance(), SelectiveBlurImage(), StringToArgv(), SystemCommand(), TracePSClippath(), TraceSVGClippath(), TranslateEvent(), TranslateFilename(), VignetteImage(), and XMLTreeInfoToXML().

@@ -226,7 +226,7 @@ Variables

Definition at line 165 of file string.c.

-

References AcquireMagickMemory(), AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, MagickSignature, MaxTextExtent, ResetMagickMemory(), ResourceLimitFatalError, _StringInfo::signature, and ThrowFatalException.

+

References AcquireMagickMemory(), AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, MagickSignature, MagickPathExtent, ResetMagickMemory(), ResourceLimitFatalError, _StringInfo::signature, and ThrowFatalException.

Referenced by AcquireRandomInfo(), AcquireSignatureInfo(), BlobToStringInfo(), CloneStringInfo(), ConfigureFileToStringInfo(), ConnectPixelCacheServer(), FileToStringInfo(), GenerateEntropicChaos(), GetConfigureOptions(), GetLocaleOptions(), GetMagickSignature(), GetProfilesFromResourceBlock(), GetRandomKey(), ProfileImage(), SignatureImage(), SplitStringInfo(), and StringToStringInfo().

@@ -258,7 +258,7 @@ Variables

Definition at line 213 of file string.c.

-

References AcquireQuantumMemory(), AcquireStringInfo(), _StringInfo::datum, DestroyStringInfo(), _StringInfo::length, and MaxTextExtent.

+

References AcquireQuantumMemory(), AcquireStringInfo(), _StringInfo::datum, DestroyStringInfo(), _StringInfo::length, and MagickPathExtent.

@@ -288,7 +288,7 @@ Variables

Definition at line 265 of file string.c.

-

References AcquireString(), DestroyString(), GetMagickModule, LogMagickEvent(), MaxTextExtent, ResizeQuantumMemory(), ResourceLimitFatalError, ThrowFatalException, and TraceEvent.

+

References AcquireString(), DestroyString(), GetMagickModule, LogMagickEvent(), MagickPathExtent, ResizeQuantumMemory(), ResourceLimitFatalError, ThrowFatalException, and TraceEvent.

Referenced by AnnotateImage(), CloneDrawInfo(), CloneImage(), CloneImageInfo(), CloneImageProperties(), DrawClipPath(), DrawImage(), DrawPatternPath(), DrawPrimitive(), GetDrawInfo(), GetPathTemplate(), IdentifyImage(), MontageImageList(), PolaroidImage(), PreviewImage(), RenderPostscript(), RenderType(), SetImageInfo(), SetImageOption(), and SetStreamInfoMap().

@@ -410,7 +410,7 @@ Variables

Definition at line 481 of file string.c.

-

References AcquireString(), MagickTrue, MaxTextExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireString(), MagickTrue, MagickPathExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

Referenced by CanonicalXMLContent(), ColorMatrixImage(), ExpandFilenames(), GetIPTCProperty(), ParseCharacterContent(), SelectiveBlurImage(), TracePSClippath(), and TraceSVGClippath().

@@ -464,7 +464,7 @@ Variables

Definition at line 582 of file string.c.

-

References AcquireQuantumMemory(), AcquireStringInfo(), CopyMagickString(), _StringInfo::datum, DestroyString(), _StringInfo::length, MagickMin(), _StreamInfo::map, MapBlob(), MaxTextExtent, O_BINARY, open_utf8(), _StringInfo::path, ReadMode, and UnmapBlob().

+

References AcquireQuantumMemory(), AcquireStringInfo(), CopyMagickString(), _StringInfo::datum, DestroyString(), _StringInfo::length, MagickMin(), _StreamInfo::map, MapBlob(), MagickPathExtent, O_BINARY, open_utf8(), _StringInfo::path, ReadMode, and UnmapBlob().

Referenced by GetConfigureOptions(), and GetLocaleOptions().

@@ -618,7 +618,7 @@ Variables

Definition at line 917 of file string.c.

-

References AcquireQuantumMemory(), GetMagickModule, LogMagickEvent(), MaxTextExtent, ResourceLimitFatalError, ThrowFatalException, and TraceEvent.

+

References AcquireQuantumMemory(), GetMagickModule, LogMagickEvent(), MagickPathExtent, ResourceLimitFatalError, ThrowFatalException, and TraceEvent.

@@ -692,7 +692,7 @@ Variables

Definition at line 1028 of file string.c.

-

References AcquireStringInfo(), CopyMagickString(), _StringInfo::datum, DestroyStringInfo(), FileToBlob(), GetMagickModule, _StringInfo::length, LogMagickEvent(), MaxTextExtent, _StringInfo::path, and TraceEvent.

+

References AcquireStringInfo(), CopyMagickString(), _StringInfo::datum, DestroyStringInfo(), FileToBlob(), GetMagickModule, _StringInfo::length, LogMagickEvent(), MagickPathExtent, _StringInfo::path, and TraceEvent.

Referenced by SetImageProperty().

@@ -730,7 +730,7 @@ Variables

Definition at line 1076 of file string.c.

-

References FormatLocaleString(), MagickFalse, and MaxTextExtent.

+

References FormatLocaleString(), MagickFalse, and MagickPathExtent.

Referenced by AcquireMagickResource(), GetMagickProperty(), GetMagickPropertyLetter(), IdentifyImage(), ListLogInfo(), ListMagickResourceInfo(), OpenPixelCache(), RelinquishMagickResource(), SetPixelCacheExtent(), and ThumbnailImage().

@@ -1230,7 +1230,7 @@ Variables

Definition at line 1918 of file string.c.

-

References AcquireQuantumMemory(), _StringInfo::datum, GetMagickModule, _StringInfo::length, LogMagickEvent(), MagickSignature, MaxTextExtent, ResizeQuantumMemory(), ResourceLimitFatalError, _StringInfo::signature, ThrowFatalException, and TraceEvent.

+

References AcquireQuantumMemory(), _StringInfo::datum, GetMagickModule, _StringInfo::length, LogMagickEvent(), MagickSignature, MagickPathExtent, ResizeQuantumMemory(), ResourceLimitFatalError, _StringInfo::signature, ThrowFatalException, and TraceEvent.

Referenced by AcquireRandomInfo(), ConcatenateStringInfo(), GenerateEntropicChaos(), GetConfigureOptions(), GetLocaleOptions(), GetMagickSignature(), SignatureImage(), and SplitStringInfo().

@@ -1262,7 +1262,7 @@ Variables

Definition at line 1961 of file string.c.

-

References CopyMagickString(), GetMagickModule, LogMagickEvent(), MagickSignature, MaxTextExtent, _StringInfo::path, _StringInfo::signature, and TraceEvent.

+

References CopyMagickString(), GetMagickModule, LogMagickEvent(), MagickSignature, MagickPathExtent, _StringInfo::path, _StringInfo::signature, and TraceEvent.

Referenced by GetConfigureOptions(), and GetLocaleOptions().

@@ -1294,7 +1294,7 @@ Variables

Definition at line 1992 of file string.c.

-

References AcquireStringInfo(), _StringInfo::datum, GetMagickModule, _StringInfo::length, LogMagickEvent(), MagickSignature, MaxTextExtent, SetStringInfo(), SetStringInfoLength(), _StringInfo::signature, and TraceEvent.

+

References AcquireStringInfo(), _StringInfo::datum, GetMagickModule, _StringInfo::length, LogMagickEvent(), MagickSignature, MagickPathExtent, SetStringInfo(), SetStringInfoLength(), _StringInfo::signature, and TraceEvent.

@@ -1314,7 +1314,7 @@ Variables

Definition at line 2074 of file string.c.

-

References AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, MaxTextExtent, ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, MagickPathExtent, ResourceLimitFatalError, and ThrowFatalException.

Referenced by SignatureImage().

@@ -1336,7 +1336,7 @@ Variables

Definition at line 2033 of file string.c.

-

References AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, and MaxTextExtent.

+

References AcquireQuantumMemory(), _StringInfo::datum, _StringInfo::length, and MagickPathExtent.

Referenced by GetXMPProperty().

@@ -1368,7 +1368,7 @@ Variables

Definition at line 2162 of file string.c.

-

References AcquireQuantumMemory(), AcquireString(), DestroyString(), MaxTextExtent, RelinquishMagickMemory(), ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), AcquireString(), DestroyString(), MagickPathExtent, RelinquishMagickMemory(), ResourceLimitFatalError, and ThrowFatalException.

Referenced by ExpandFilenames(), GetHostname(), ProfileImage(), and SystemCommand().

@@ -1456,7 +1456,7 @@ Variables

Definition at line 2433 of file string.c.

-

References AcquireQuantumMemory(), CopyMagickString(), FormatLocaleString(), MagickMin(), MaxTextExtent, ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), CopyMagickString(), FormatLocaleString(), MagickMin(), MagickPathExtent, ResourceLimitFatalError, and ThrowFatalException.

Referenced by AnnotateImage(), GetDelegateCommand(), GetMultilineTypeMetrics(), IdentifyImage(), InvokeDelegate(), ListDelegateInfo(), and ListMagickInfo().

@@ -1536,7 +1536,7 @@ Variables

Definition at line 2665 of file string.c.

-

References CopyMagickMemory(), MagickFalse, MagickTrue, MaxTextExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

+

References CopyMagickMemory(), MagickFalse, MagickTrue, MagickPathExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

Referenced by AcquireFxInfo(), GetEXIFProperty(), GetHostname(), LoadDelegateList(), LoadMimeList(), LoadTypeList(), ProfileImage(), and QueryColorCompliance().

diff --git a/www/api/MagickCore/string___8h.html b/www/api/MagickCore/string___8h.html index 9f454ff75..eba214fd0 100644 --- a/www/api/MagickCore/string___8h.html +++ b/www/api/MagickCore/string___8h.html @@ -1229,7 +1229,7 @@ Functions

Definition at line 2433 of file string.c.

-

References AcquireQuantumMemory(), CopyMagickString(), FormatLocaleString(), MagickMin(), MaxTextExtent, ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), CopyMagickString(), FormatLocaleString(), MagickMin(), MagickPathExtent, ResourceLimitFatalError, and ThrowFatalException.

Referenced by AnnotateImage(), GetDelegateCommand(), GetMultilineTypeMetrics(), IdentifyImage(), InvokeDelegate(), ListDelegateInfo(), and ListMagickInfo().

@@ -1309,7 +1309,7 @@ Functions

Definition at line 2665 of file string.c.

-

References CopyMagickMemory(), MagickFalse, MagickTrue, MaxTextExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

+

References CopyMagickMemory(), MagickFalse, MagickTrue, MagickPathExtent, ResizeQuantumMemory(), ResourceLimitFatalError, and ThrowFatalException.

Referenced by AcquireFxInfo(), GetEXIFProperty(), GetHostname(), LoadDelegateList(), LoadMimeList(), LoadTypeList(), ProfileImage(), and QueryColorCompliance().

diff --git a/www/api/MagickCore/struct__CacheInfo.html b/www/api/MagickCore/struct__CacheInfo.html index 826faadc6..8e19f48c1 100644 --- a/www/api/MagickCore/struct__CacheInfo.html +++ b/www/api/MagickCore/struct__CacheInfo.html @@ -112,9 +112,9 @@ Data Fields   int file   -char filename [MaxTextExtent] +char filename [MagickPathExtent]   -char cache_filename [MaxTextExtent] +char cache_filename [MagickPathExtent]   CacheMethods methods   @@ -162,7 +162,7 @@ Data Fields
- +
char _CacheInfo::cache_filename[MaxTextExtent]char _CacheInfo::cache_filename[MagickPathExtent]
@@ -272,7 +272,7 @@ Data Fields
- +
char _CacheInfo::filename[MaxTextExtent]char _CacheInfo::filename[MagickPathExtent]
diff --git a/www/api/MagickCore/struct__Image.html b/www/api/MagickCore/struct__Image.html index 4c4bce441..b57a9926b 100644 --- a/www/api/MagickCore/struct__Image.html +++ b/www/api/MagickCore/struct__Image.html @@ -198,11 +198,11 @@ Data Fields   void * artifacts   -char filename [MaxTextExtent] +char filename [MagickPathExtent]   -char magick_filename [MaxTextExtent] +char magick_filename [MagickPathExtent]   -char magick [MaxTextExtent] +char magick [MagickPathExtent]   size_t magick_columns   @@ -686,7 +686,7 @@ Data Fields
- +
char _Image::filename[MaxTextExtent]char _Image::filename[MagickPathExtent]
@@ -892,7 +892,7 @@ Data Fields
- +
char _Image::magick[MaxTextExtent]char _Image::magick[MagickPathExtent]
@@ -924,7 +924,7 @@ Data Fields
- +
char _Image::magick_filename[MaxTextExtent]char _Image::magick_filename[MagickPathExtent]
diff --git a/www/api/MagickCore/struct__ImageInfo.html b/www/api/MagickCore/struct__ImageInfo.html index 506f79bf9..dc070d773 100644 --- a/www/api/MagickCore/struct__ImageInfo.html +++ b/www/api/MagickCore/struct__ImageInfo.html @@ -166,13 +166,13 @@ Data Fields   size_t length   -char magick [MaxTextExtent] +char magick [MagickPathExtent]   -char unique [MaxTextExtent] +char unique [MagickPathExtent]   -char zero [MaxTextExtent] +char zero [MagickPathExtent]   -char filename [MaxTextExtent] +char filename [MagickPathExtent]   MagickBooleanType debug   @@ -490,7 +490,7 @@ Data Fields
- +
char _ImageInfo::filename[MaxTextExtent]char _ImageInfo::filename[MagickPathExtent]
@@ -586,7 +586,7 @@ Data Fields
- +
char _ImageInfo::magick[MaxTextExtent]char _ImageInfo::magick[MagickPathExtent]
@@ -986,7 +986,7 @@ Data Fields
- +
char _ImageInfo::unique[MaxTextExtent]char _ImageInfo::unique[MagickPathExtent]
@@ -1050,7 +1050,7 @@ Data Fields
- +
char _ImageInfo::zero[MaxTextExtent]char _ImageInfo::zero[MagickPathExtent]
diff --git a/www/api/MagickCore/struct__MontageInfo.html b/www/api/MagickCore/struct__MontageInfo.html index 44f824bb6..f94e82d61 100644 --- a/www/api/MagickCore/struct__MontageInfo.html +++ b/www/api/MagickCore/struct__MontageInfo.html @@ -98,7 +98,7 @@ Data Fields   GravityType gravity   -char filename [MaxTextExtent] +char filename [MagickPathExtent]   MagickBooleanType debug   @@ -178,7 +178,7 @@ Data Fields
- +
char _MontageInfo::filename[MaxTextExtent]char _MontageInfo::filename[MagickPathExtent]
diff --git a/www/api/MagickCore/struct__StringInfo.html b/www/api/MagickCore/struct__StringInfo.html index ef4a1c2ba..859e68d84 100644 --- a/www/api/MagickCore/struct__StringInfo.html +++ b/www/api/MagickCore/struct__StringInfo.html @@ -61,7 +61,7 @@ $(document).ready(function(){initNavTree('struct__StringInfo.html','');}); - + @@ -111,7 +111,7 @@ Data Fields

Data Fields

char path [MaxTextExtent]
char path [MagickPathExtent]
 
unsigned char * datum
 
- +
char _StringInfo::path[MaxTextExtent]char _StringInfo::path[MagickPathExtent]
diff --git a/www/api/MagickCore/threshold_8c.html b/www/api/MagickCore/threshold_8c.html index bbf58f1b6..fa3504c15 100644 --- a/www/api/MagickCore/threshold_8c.html +++ b/www/api/MagickCore/threshold_8c.html @@ -695,7 +695,7 @@ Variables

Definition at line 1291 of file threshold.c.

-

References AcquireAuthenticCacheView(), ClampToQuantum(), _Image::columns, CompositePixelChannel, _Image::debug, DestroyCacheView(), DestroyThresholdMap(), DirectClass, DitherImageTag, _ThresholdMap::divisor, _Image::filename, GetCacheViewAuthenticPixels(), GetMagickModule, GetMagickToken(), GetPixelChannelChannel(), GetPixelChannels(), GetPixelChannelTraits(), GetPixelReadMask(), GetThresholdMap(), _ThresholdMap::height, _ThresholdMap::levels, LogMagickEvent(), MagickEpsilon, MagickFalse, MagickSignature, MagickTrue, MaxPixelChannels, MaxTextExtent, OptionError, _Image::progress_monitor, QuantumRange, QuantumScale, _Image::rows, SetImageProgress(), SetImageStorageClass(), _ExceptionInfo::signature, _Image::signature, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowMagickException(), TraceEvent, UpdatePixelTrait, and _ThresholdMap::width.

+

References AcquireAuthenticCacheView(), ClampToQuantum(), _Image::columns, CompositePixelChannel, _Image::debug, DestroyCacheView(), DestroyThresholdMap(), DirectClass, DitherImageTag, _ThresholdMap::divisor, _Image::filename, GetCacheViewAuthenticPixels(), GetMagickModule, GetMagickToken(), GetPixelChannelChannel(), GetPixelChannels(), GetPixelChannelTraits(), GetPixelReadMask(), GetThresholdMap(), _ThresholdMap::height, _ThresholdMap::levels, LogMagickEvent(), MagickEpsilon, MagickFalse, MagickSignature, MagickTrue, MaxPixelChannels, MagickPathExtent, OptionError, _Image::progress_monitor, QuantumRange, QuantumScale, _Image::rows, SetImageProgress(), SetImageStorageClass(), _ExceptionInfo::signature, _Image::signature, StringToDouble(), SyncCacheViewAuthenticPixels(), ThrowMagickException(), TraceEvent, UpdatePixelTrait, and _ThresholdMap::width.

diff --git a/www/api/MagickCore/token_8c.html b/www/api/MagickCore/token_8c.html index 3e7c9a29e..f0ce741d0 100644 --- a/www/api/MagickCore/token_8c.html +++ b/www/api/MagickCore/token_8c.html @@ -252,7 +252,7 @@ Functions

Definition at line 169 of file token.c.

-

References CopyMagickString(), DirectorySeparator, LocaleNCompare(), MaxTextExtent, and StringToDouble().

+

References CopyMagickString(), DirectorySeparator, LocaleNCompare(), MagickPathExtent, and StringToDouble().

Referenced by AcquireKernelInfo(), ChannelFxImage(), ColorDecisionListImage(), DrawImage(), LoadCoderList(), LoadColorList(), LoadConfigureList(), LoadDelegateList(), LoadLocaleList(), LoadLogList(), LoadMagicList(), LoadPolicyList(), LoadTypeList(), OrderedPosterizeImage(), ParseAffineGeometry(), ParseKernelArray(), ParseKernelName(), ParsePixelChannelOption(), and TracePath().

@@ -290,7 +290,7 @@ Functions

Definition at line 320 of file token.c.

-

References AcquireExceptionInfo(), AcquireImageInfo(), CopyMagickString(), DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetUTFCode(), GetUTFOctets(), GlobExpression(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, and SetImageInfo().

+

References AcquireExceptionInfo(), AcquireImageInfo(), CopyMagickString(), DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetUTFCode(), GetUTFOctets(), GlobExpression(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, and SetImageInfo().

Referenced by GetCoderInfoList(), GetCoderList(), GetColorInfoList(), GetColorList(), GetConfigureInfoList(), GetConfigureList(), GetDelegateInfoList(), GetDelegateList(), GetLocaleInfoList(), GetLocaleList(), GetLogInfoList(), GetLogList(), GetMagicInfoList(), GetMagickInfoList(), GetMagickList(), GetMagicList(), GetMimeInfo(), GetMimeInfoList(), GetMimeList(), GetPolicyInfoList(), GetPolicyList(), GetTypeInfoList(), GetTypeList(), GlobExpression(), InterpretImageProperties(), IsRightsAuthorized(), ListFiles(), LoadColorList(), and ProfileImage().

diff --git a/www/api/MagickCore/token_8h.html b/www/api/MagickCore/token_8h.html index 98719384a..5de7e35d2 100644 --- a/www/api/MagickCore/token_8h.html +++ b/www/api/MagickCore/token_8h.html @@ -169,7 +169,7 @@ Functions

Definition at line 169 of file token.c.

-

References CopyMagickString(), DirectorySeparator, LocaleNCompare(), MaxTextExtent, and StringToDouble().

+

References CopyMagickString(), DirectorySeparator, LocaleNCompare(), MagickPathExtent, and StringToDouble().

Referenced by AcquireKernelInfo(), ChannelFxImage(), ColorDecisionListImage(), DrawImage(), LoadCoderList(), LoadColorList(), LoadConfigureList(), LoadDelegateList(), LoadLocaleList(), LoadLogList(), LoadMagicList(), LoadPolicyList(), LoadTypeList(), OrderedPosterizeImage(), ParseAffineGeometry(), ParseKernelArray(), ParseKernelName(), ParsePixelChannelOption(), and TracePath().

@@ -207,7 +207,7 @@ Functions

Definition at line 320 of file token.c.

-

References AcquireExceptionInfo(), AcquireImageInfo(), CopyMagickString(), DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetUTFCode(), GetUTFOctets(), GlobExpression(), LocaleCompare(), MagickFalse, MagickTrue, MaxTextExtent, and SetImageInfo().

+

References AcquireExceptionInfo(), AcquireImageInfo(), CopyMagickString(), DestroyExceptionInfo(), DestroyImageInfo(), _ImageInfo::filename, GetUTFCode(), GetUTFOctets(), GlobExpression(), LocaleCompare(), MagickFalse, MagickTrue, MagickPathExtent, and SetImageInfo().

Referenced by GetCoderInfoList(), GetCoderList(), GetColorInfoList(), GetColorList(), GetConfigureInfoList(), GetConfigureList(), GetDelegateInfoList(), GetDelegateList(), GetLocaleInfoList(), GetLocaleList(), GetLogInfoList(), GetLogList(), GetMagicInfoList(), GetMagickInfoList(), GetMagickList(), GetMagicList(), GetMimeInfo(), GetMimeInfoList(), GetMimeList(), GetPolicyInfoList(), GetPolicyList(), GetTypeInfoList(), GetTypeList(), GlobExpression(), InterpretImageProperties(), IsRightsAuthorized(), ListFiles(), LoadColorList(), and ProfileImage().

diff --git a/www/api/MagickCore/type_8c.html b/www/api/MagickCore/type_8c.html index cf938c4f9..66e86852c 100644 --- a/www/api/MagickCore/type_8c.html +++ b/www/api/MagickCore/type_8c.html @@ -400,7 +400,7 @@ Variables

Definition at line 832 of file type.c.

-

References CommandOptionToMnemonic(), _TypeInfo::family, FormatLocaleFile(), FormatLocaleString(), GetTypeInfoList(), _TypeInfo::glyphs, LocaleCompare(), MagickFalse, MagickStretchOptions, MagickStyleOptions, MagickTrue, MaxTextExtent, _TypeInfo::name, _TypeInfo::path, RelinquishMagickMemory(), and _TypeInfo::weight.

+

References CommandOptionToMnemonic(), _TypeInfo::family, FormatLocaleFile(), FormatLocaleString(), GetTypeInfoList(), _TypeInfo::glyphs, LocaleCompare(), MagickFalse, MagickStretchOptions, MagickStyleOptions, MagickTrue, MagickPathExtent, _TypeInfo::name, _TypeInfo::path, RelinquishMagickMemory(), and _TypeInfo::weight.

@@ -450,7 +450,7 @@ Variables

Definition at line 954 of file type.c.

-

References AcquireExceptionInfo(), AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _TypeInfo::description, DestroyExceptionInfo(), DestroyString(), DestroyTypeNode(), DirectorySeparator, _TypeInfo::encoding, _TypeInfo::face, _TypeInfo::family, FileToString(), _TypeInfo::format, _TypeInfo::foundry, GetMagickModule, GetMagickToken(), GetPathComponent(), _TypeInfo::glyphs, HeadPath, IsPathAccessible(), IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickStretchOptions, MagickStyleOptions, MagickTrue, MaxTextExtent, _TypeInfo::metrics, _TypeInfo::name, NewSplayTree(), ParseCommandOption(), _TypeInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _TypeInfo::signature, _TypeInfo::stealth, _TypeInfo::stretch, StringToUnsignedLong(), _TypeInfo::style, SubstituteString(), ThrowFatalException, ThrowFileException, ThrowMagickException(), and _TypeInfo::weight.

+

References AcquireExceptionInfo(), AcquireMagickMemory(), AcquireString(), AddValueToSplayTree(), CompareSplayTreeString(), ConcatenateMagickString(), ConfigureError, ConfigureEvent, ConstantString(), CopyMagickString(), _TypeInfo::description, DestroyExceptionInfo(), DestroyString(), DestroyTypeNode(), DirectorySeparator, _TypeInfo::encoding, _TypeInfo::face, _TypeInfo::family, FileToString(), _TypeInfo::format, _TypeInfo::foundry, GetMagickModule, GetMagickToken(), GetPathComponent(), _TypeInfo::glyphs, HeadPath, IsPathAccessible(), IsStringTrue(), LocaleCompare(), LocaleNCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickStretchOptions, MagickStyleOptions, MagickTrue, MagickPathExtent, _TypeInfo::metrics, _TypeInfo::name, NewSplayTree(), ParseCommandOption(), _TypeInfo::path, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, ResourceLimitFatalError, _TypeInfo::signature, _TypeInfo::stealth, _TypeInfo::stretch, StringToUnsignedLong(), _TypeInfo::style, SubstituteString(), ThrowFatalException, ThrowFileException, ThrowMagickException(), and _TypeInfo::weight.

Referenced by LoadTypeLists().

@@ -482,7 +482,7 @@ Variables

Definition at line 1290 of file type.c.

-

References CopyMagickString(), DestroyConfigureOptions(), DestroyString(), DirectorySeparator, FileToString(), FormatLocaleString(), GetConfigureOptions(), GetEnvironmentValue(), GetNextValueInLinkedList(), GetNumberOfNodesInSplayTree(), GetStringInfoDatum(), GetStringInfoPath(), LoadTypeList(), MagickFalse, MagickTrue, MaxTextExtent, and TypeMap.

+

References CopyMagickString(), DestroyConfigureOptions(), DestroyString(), DirectorySeparator, FileToString(), FormatLocaleString(), GetConfigureOptions(), GetEnvironmentValue(), GetNextValueInLinkedList(), GetNumberOfNodesInSplayTree(), GetStringInfoDatum(), GetStringInfoPath(), LoadTypeList(), MagickFalse, MagickTrue, MagickPathExtent, and TypeMap.

Referenced by InitializeTypeList().

diff --git a/www/api/MagickCore/type_8h.html b/www/api/MagickCore/type_8h.html index ebe8e7551..54555fd12 100644 --- a/www/api/MagickCore/type_8h.html +++ b/www/api/MagickCore/type_8h.html @@ -371,7 +371,7 @@ Functions

Definition at line 832 of file type.c.

-

References CommandOptionToMnemonic(), _TypeInfo::family, FormatLocaleFile(), FormatLocaleString(), GetTypeInfoList(), _TypeInfo::glyphs, LocaleCompare(), MagickFalse, MagickStretchOptions, MagickStyleOptions, MagickTrue, MaxTextExtent, _TypeInfo::name, _TypeInfo::path, RelinquishMagickMemory(), and _TypeInfo::weight.

+

References CommandOptionToMnemonic(), _TypeInfo::family, FormatLocaleFile(), FormatLocaleString(), GetTypeInfoList(), _TypeInfo::glyphs, LocaleCompare(), MagickFalse, MagickStretchOptions, MagickStyleOptions, MagickTrue, MagickPathExtent, _TypeInfo::name, _TypeInfo::path, RelinquishMagickMemory(), and _TypeInfo::weight.

diff --git a/www/api/MagickCore/utility_8c.html b/www/api/MagickCore/utility_8c.html index b5a722e7e..036972437 100644 --- a/www/api/MagickCore/utility_8c.html +++ b/www/api/MagickCore/utility_8c.html @@ -196,7 +196,7 @@ Variables

Definition at line 160 of file utility.c.

-

References AcquireQuantumMemory(), AcquireUniqueFilename(), AcquireUniqueFileResource(), ConcatenateMagickString(), DirectorySeparator, MagickFalse, MagickMaxBufferExtent, MagickMin(), MagickTrue, MaxTextExtent, O_BINARY, open_utf8(), RelinquishMagickMemory(), and RelinquishUniqueFileResource().

+

References AcquireQuantumMemory(), AcquireUniqueFilename(), AcquireUniqueFileResource(), ConcatenateMagickString(), DirectorySeparator, MagickFalse, MagickMaxBufferExtent, MagickMin(), MagickTrue, MagickPathExtent, O_BINARY, open_utf8(), RelinquishMagickMemory(), and RelinquishUniqueFileResource().

Referenced by InvokeDelegate().

@@ -228,7 +228,7 @@ Variables

Definition at line 275 of file utility.c.

-

References CopyMagickString(), ExtensionPath, FormatLocaleString(), GetMagickModule, GetPathComponent(), LocaleCompare(), LogMagickEvent(), MaxTextExtent, RootPath, and TraceEvent.

+

References CopyMagickString(), ExtensionPath, FormatLocaleString(), GetMagickModule, GetPathComponent(), LocaleCompare(), LogMagickEvent(), MagickPathExtent, RootPath, and TraceEvent.

Referenced by RelinquishUniqueFileResource().

@@ -350,7 +350,7 @@ Variables

Definition at line 608 of file utility.c.

-

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), DirectorySeparator, GetEnvironmentValue(), and MaxTextExtent.

+

References ConcatenateMagickString(), CopyMagickString(), DestroyString(), DirectorySeparator, GetEnvironmentValue(), and MagickPathExtent.

@@ -380,7 +380,7 @@ Variables

Definition at line 727 of file utility.c.

-

References AcquireExceptionInfo(), AcquireQuantumMemory(), AcquireString(), ConcatenateMagickString(), ConcatenateString(), ConfigureEvent, ConstantString(), CopyMagickString(), DestroyExceptionInfo(), DestroyString(), DirectorySeparator, ExpandFilename(), FileToString(), GetMagickModule, GetPathComponent(), HeadPath, IsEventLogging(), IsGlob(), IsPathDirectory(), ListFiles(), LocaleCompare(), LogMagickEvent(), MagickCommandOptions, MagickFalse, MagickPath, MagickTrue, MaxTextExtent, OptionFatalError, ParseCommandOption(), RelinquishMagickMemory(), ResizeQuantumMemory(), ResourceLimitFatalError, StringToArgv(), SubimagePath, TailPath, ThrowFatalException, and TraceEvent.

+

References AcquireExceptionInfo(), AcquireQuantumMemory(), AcquireString(), ConcatenateMagickString(), ConcatenateString(), ConfigureEvent, ConstantString(), CopyMagickString(), DestroyExceptionInfo(), DestroyString(), DirectorySeparator, ExpandFilename(), FileToString(), GetMagickModule, GetPathComponent(), HeadPath, IsEventLogging(), IsGlob(), IsPathDirectory(), ListFiles(), LocaleCompare(), LogMagickEvent(), MagickCommandOptions, MagickFalse, MagickPath, MagickTrue, MagickPathExtent, OptionFatalError, ParseCommandOption(), RelinquishMagickMemory(), ResizeQuantumMemory(), ResourceLimitFatalError, StringToArgv(), SubimagePath, TailPath, ThrowFatalException, and TraceEvent.

@@ -450,7 +450,7 @@ Variables

Definition at line 978 of file utility.c.

-

References AcquireQuantumMemory(), ConcatenateMagickString(), CopyMagickString(), DirectorySeparator, FormatLocaleString(), IsPathAccessible(), MaxTextExtent, PATH_MAX, and RelinquishMagickMemory().

+

References AcquireQuantumMemory(), ConcatenateMagickString(), CopyMagickString(), DirectorySeparator, FormatLocaleString(), IsPathAccessible(), MagickPathExtent, PATH_MAX, and RelinquishMagickMemory().

@@ -538,7 +538,7 @@ Variables

Definition at line 1198 of file utility.c.

-

References BasePath, CanonicalPath, CopyMagickMemory(), CopyMagickString(), ExtensionPath, GetMagickModule, HeadPath, IsBasenameSeparator, IsGeometry(), IsMagickConflict(), IsPathAccessible(), IsPathDirectory(), IsSceneGeometry(), LogMagickEvent(), MagickFalse, MagickPath, MaxTextExtent, RootPath, SubimagePath, TailPath, TraceEvent, and UndefinedPath.

+

References BasePath, CanonicalPath, CopyMagickMemory(), CopyMagickString(), ExtensionPath, GetMagickModule, HeadPath, IsBasenameSeparator, IsGeometry(), IsMagickConflict(), IsPathAccessible(), IsPathDirectory(), IsSceneGeometry(), LogMagickEvent(), MagickFalse, MagickPath, MagickPathExtent, RootPath, SubimagePath, TailPath, TraceEvent, and UndefinedPath.

Referenced by AddPathToXMLTree(), AppendImageFormat(), ChopPathComponents(), ExpandFilenames(), GetMagickProperty(), GetMagickPropertyLetter(), GetXMLTreePath(), IdentifyImage(), LoadCoderList(), LoadColorList(), LoadConfigureList(), LoadDelegateList(), LoadLocaleList(), LoadLogList(), LoadMagicList(), LoadMimeList(), LoadPolicyList(), LoadTypeList(), MagickCoreGenesis(), OpenBlob(), ReadImage(), SetImageInfo(), ThrowMagickExceptionList(), and WriteImage().

@@ -570,7 +570,7 @@ Variables

Definition at line 1371 of file utility.c.

-

References AcquireQuantumMemory(), CopyMagickString(), IsBasenameSeparator, MaxTextExtent, ResourceLimitFatalError, and ThrowFatalException.

+

References AcquireQuantumMemory(), CopyMagickString(), IsBasenameSeparator, MagickPathExtent, ResourceLimitFatalError, and ThrowFatalException.

@@ -850,7 +850,7 @@ Variables

Definition at line 1924 of file utility.c.

-

References AcquireString(), ConcatenateMagickString(), DelegateError, DelegatePolicyDomain, DestroyString(), ExecutePolicyRights, FormatLocaleFile(), GetMagickModule, IsRightsAuthorized(), MACSystemCommand(), MagickFalse, MaxTextExtent, PolicyError, RelinquishMagickMemory(), StringToArgv(), and ThrowMagickException().

+

References AcquireString(), ConcatenateMagickString(), DelegateError, DelegatePolicyDomain, DestroyString(), ExecutePolicyRights, FormatLocaleFile(), GetMagickModule, IsRightsAuthorized(), MACSystemCommand(), MagickFalse, MagickPathExtent, PolicyError, RelinquishMagickMemory(), StringToArgv(), and ThrowMagickException().

Referenced by InvokeDelegate().

diff --git a/www/api/MagickCore/utility_8h.html b/www/api/MagickCore/utility_8h.html index 39b07e176..0cf6b4c1a 100644 --- a/www/api/MagickCore/utility_8h.html +++ b/www/api/MagickCore/utility_8h.html @@ -368,7 +368,7 @@ Functions

Definition at line 1198 of file utility.c.

-

References BasePath, CanonicalPath, CopyMagickMemory(), CopyMagickString(), ExtensionPath, GetMagickModule, HeadPath, IsBasenameSeparator, IsGeometry(), IsMagickConflict(), IsPathAccessible(), IsPathDirectory(), IsSceneGeometry(), LogMagickEvent(), MagickFalse, MagickPath, MaxTextExtent, RootPath, SubimagePath, TailPath, TraceEvent, and UndefinedPath.

+

References BasePath, CanonicalPath, CopyMagickMemory(), CopyMagickString(), ExtensionPath, GetMagickModule, HeadPath, IsBasenameSeparator, IsGeometry(), IsMagickConflict(), IsPathAccessible(), IsPathDirectory(), IsSceneGeometry(), LogMagickEvent(), MagickFalse, MagickPath, MagickPathExtent, RootPath, SubimagePath, TailPath, TraceEvent, and UndefinedPath.

Referenced by AddPathToXMLTree(), AppendImageFormat(), ChopPathComponents(), ExpandFilenames(), GetMagickProperty(), GetMagickPropertyLetter(), GetXMLTreePath(), IdentifyImage(), LoadCoderList(), LoadColorList(), LoadConfigureList(), LoadDelegateList(), LoadLocaleList(), LoadLogList(), LoadMagicList(), LoadMimeList(), LoadPolicyList(), LoadTypeList(), MagickCoreGenesis(), OpenBlob(), ReadImage(), SetImageInfo(), ThrowMagickExceptionList(), and WriteImage().

@@ -454,7 +454,7 @@ Functions

Definition at line 1924 of file utility.c.

-

References AcquireString(), ConcatenateMagickString(), DelegateError, DelegatePolicyDomain, DestroyString(), ExecutePolicyRights, FormatLocaleFile(), GetMagickModule, IsRightsAuthorized(), MACSystemCommand(), MagickFalse, MaxTextExtent, PolicyError, RelinquishMagickMemory(), StringToArgv(), and ThrowMagickException().

+

References AcquireString(), ConcatenateMagickString(), DelegateError, DelegatePolicyDomain, DestroyString(), ExecutePolicyRights, FormatLocaleFile(), GetMagickModule, IsRightsAuthorized(), MACSystemCommand(), MagickFalse, MagickPathExtent, PolicyError, RelinquishMagickMemory(), StringToArgv(), and ThrowMagickException().

Referenced by InvokeDelegate().

diff --git a/www/api/MagickCore/version_8c.html b/www/api/MagickCore/version_8c.html index d309a0902..f18f91638 100644 --- a/www/api/MagickCore/version_8c.html +++ b/www/api/MagickCore/version_8c.html @@ -250,7 +250,7 @@ Functions

Definition at line 147 of file version.c.

-

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), DirectorySeparator, FormatLocaleString(), GetConfigurePaths(), GetNextValueInLinkedList(), IsPathAccessible(), MagickFalse, MagickHomeURL, MagickURLFilename, and MaxTextExtent.

+

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), DirectorySeparator, FormatLocaleString(), GetConfigurePaths(), GetNextValueInLinkedList(), IsPathAccessible(), MagickFalse, MagickHomeURL, MagickURLFilename, and MagickPathExtent.

@@ -350,7 +350,7 @@ Functions

Definition at line 354 of file version.c.

-

References AcquireStringInfo(), ConcatenateStringInfo(), CRC32(), DestroyStringInfo(), GetStringInfoDatum(), GetStringInfoLength(), MAGICKCORE_QUANTUM_DEPTH, MagickLibInterface, MaxTextExtent, and SetStringInfoLength().

+

References AcquireStringInfo(), ConcatenateStringInfo(), CRC32(), DestroyStringInfo(), GetStringInfoDatum(), GetStringInfoLength(), MAGICKCORE_QUANTUM_DEPTH, MagickLibInterface, MagickPathExtent, and SetStringInfoLength().

Referenced by ConnectPixelCacheServer(), and DistributePixelCacheClient().

diff --git a/www/api/MagickCore/version_8h.html b/www/api/MagickCore/version_8h.html index ff928d0a7..b997d9868 100644 --- a/www/api/MagickCore/version_8h.html +++ b/www/api/MagickCore/version_8h.html @@ -473,7 +473,7 @@ Functions

Definition at line 147 of file version.c.

-

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), DirectorySeparator, FormatLocaleString(), GetConfigurePaths(), GetNextValueInLinkedList(), IsPathAccessible(), MagickFalse, MagickHomeURL, MagickURLFilename, and MaxTextExtent.

+

References AcquireExceptionInfo(), ConstantString(), DestroyExceptionInfo(), DirectorySeparator, FormatLocaleString(), GetConfigurePaths(), GetNextValueInLinkedList(), IsPathAccessible(), MagickFalse, MagickHomeURL, MagickURLFilename, and MagickPathExtent.

diff --git a/www/api/MagickCore/xml-tree_8c.html b/www/api/MagickCore/xml-tree_8c.html index f68a81e12..a20e2da10 100644 --- a/www/api/MagickCore/xml-tree_8c.html +++ b/www/api/MagickCore/xml-tree_8c.html @@ -294,7 +294,7 @@ Variables

Definition at line 212 of file xml-tree.c.

-

References AddChildToXMLTree(), CanonicalPath, _XMLTreeInfo::child, DestroyString(), GetMagickModule, GetPathComponent(), GetPathComponents(), GetXMLTreeChild(), GetXMLTreeOrdered(), LogMagickEvent(), MagickSignature, MaxTextExtent, RelinquishMagickMemory(), _XMLTreeInfo::signature, StringToLong(), SubimagePath, _XMLTreeInfo::tag, and TraceEvent.

+

References AddChildToXMLTree(), CanonicalPath, _XMLTreeInfo::child, DestroyString(), GetMagickModule, GetPathComponent(), GetPathComponents(), GetXMLTreeChild(), GetXMLTreeOrdered(), LogMagickEvent(), MagickSignature, MagickPathExtent, RelinquishMagickMemory(), _XMLTreeInfo::signature, StringToLong(), SubimagePath, _XMLTreeInfo::tag, and TraceEvent.

@@ -324,7 +324,7 @@ Variables

Definition at line 296 of file xml-tree.c.

-

References AcquireString(), Base64Encode(), ConcatenateString(), ConvertLatin1ToUTF8(), DestroyString(), FormatLocaleString(), MagickFalse, MaxTextExtent, RelinquishMagickMemory(), and ResizeQuantumMemory().

+

References AcquireString(), Base64Encode(), ConcatenateString(), ConvertLatin1ToUTF8(), DestroyString(), FormatLocaleString(), MagickFalse, MagickPathExtent, RelinquishMagickMemory(), and ResizeQuantumMemory().

Referenced by EncodePredefinedEntities().

@@ -364,7 +364,7 @@ Variables

Definition at line 1088 of file xml-tree.c.

-

References AcquireQuantumMemory(), CopyMagickMemory(), MaxTextExtent, and ResizeQuantumMemory().

+

References AcquireQuantumMemory(), CopyMagickMemory(), MagickPathExtent, and ResizeQuantumMemory().

Referenced by NewXMLTree().

@@ -480,7 +480,7 @@ Variables

Definition at line 2339 of file xml-tree.c.

-

References AcquireString(), CanonicalXMLContent(), _XMLTreeInfo::content, DestroyString(), FormatLocaleString(), MaxTextExtent, _XMLTreeInfo::offset, and ResizeQuantumMemory().

+

References AcquireString(), CanonicalXMLContent(), _XMLTreeInfo::content, DestroyString(), FormatLocaleString(), MagickPathExtent, _XMLTreeInfo::offset, and ResizeQuantumMemory().

Referenced by XMLTreeTagToXML().

@@ -670,7 +670,7 @@ Variables

Definition at line 806 of file xml-tree.c.

-

References CanonicalPath, DestroyString(), GetMagickModule, GetPathComponent(), GetPathComponents(), GetXMLTreeChild(), GetXMLTreeOrdered(), LogMagickEvent(), MagickSignature, MaxTextExtent, RelinquishMagickMemory(), _XMLTreeInfo::signature, StringToLong(), SubimagePath, _XMLTreeInfo::tag, and TraceEvent.

+

References CanonicalPath, DestroyString(), GetMagickModule, GetPathComponent(), GetPathComponents(), GetXMLTreeChild(), GetXMLTreeOrdered(), LogMagickEvent(), MagickSignature, MagickPathExtent, RelinquishMagickMemory(), _XMLTreeInfo::signature, StringToLong(), SubimagePath, _XMLTreeInfo::tag, and TraceEvent.

@@ -1280,7 +1280,7 @@ Variables

Definition at line 2479 of file xml-tree.c.

-

References AcquireString(), _XMLTreeRoot::attributes, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickSignature, MaxTextExtent, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, _XMLTreeRoot::processing_instructions, ResizeQuantumMemory(), _XMLTreeRoot::root, _XMLTreeInfo::signature, _XMLTreeInfo::tag, TraceEvent, and XMLTreeTagToXML().

+

References AcquireString(), _XMLTreeRoot::attributes, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickSignature, MagickPathExtent, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, _XMLTreeRoot::processing_instructions, ResizeQuantumMemory(), _XMLTreeRoot::root, _XMLTreeInfo::signature, _XMLTreeInfo::tag, TraceEvent, and XMLTreeTagToXML().

@@ -1342,7 +1342,7 @@ Variables

Definition at line 2373 of file xml-tree.c.

-

References _XMLTreeInfo::attributes, _XMLTreeInfo::child, _XMLTreeInfo::content, EncodePredefinedEntities(), FormatLocaleString(), GetXMLTreeAttribute(), MagickFalse, MagickTrue, MaxTextExtent, _XMLTreeInfo::offset, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, ResizeQuantumMemory(), and _XMLTreeInfo::tag.

+

References _XMLTreeInfo::attributes, _XMLTreeInfo::child, _XMLTreeInfo::content, EncodePredefinedEntities(), FormatLocaleString(), GetXMLTreeAttribute(), MagickFalse, MagickTrue, MagickPathExtent, _XMLTreeInfo::offset, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, ResizeQuantumMemory(), and _XMLTreeInfo::tag.

Referenced by XMLTreeInfoToXML().

diff --git a/www/api/MagickCore/xml-tree_8h.html b/www/api/MagickCore/xml-tree_8h.html index 30f3b65c6..0901dda98 100644 --- a/www/api/MagickCore/xml-tree_8h.html +++ b/www/api/MagickCore/xml-tree_8h.html @@ -373,7 +373,7 @@ Functions

Definition at line 2479 of file xml-tree.c.

-

References AcquireString(), _XMLTreeRoot::attributes, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickSignature, MaxTextExtent, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, _XMLTreeRoot::processing_instructions, ResizeQuantumMemory(), _XMLTreeRoot::root, _XMLTreeInfo::signature, _XMLTreeInfo::tag, TraceEvent, and XMLTreeTagToXML().

+

References AcquireString(), _XMLTreeRoot::attributes, FormatLocaleString(), GetMagickModule, LogMagickEvent(), MagickSignature, MagickPathExtent, _XMLTreeInfo::ordered, _XMLTreeInfo::parent, _XMLTreeRoot::processing_instructions, ResizeQuantumMemory(), _XMLTreeRoot::root, _XMLTreeInfo::signature, _XMLTreeInfo::tag, TraceEvent, and XMLTreeTagToXML().

diff --git a/www/api/MagickWand/MagickWand_8h.html b/www/api/MagickWand/MagickWand_8h.html index 1ba12a884..6320cc21e 100644 --- a/www/api/MagickWand/MagickWand_8h.html +++ b/www/api/MagickWand/MagickWand_8h.html @@ -346,7 +346,7 @@ Functions

Definition at line 283 of file magick-wand.c.

-

References _MagickWand::debug, _MagickWand::exception, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

diff --git a/www/api/MagickWand/animate_8c.html b/www/api/MagickWand/animate_8c.html index 6e34c9580..eae5d5416 100644 --- a/www/api/MagickWand/animate_8c.html +++ b/www/api/MagickWand/animate_8c.html @@ -125,7 +125,7 @@ Functions

Definition at line 228 of file animate.c.

-

References AnimateUsage(), AppendImageStack, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, SetNotifyHandlers, and STDIN_FILENO.

+

References AnimateUsage(), AppendImageStack, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, SetNotifyHandlers, and STDIN_FILENO.

diff --git a/www/api/MagickWand/compare_8c.html b/www/api/MagickWand/compare_8c.html index c99791dbf..da22fb9a1 100644 --- a/www/api/MagickWand/compare_8c.html +++ b/www/api/MagickWand/compare_8c.html @@ -267,7 +267,7 @@ Functions

Definition at line 174 of file compare.c.

-

References AppendImageStack, CompareUsage(), DefaultDissimilarityThreshold, DefaultSimilarityThreshold, DestroyCompare, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowCompareException, and ThrowCompareInvalidArgumentException.

+

References AppendImageStack, CompareUsage(), DefaultDissimilarityThreshold, DefaultSimilarityThreshold, DestroyCompare, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowCompareException, and ThrowCompareInvalidArgumentException.

diff --git a/www/api/MagickWand/compare_8h.html b/www/api/MagickWand/compare_8h.html index 7ca938121..d56d21241 100644 --- a/www/api/MagickWand/compare_8h.html +++ b/www/api/MagickWand/compare_8h.html @@ -116,7 +116,7 @@ Functions

Definition at line 174 of file compare.c.

-

References AppendImageStack, CompareUsage(), DefaultDissimilarityThreshold, DefaultSimilarityThreshold, DestroyCompare, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowCompareException, and ThrowCompareInvalidArgumentException.

+

References AppendImageStack, CompareUsage(), DefaultDissimilarityThreshold, DefaultSimilarityThreshold, DestroyCompare, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowCompareException, and ThrowCompareInvalidArgumentException.

diff --git a/www/api/MagickWand/composite_8c.html b/www/api/MagickWand/composite_8c.html index ef1d75e98..122c5fee1 100644 --- a/www/api/MagickWand/composite_8c.html +++ b/www/api/MagickWand/composite_8c.html @@ -276,7 +276,7 @@ Functions

Definition at line 382 of file composite.c.

-

References AppendImageStack, _CompositeOptions::channel, _CompositeOptions::compose, _CompositeOptions::compose_args, CompositeImageList(), CompositeUsage(), DestroyComposite, FinalizeImageSettings, FireImageStack, _CompositeOptions::geometry, GetCompositeOptions(), _CompositeOptions::gravity, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, _CompositeOptions::offset, PopImageStack, PushImageStack, ReadCommandlLine, RelinquishCompositeOptions(), RemoveImageStack, _CompositeOptions::stegano, _CompositeOptions::stereo, ThrowCompositeException, ThrowCompositeInvalidArgumentException, and _CompositeOptions::tile.

+

References AppendImageStack, _CompositeOptions::channel, _CompositeOptions::compose, _CompositeOptions::compose_args, CompositeImageList(), CompositeUsage(), DestroyComposite, FinalizeImageSettings, FireImageStack, _CompositeOptions::geometry, GetCompositeOptions(), _CompositeOptions::gravity, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, _CompositeOptions::offset, PopImageStack, PushImageStack, ReadCommandlLine, RelinquishCompositeOptions(), RemoveImageStack, _CompositeOptions::stegano, _CompositeOptions::stereo, ThrowCompositeException, ThrowCompositeInvalidArgumentException, and _CompositeOptions::tile.

diff --git a/www/api/MagickWand/composite_8h.html b/www/api/MagickWand/composite_8h.html index 25356653c..f8df6d7d0 100644 --- a/www/api/MagickWand/composite_8h.html +++ b/www/api/MagickWand/composite_8h.html @@ -116,7 +116,7 @@ Functions

Definition at line 382 of file composite.c.

-

References AppendImageStack, _CompositeOptions::channel, _CompositeOptions::compose, _CompositeOptions::compose_args, CompositeImageList(), CompositeUsage(), DestroyComposite, FinalizeImageSettings, FireImageStack, _CompositeOptions::geometry, GetCompositeOptions(), _CompositeOptions::gravity, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, _CompositeOptions::offset, PopImageStack, PushImageStack, ReadCommandlLine, RelinquishCompositeOptions(), RemoveImageStack, _CompositeOptions::stegano, _CompositeOptions::stereo, ThrowCompositeException, ThrowCompositeInvalidArgumentException, and _CompositeOptions::tile.

+

References AppendImageStack, _CompositeOptions::channel, _CompositeOptions::compose, _CompositeOptions::compose_args, CompositeImageList(), CompositeUsage(), DestroyComposite, FinalizeImageSettings, FireImageStack, _CompositeOptions::geometry, GetCompositeOptions(), _CompositeOptions::gravity, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, _CompositeOptions::offset, PopImageStack, PushImageStack, ReadCommandlLine, RelinquishCompositeOptions(), RemoveImageStack, _CompositeOptions::stegano, _CompositeOptions::stereo, ThrowCompositeException, ThrowCompositeInvalidArgumentException, and _CompositeOptions::tile.

diff --git a/www/api/MagickWand/conjure_8c.html b/www/api/MagickWand/conjure_8c.html index d5cf86e28..942ac6366 100644 --- a/www/api/MagickWand/conjure_8c.html +++ b/www/api/MagickWand/conjure_8c.html @@ -227,7 +227,7 @@ Functions

Definition at line 130 of file conjure.c.

-

References ConjureUsage(), MaxTextExtent, ReadCommandlLine, ThrowConjureException, and ThrowConjureInvalidArgumentException.

+

References ConjureUsage(), MagickPathExtent, ReadCommandlLine, ThrowConjureException, and ThrowConjureInvalidArgumentException.

diff --git a/www/api/MagickWand/convert_8c.html b/www/api/MagickWand/convert_8c.html index b692f0e8e..d346109be 100644 --- a/www/api/MagickWand/convert_8c.html +++ b/www/api/MagickWand/convert_8c.html @@ -346,7 +346,7 @@ Functions

Definition at line 485 of file convert.c.

-

References AppendImageStack, ConcatenateImages(), ConvertUsage(), DestroyConvert, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowConvertException, and ThrowConvertInvalidArgumentException.

+

References AppendImageStack, ConcatenateImages(), ConvertUsage(), DestroyConvert, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowConvertException, and ThrowConvertInvalidArgumentException.

diff --git a/www/api/MagickWand/convert_8h.html b/www/api/MagickWand/convert_8h.html index 586173225..b886d5188 100644 --- a/www/api/MagickWand/convert_8h.html +++ b/www/api/MagickWand/convert_8h.html @@ -116,7 +116,7 @@ Functions

Definition at line 485 of file convert.c.

-

References AppendImageStack, ConcatenateImages(), ConvertUsage(), DestroyConvert, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowConvertException, and ThrowConvertInvalidArgumentException.

+

References AppendImageStack, ConcatenateImages(), ConvertUsage(), DestroyConvert, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowConvertException, and ThrowConvertInvalidArgumentException.

diff --git a/www/api/MagickWand/display_8c.html b/www/api/MagickWand/display_8c.html index cb03748d3..27a2a43ae 100644 --- a/www/api/MagickWand/display_8c.html +++ b/www/api/MagickWand/display_8c.html @@ -125,7 +125,7 @@ Functions

Definition at line 263 of file display.c.

-

References AppendImageStack, DisplayUsage(), FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, RemoveAllImageStack, SetNotifyHandlers, and STDIN_FILENO.

+

References AppendImageStack, DisplayUsage(), FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, RemoveAllImageStack, SetNotifyHandlers, and STDIN_FILENO.

diff --git a/www/api/MagickWand/drawing-wand_8c.html b/www/api/MagickWand/drawing-wand_8c.html index 44af29baf..5c1e6b2d8 100644 --- a/www/api/MagickWand/drawing-wand_8c.html +++ b/www/api/MagickWand/drawing-wand_8c.html @@ -639,7 +639,7 @@ Functions

Definition at line 549 of file drawing-wand.c.

-

References AcquireWandId(), _DrawingWand::debug, _DrawingWand::destroy, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MaxTextExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _DrawingWand::debug, _DrawingWand::destroy, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MagickPathExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

@@ -1057,7 +1057,7 @@ Functions

Definition at line 981 of file drawing-wand.c.

-

References _DrawingWand::debug, _DrawingWand::exception, GetImageFromMagickWand(), MaxTextExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

+

References _DrawingWand::debug, _DrawingWand::exception, GetImageFromMagickWand(), MagickPathExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

@@ -1257,7 +1257,7 @@ Functions

Definition at line 1347 of file drawing-wand.c.

-

References _DrawingWand::debug, _DrawingWand::exception, MaxTextExtent, _DrawingWand::name, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

+

References _DrawingWand::debug, _DrawingWand::exception, MagickPathExtent, _DrawingWand::name, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

@@ -1921,7 +1921,7 @@ Functions

Definition at line 2418 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MaxTextExtent, _DrawingWand::mvg, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MagickPathExtent, _DrawingWand::mvg, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

@@ -3553,7 +3553,7 @@ Functions

Definition at line 4052 of file drawing-wand.c.

-

References _DrawingWand::debug, _DrawingWand::filter_off, _DrawingWand::image, _DrawingWand::indent_depth, MaxTextExtent, _DrawingWand::mvg, MvgPrintf(), _DrawingWand::name, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowDrawException, and WandSignature.

+

References _DrawingWand::debug, _DrawingWand::filter_off, _DrawingWand::image, _DrawingWand::indent_depth, MagickPathExtent, _DrawingWand::mvg, MvgPrintf(), _DrawingWand::name, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowDrawException, and WandSignature.

@@ -4111,7 +4111,7 @@ Functions

Definition at line 4861 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MaxTextExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MagickPathExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

@@ -4237,7 +4237,7 @@ Functions

Definition at line 4774 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, MaxTextExtent, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, MagickPathExtent, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

@@ -4663,7 +4663,7 @@ Functions

Definition at line 5304 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MaxTextExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MagickPathExtent, MvgPrintf(), _DrawingWand::name, _DrawingWand::signature, ThrowDrawException, and WandSignature.

@@ -4963,7 +4963,7 @@ Functions

Definition at line 6136 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, _DrawingWand::exception, IsPoint(), MaxTextExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::name, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, _DrawingWand::exception, IsPoint(), MagickPathExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::name, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

@@ -5193,7 +5193,7 @@ Functions

Definition at line 389 of file drawing-wand.c.

-

References _DrawingWand::image, MaxTextExtent, and MvgPrintf().

+

References _DrawingWand::image, MagickPathExtent, and MvgPrintf().

Referenced by DrawSetBorderColor(), DrawSetFillColor(), DrawSetStrokeColor(), and DrawSetTextUnderColor().

@@ -5291,7 +5291,7 @@ Functions

Definition at line 359 of file drawing-wand.c.

-

References MaxTextExtent, _DrawingWand::mvg_width, MvgPrintf(), and ThrowDrawException.

+

References MagickPathExtent, _DrawingWand::mvg_width, MvgPrintf(), and ThrowDrawException.

Referenced by DrawPathClose(), DrawPathCurveTo(), DrawPathCurveToQuadraticBezier(), DrawPathCurveToQuadraticBezierSmooth(), DrawPathCurveToSmooth(), DrawPathEllipticArc(), DrawPathLineTo(), DrawPathLineToHorizontal(), DrawPathLineToVertical(), DrawPathMoveTo(), and MvgAppendPointsCommand().

@@ -5337,7 +5337,7 @@ Functions

Definition at line 269 of file drawing-wand.c.

-

References MaxTextExtent, ThrowDrawException, and WandSignature.

+

References MagickPathExtent, ThrowDrawException, and WandSignature.

Referenced by DrawAffine(), DrawAnnotation(), DrawArc(), DrawCircle(), DrawColor(), DrawComment(), DrawComposite(), DrawEllipse(), DrawLine(), DrawMatte(), DrawPathFinish(), DrawPathStart(), DrawPoint(), DrawPopClipPath(), DrawPopDefs(), DrawPopPattern(), DrawPushClipPath(), DrawPushDefs(), DrawPushPattern(), DrawRectangle(), DrawRotate(), DrawRoundRectangle(), DrawScale(), DrawSetAlpha(), DrawSetBorderColor(), DrawSetClipPath(), DrawSetClipRule(), DrawSetClipUnits(), DrawSetFillAlpha(), DrawSetFillColor(), DrawSetFillPatternURL(), DrawSetFillRule(), DrawSetFont(), DrawSetFontFamily(), DrawSetFontSize(), DrawSetFontStretch(), DrawSetFontStyle(), DrawSetFontWeight(), DrawSetGravity(), DrawSetStrokeAlpha(), DrawSetStrokeAntialias(), DrawSetStrokeColor(), DrawSetStrokeDashArray(), DrawSetStrokeDashOffset(), DrawSetStrokeLineCap(), DrawSetStrokeLineJoin(), DrawSetStrokeMiterLimit(), DrawSetStrokePatternURL(), DrawSetStrokeWidth(), DrawSetTextAlignment(), DrawSetTextAntialias(), DrawSetTextDecoration(), DrawSetTextEncoding(), DrawSetTextInterlineSpacing(), DrawSetTextInterwordSpacing(), DrawSetTextKerning(), DrawSetTextUnderColor(), DrawSetViewbox(), DrawSkewX(), DrawSkewY(), DrawTranslate(), MvgAppendColor(), MvgAppendPointsCommand(), MvgAutoWrapPrintf(), PopDrawingWand(), and PushDrawingWand().

@@ -5359,7 +5359,7 @@ Functions

Definition at line 6604 of file drawing-wand.c.

-

References AcquireWandId(), CurrentContext, _DrawingWand::debug, DefaultPathMode, _DrawingWand::destroy, DrawingWandId, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MaxTextExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, PathDefaultOperation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), CurrentContext, _DrawingWand::debug, DefaultPathMode, _DrawingWand::destroy, DrawingWandId, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MagickPathExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, PathDefaultOperation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by DrawAllocateWand().

diff --git a/www/api/MagickWand/drawing-wand_8h.html b/www/api/MagickWand/drawing-wand_8h.html index b31416a61..622c988ce 100644 --- a/www/api/MagickWand/drawing-wand_8h.html +++ b/www/api/MagickWand/drawing-wand_8h.html @@ -1527,7 +1527,7 @@ Functions

Definition at line 2418 of file drawing-wand.c.

-

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MaxTextExtent, _DrawingWand::mvg, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

+

References CurrentContext, _DrawingWand::debug, _DrawingWand::image, MagickPathExtent, _DrawingWand::mvg, _DrawingWand::name, _DrawingWand::signature, and WandSignature.

@@ -3907,7 +3907,7 @@ Functions

Definition at line 6604 of file drawing-wand.c.

-

References AcquireWandId(), CurrentContext, _DrawingWand::debug, DefaultPathMode, _DrawingWand::destroy, DrawingWandId, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MaxTextExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, PathDefaultOperation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), CurrentContext, _DrawingWand::debug, DefaultPathMode, _DrawingWand::destroy, DrawingWandId, _DrawingWand::exception, _DrawingWand::filter_off, _DrawingWand::graphic_context, _DrawingWand::id, _DrawingWand::image, _DrawingWand::indent_depth, _DrawingWand::index, MagickPathExtent, _DrawingWand::mvg, _DrawingWand::mvg_alloc, _DrawingWand::mvg_length, _DrawingWand::mvg_width, _DrawingWand::name, _DrawingWand::path_mode, _DrawingWand::path_operation, PathDefaultOperation, _DrawingWand::pattern_bounds, _DrawingWand::pattern_id, _DrawingWand::pattern_offset, _DrawingWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by DrawAllocateWand().

diff --git a/www/api/MagickWand/import_8c.html b/www/api/MagickWand/import_8c.html index a6e3c6123..7eed784c4 100644 --- a/www/api/MagickWand/import_8c.html +++ b/www/api/MagickWand/import_8c.html @@ -125,7 +125,7 @@ Functions

Definition at line 218 of file import.c.

-

References AppendImageStack, FinalizeImageSettings, FireImageStack, _DrawingWand::image, ImportUsage(), MagickMax(), MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, and SetNotifyHandlers.

+

References AppendImageStack, FinalizeImageSettings, FireImageStack, _DrawingWand::image, ImportUsage(), MagickMax(), MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, and SetNotifyHandlers.

diff --git a/www/api/MagickWand/magick-image_8c.html b/www/api/MagickWand/magick-image_8c.html index db31be4d2..3f208271b 100644 --- a/www/api/MagickWand/magick-image_8c.html +++ b/www/api/MagickWand/magick-image_8c.html @@ -697,7 +697,7 @@ Functions

Definition at line 92 of file magick-image.c.

-

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::images, MagickWandId, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::images, MagickWandId, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by MagickAppendImages(), MagickChannelFxImage(), MagickCoalesceImages(), MagickCombineImages(), MagickCompareImages(), MagickCompareImagesLayers(), MagickDeconstructImages(), MagickEvaluateImages(), MagickFxImage(), MagickGetImage(), MagickGetImageMask(), MagickGetImageRegion(), MagickMergeImageLayers(), MagickMontageImage(), MagickMorphImages(), MagickOptimizeImageLayers(), MagickPreviewImages(), MagickSimilarityImage(), MagickSmushImages(), MagickSteganoImage(), MagickStereoImage(), MagickTextureImage(), and MagickTransformImage().

@@ -1091,7 +1091,7 @@ Functions

Definition at line 598 of file magick-image.c.

-

References _MagickWand::debug, DegreesToRadians, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, PeekDrawingWand(), _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, DegreesToRadians, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, PeekDrawingWand(), _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -1191,7 +1191,7 @@ Functions

Definition at line 825 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -1653,7 +1653,7 @@ Functions

Definition at line 1509 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlackQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetPixel(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlackQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetPixel(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -4575,7 +4575,7 @@ Functions

Definition at line 5914 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -5023,7 +5023,7 @@ Functions

Definition at line 6557 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -5489,7 +5489,7 @@ Functions

Definition at line 7320 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, InsertImageInWand(), MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, InsertImageInWand(), MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -5917,7 +5917,7 @@ Functions

Definition at line 7932 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -5947,7 +5947,7 @@ Functions

Definition at line 7977 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, InsertImageInWand(), MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, InsertImageInWand(), MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -7035,7 +7035,7 @@ Functions

Definition at line 9441 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -7065,7 +7065,7 @@ Functions

Definition at line 9481 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -8641,7 +8641,7 @@ Functions

Definition at line 11532 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlackQuantum(), PixelGetBlueQuantum(), PixelGetCyanQuantum(), PixelGetGreenQuantum(), PixelGetMagentaQuantum(), PixelGetPixel(), PixelGetRedQuantum(), PixelGetYellowQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlackQuantum(), PixelGetBlueQuantum(), PixelGetCyanQuantum(), PixelGetGreenQuantum(), PixelGetMagentaQuantum(), PixelGetPixel(), PixelGetRedQuantum(), PixelGetYellowQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -9013,7 +9013,7 @@ Functions

Definition at line 12095 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, PixelGetAlphaQuantum(), PixelGetBlueQuantum(), PixelGetGreenQuantum(), PixelGetRedQuantum(), _MagickWand::signature, ThrowWandException, and WandSignature.

@@ -9043,7 +9043,7 @@ Functions

Definition at line 12142 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _DrawingWand::image, _MagickWand::image_info, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _DrawingWand::image, _MagickWand::image_info, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandException, and WandSignature.

diff --git a/www/api/MagickWand/magick-image_8h.html b/www/api/MagickWand/magick-image_8h.html index 3e24b854b..c9d2eaecc 100644 --- a/www/api/MagickWand/magick-image_8h.html +++ b/www/api/MagickWand/magick-image_8h.html @@ -3996,7 +3996,7 @@ Functions

Definition at line 5914 of file magick-image.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::images, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

diff --git a/www/api/MagickWand/magick-property_8c.html b/www/api/MagickWand/magick-property_8c.html index ff41421eb..96235ca11 100644 --- a/www/api/MagickWand/magick-property_8c.html +++ b/www/api/MagickWand/magick-property_8c.html @@ -1527,7 +1527,7 @@ Functions

Definition at line 2080 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -1557,7 +1557,7 @@ Functions

Definition at line 2118 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -1617,7 +1617,7 @@ Functions

Definition at line 2192 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -1935,7 +1935,7 @@ Functions

Definition at line 2583 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -2067,7 +2067,7 @@ Functions

Definition at line 2788 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -2131,7 +2131,7 @@ Functions

Definition at line 2833 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -2167,7 +2167,7 @@ Functions

Definition at line 2893 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -2209,7 +2209,7 @@ Functions

Definition at line 2941 of file magick-property.c.

-

References _MagickWand::debug, _MagickWand::image_info, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::image_info, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

diff --git a/www/api/MagickWand/magick-wand_8c.html b/www/api/MagickWand/magick-wand_8c.html index c37aef53e..e72e6efef 100644 --- a/www/api/MagickWand/magick-wand_8c.html +++ b/www/api/MagickWand/magick-wand_8c.html @@ -202,7 +202,7 @@ Functions

Definition at line 124 of file magick-wand.c.

-

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::image_pending, _MagickWand::images, _MagickWand::insert_before, MagickWandId, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::image_pending, _MagickWand::images, _MagickWand::insert_before, MagickWandId, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

@@ -292,7 +292,7 @@ Functions

Definition at line 283 of file magick-wand.c.

-

References _MagickWand::debug, _MagickWand::exception, MaxTextExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

+

References _MagickWand::debug, _MagickWand::exception, MagickPathExtent, _MagickWand::name, _MagickWand::signature, and WandSignature.

@@ -674,7 +674,7 @@ Functions

Definition at line 1061 of file magick-wand.c.

-

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::images, MagickWandId, MaxTextExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _MagickWand::debug, _MagickWand::exception, _MagickWand::id, _MagickWand::image_info, _MagickWand::images, MagickWandId, MagickPathExtent, _MagickWand::name, _MagickWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by NewMagickWandFromImage().

diff --git a/www/api/MagickWand/mogrify_8c.html b/www/api/MagickWand/mogrify_8c.html index 9f9f13e93..1cf61ad80 100644 --- a/www/api/MagickWand/mogrify_8c.html +++ b/www/api/MagickWand/mogrify_8c.html @@ -298,7 +298,7 @@ Variables

Definition at line 343 of file mogrify.c.

-

References MaxTextExtent.

+

References MagickPathExtent.

Referenced by MogrifyImage().

@@ -466,7 +466,7 @@ Variables

Definition at line 657 of file mogrify.c.

-

References DegreesToRadians, GetImageCache(), MagickMax(), MaxTextExtent, MogrifyBorderColor, MogrifyImageInfo(), MonitorProgress(), SparseColorOption(), and ThrowWandFatalException.

+

References DegreesToRadians, GetImageCache(), MagickMax(), MagickPathExtent, MogrifyBorderColor, MogrifyImageInfo(), MonitorProgress(), SparseColorOption(), and ThrowWandFatalException.

Referenced by MogrifyImages().

@@ -516,7 +516,7 @@ Variables

Definition at line 3577 of file mogrify.c.

-

References AppendImageStack, DestroyMogrify, DirectorySeparator, FinalizeImageSettings, FireImageStack, IsPathWritable(), MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), MogrifyUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, RemoveAllImageStack, ThrowMogrifyException, and ThrowMogrifyInvalidArgumentException.

+

References AppendImageStack, DestroyMogrify, DirectorySeparator, FinalizeImageSettings, FireImageStack, IsPathWritable(), MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), MogrifyUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, RemoveAllImageStack, ThrowMogrifyException, and ThrowMogrifyInvalidArgumentException.

@@ -558,7 +558,7 @@ Variables

Definition at line 6185 of file mogrify.c.

-

References MagickMax(), MaxTextExtent, MogrifyBackgroundColor, MogrifyBorderColor, MogrifyMatteColor, MonitorProgress(), and UndefinedCompressionQuality.

+

References MagickMax(), MagickPathExtent, MogrifyBackgroundColor, MogrifyBorderColor, MogrifyMatteColor, MonitorProgress(), and UndefinedCompressionQuality.

Referenced by AnimateImageCommand(), CompareImagesCommand(), CompositeImageCommand(), ConvertImageCommand(), DisplayImageCommand(), IdentifyImageCommand(), ImportImageCommand(), MogrifyImage(), MogrifyImageCommand(), MogrifyImageList(), MontageImageCommand(), and StreamImageCommand().

@@ -608,7 +608,7 @@ Variables

Definition at line 7304 of file mogrify.c.

-

References MagickMax(), MaxTextExtent, MogrifyImageInfo(), and ThrowWandFatalException.

+

References MagickMax(), MagickPathExtent, MogrifyImageInfo(), and ThrowWandFatalException.

Referenced by MogrifyImages().

@@ -742,7 +742,7 @@ Variables

Definition at line 393 of file mogrify.c.

-

References MaxTextExtent.

+

References MagickPathExtent.

Referenced by MogrifyImage(), and MogrifyImageInfo().

@@ -800,7 +800,7 @@ Variables

Definition at line 431 of file mogrify.c.

-

References MaxTextExtent.

+

References MagickPathExtent.

Referenced by MogrifyImage().

diff --git a/www/api/MagickWand/montage_8c.html b/www/api/MagickWand/montage_8c.html index 263d47c81..b8b334800 100644 --- a/www/api/MagickWand/montage_8c.html +++ b/www/api/MagickWand/montage_8c.html @@ -232,7 +232,7 @@ Functions

Definition at line 260 of file montage.c.

-

References AppendImageStack, DestroyMontage, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), MontageUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowMontageException, and ThrowMontageInvalidArgumentException.

+

References AppendImageStack, DestroyMontage, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), MontageUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowMontageException, and ThrowMontageInvalidArgumentException.

diff --git a/www/api/MagickWand/montage_8h.html b/www/api/MagickWand/montage_8h.html index 7ff091338..4a7578cc2 100644 --- a/www/api/MagickWand/montage_8h.html +++ b/www/api/MagickWand/montage_8h.html @@ -116,7 +116,7 @@ Functions

Definition at line 260 of file montage.c.

-

References AppendImageStack, DestroyMontage, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), MontageUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowMontageException, and ThrowMontageInvalidArgumentException.

+

References AppendImageStack, DestroyMontage, FinalizeImageSettings, FireImageStack, _ImageStack::image, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), MontageUsage(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, ThrowMontageException, and ThrowMontageInvalidArgumentException.

diff --git a/www/api/MagickWand/pixel-iterator_8c.html b/www/api/MagickWand/pixel-iterator_8c.html index b35b84dd5..6c80ff5b0 100644 --- a/www/api/MagickWand/pixel-iterator_8c.html +++ b/www/api/MagickWand/pixel-iterator_8c.html @@ -177,7 +177,7 @@ Functions

Definition at line 156 of file pixel-iterator.c.

-

References AcquireWandId(), _PixelIterator::active, ClonePixelWands(), _PixelIterator::debug, _PixelIterator::exception, _PixelIterator::id, MaxTextExtent, _PixelIterator::name, _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

+

References AcquireWandId(), _PixelIterator::active, ClonePixelWands(), _PixelIterator::debug, _PixelIterator::exception, _PixelIterator::id, MagickPathExtent, _PixelIterator::name, _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

@@ -237,7 +237,7 @@ Functions

Definition at line 288 of file pixel-iterator.c.

-

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MaxTextExtent, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

+

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MagickPathExtent, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

@@ -285,7 +285,7 @@ Functions

Definition at line 404 of file pixel-iterator.c.

-

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MaxTextExtent, _MagickWand::name, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

+

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MagickPathExtent, _MagickWand::name, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

@@ -365,7 +365,7 @@ Functions

Definition at line 545 of file pixel-iterator.c.

-

References _PixelIterator::debug, _PixelIterator::exception, MaxTextExtent, _PixelIterator::name, _PixelIterator::signature, ThrowWandFatalException, and WandSignature.

+

References _PixelIterator::debug, _PixelIterator::exception, MagickPathExtent, _PixelIterator::name, _PixelIterator::signature, ThrowWandFatalException, and WandSignature.

diff --git a/www/api/MagickWand/pixel-iterator_8h.html b/www/api/MagickWand/pixel-iterator_8h.html index 34d8558f3..fcf6fa927 100644 --- a/www/api/MagickWand/pixel-iterator_8h.html +++ b/www/api/MagickWand/pixel-iterator_8h.html @@ -260,7 +260,7 @@ Functions

Definition at line 404 of file pixel-iterator.c.

-

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MaxTextExtent, _MagickWand::name, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

+

References AcquireWandId(), _PixelIterator::debug, _PixelIterator::exception, GetImageFromMagickWand(), _PixelIterator::id, MagickPathExtent, _MagickWand::name, _PixelIterator::name, NewPixelWands(), _PixelIterator::pixel_wands, PixelIteratorId, _PixelIterator::region, _PixelIterator::signature, ThrowWandFatalException, _PixelIterator::view, WandSignature, and _PixelIterator::y.

@@ -332,7 +332,7 @@ Functions

Definition at line 545 of file pixel-iterator.c.

-

References _PixelIterator::debug, _PixelIterator::exception, MaxTextExtent, _PixelIterator::name, _PixelIterator::signature, ThrowWandFatalException, and WandSignature.

+

References _PixelIterator::debug, _PixelIterator::exception, MagickPathExtent, _PixelIterator::name, _PixelIterator::signature, ThrowWandFatalException, and WandSignature.

diff --git a/www/api/MagickWand/pixel-wand_8c.html b/www/api/MagickWand/pixel-wand_8c.html index 10d5cb787..2c644b20f 100644 --- a/www/api/MagickWand/pixel-wand_8c.html +++ b/www/api/MagickWand/pixel-wand_8c.html @@ -264,7 +264,7 @@ Functions

Definition at line 142 of file pixel-wand.c.

-

References AcquireWandId(), _PixelWand::count, _PixelWand::debug, _PixelWand::exception, _PixelWand::id, MaxTextExtent, _PixelWand::name, _PixelWand::pixel, PixelWandId, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _PixelWand::count, _PixelWand::debug, _PixelWand::exception, _PixelWand::id, MagickPathExtent, _PixelWand::name, _PixelWand::pixel, PixelWandId, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by ClonePixelWands().

@@ -428,7 +428,7 @@ Functions

Definition at line 388 of file pixel-wand.c.

-

References AcquireWandId(), _PixelWand::debug, _PixelWand::exception, _PixelWand::id, MaxTextExtent, _PixelWand::name, _PixelWand::pixel, PixelWandId, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

+

References AcquireWandId(), _PixelWand::debug, _PixelWand::exception, _PixelWand::id, MagickPathExtent, _PixelWand::name, _PixelWand::pixel, PixelWandId, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

Referenced by MagickGetBackgroundColor(), MagickMontageImage(), and NewPixelWands().

@@ -618,7 +618,7 @@ Functions

Definition at line 741 of file pixel-wand.c.

-

References _PixelWand::debug, MaxTextExtent, _PixelWand::name, _PixelWand::pixel, _PixelWand::signature, and WandSignature.

+

References _PixelWand::debug, MagickPathExtent, _PixelWand::name, _PixelWand::pixel, _PixelWand::signature, and WandSignature.

@@ -730,7 +730,7 @@ Functions

Definition at line 881 of file pixel-wand.c.

-

References _PixelWand::debug, _PixelWand::exception, MaxTextExtent, _PixelWand::name, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

+

References _PixelWand::debug, _PixelWand::exception, MagickPathExtent, _PixelWand::name, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

diff --git a/www/api/MagickWand/pixel-wand_8h.html b/www/api/MagickWand/pixel-wand_8h.html index c8d5c8616..c8f1b8f24 100644 --- a/www/api/MagickWand/pixel-wand_8h.html +++ b/www/api/MagickWand/pixel-wand_8h.html @@ -623,7 +623,7 @@ Functions

Definition at line 881 of file pixel-wand.c.

-

References _PixelWand::debug, _PixelWand::exception, MaxTextExtent, _PixelWand::name, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

+

References _PixelWand::debug, _PixelWand::exception, MagickPathExtent, _PixelWand::name, _PixelWand::signature, ThrowWandFatalException, and WandSignature.

diff --git a/www/api/MagickWand/stream_8c.html b/www/api/MagickWand/stream_8c.html index ecc054350..ffc5f5367 100644 --- a/www/api/MagickWand/stream_8c.html +++ b/www/api/MagickWand/stream_8c.html @@ -232,7 +232,7 @@ Functions

Definition at line 161 of file stream.c.

-

References AppendImageStack, DestroyStream, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, StreamUsage(), ThrowStreamException, and ThrowStreamInvalidArgumentException.

+

References AppendImageStack, DestroyStream, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, StreamUsage(), ThrowStreamException, and ThrowStreamInvalidArgumentException.

diff --git a/www/api/MagickWand/stream_8h.html b/www/api/MagickWand/stream_8h.html index 4dc8ec7f9..42edb8c31 100644 --- a/www/api/MagickWand/stream_8h.html +++ b/www/api/MagickWand/stream_8h.html @@ -116,7 +116,7 @@ Functions

Definition at line 161 of file stream.c.

-

References AppendImageStack, DestroyStream, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MaxTextExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, StreamUsage(), ThrowStreamException, and ThrowStreamInvalidArgumentException.

+

References AppendImageStack, DestroyStream, FinalizeImageSettings, FireImageStack, MaxImageStackDepth, MagickPathExtent, MogrifyImageInfo(), NewImageStack, PopImageStack, PushImageStack, ReadCommandlLine, StreamUsage(), ThrowStreamException, and ThrowStreamInvalidArgumentException.

diff --git a/www/api/MagickWand/struct__DrawingWand.html b/www/api/MagickWand/struct__DrawingWand.html index 631f266f8..8510824cf 100644 --- a/www/api/MagickWand/struct__DrawingWand.html +++ b/www/api/MagickWand/struct__DrawingWand.html @@ -61,7 +61,7 @@ $(document).ready(function(){initNavTree('struct__DrawingWand.html','');}); Data Fields size_t id   -char name [MaxTextExtent] +char name [MagickPathExtent]   Image * image   @@ -317,7 +317,7 @@ Data Fields
- +
char _DrawingWand::name[MaxTextExtent]char _DrawingWand::name[MagickPathExtent]
diff --git a/www/api/MagickWand/struct__MagickWand.html b/www/api/MagickWand/struct__MagickWand.html index 6bb7affac..6a7ac2c3a 100644 --- a/www/api/MagickWand/struct__MagickWand.html +++ b/www/api/MagickWand/struct__MagickWand.html @@ -63,7 +63,7 @@ $(document).ready(function(){initNavTree('struct__MagickWand.html','');}); Data Fields size_t id   -char name [MaxTextExtent] +char name [MagickPathExtent]   Image * images   @@ -201,7 +201,7 @@ Data Fields
- +
char _MagickWand::name[MaxTextExtent]char _MagickWand::name[MagickPathExtent]
diff --git a/www/api/MagickWand/struct__PixelIterator.html b/www/api/MagickWand/struct__PixelIterator.html index a77a2b2c6..f0c422bb6 100644 --- a/www/api/MagickWand/struct__PixelIterator.html +++ b/www/api/MagickWand/struct__PixelIterator.html @@ -68,7 +68,7 @@ Collaboration diagram for _PixelIterator:
Data Fields size_t id   -char name [MaxTextExtent] +char name [MagickPathExtent]   ExceptionInfo * exception   @@ -160,7 +160,7 @@ Data Fields
- +
char _PixelIterator::name[MaxTextExtent]char _PixelIterator::name[MagickPathExtent]
diff --git a/www/api/MagickWand/struct__PixelWand.html b/www/api/MagickWand/struct__PixelWand.html index 7c7926bda..04b1f442e 100644 --- a/www/api/MagickWand/struct__PixelWand.html +++ b/www/api/MagickWand/struct__PixelWand.html @@ -61,7 +61,7 @@ $(document).ready(function(){initNavTree('struct__PixelWand.html','');}); Data Fields size_t id   -char name [MaxTextExtent] +char name [MagickPathExtent]   ExceptionInfo * exception   @@ -147,7 +147,7 @@ Data Fields
- +
char _PixelWand::name[MaxTextExtent]char _PixelWand::name[MagickPathExtent]
diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 643698086..2ec85951e 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -939,8 +939,8 @@

Deprecated, replace with:

-      char key[MaxTextExtent];
-      FormatLocaleString(key,MaxTextExtent,"ld\n",id);
+      char key[MagickPathExtent];
+      FormatLocaleString(key,MagickPathExtent,"ld\n",id);
       DeleteImageRegistry(key);
 
diff --git a/www/architecture.html b/www/architecture.html index 4d5a3f438..cdf40298f 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -1001,7 +1001,7 @@ static Image *ReadMGKImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; Image *image; @@ -1225,7 +1225,7 @@ ModuleExport void UnregisterMGKImage(void) static MagickBooleanType WriteMGKImage(const ImageInfo *image_info,Image *image) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; MagickBooleanType status; @@ -1276,7 +1276,7 @@ static MagickBooleanType WriteMGKImage(const ImageInfo *image_info,Image *image) Initialize raster file header. */ (void) WriteBlobString(image,"id=mgk\n"); - (void) FormatLocaleString(buffer,MaxTextExtent,"%lu %lu\n", + (void) FormatLocaleString(buffer,MagickPathExtent,"%lu %lu\n", image->columns,image->rows); (void) WriteBlobString(image,buffer); for (y=0; y < (ssize_t) image->rows; y++) @@ -1371,7 +1371,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv ExceptionInfo *exception) { char - text[MaxTextExtent]; + text[MagickPathExtent]; double area, @@ -1474,11 +1474,11 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv if (area <= 0.0) break; brightness_mean=brightness_sum_x/area; - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_mean); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_mean); (void) SetImageProperty(image,"filter:brightness:mean",text); brightness_standard_deviation=sqrt(brightness_sum_x2/area-(brightness_sum_x/ area*brightness_sum_x/area)); - (void) FormatLocaleString(text,MaxTextExtent,"%g", + (void) FormatLocaleString(text,MagickPathExtent,"%g", brightness_standard_deviation); (void) SetImageProperty(image,"filter:brightness:standard-deviation",text); if (brightness_standard_deviation != 0) @@ -1488,21 +1488,21 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv brightness_mean*brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation* brightness_standard_deviation)-3.0; - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_kurtosis); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_kurtosis); (void) SetImageProperty(image,"filter:brightness:kurtosis",text); if (brightness_standard_deviation != 0) brightness_skewness=(brightness_sum_x3/area-3.0*brightness_mean* brightness_sum_x2/area+2.0*brightness_mean*brightness_mean* brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation); - (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_skewness); + (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_skewness); (void) SetImageProperty(image,"filter:brightness:skewness",text); saturation_mean=saturation_sum_x/area; - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_mean); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_mean); (void) SetImageProperty(image,"filter:saturation:mean",text); saturation_standard_deviation=sqrt(saturation_sum_x2/area-(saturation_sum_x/ area*saturation_sum_x/area)); - (void) FormatLocaleString(text,MaxTextExtent,"%g", + (void) FormatLocaleString(text,MagickPathExtent,"%g", saturation_standard_deviation); (void) SetImageProperty(image,"filter:saturation:standard-deviation",text); if (saturation_standard_deviation != 0) @@ -1512,14 +1512,14 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv saturation_mean*saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation* saturation_standard_deviation)-3.0; - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_kurtosis); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_kurtosis); (void) SetImageProperty(image,"filter:saturation:kurtosis",text); if (saturation_standard_deviation != 0) saturation_skewness=(saturation_sum_x3/area-3.0*saturation_mean* saturation_sum_x2/area+2.0*saturation_mean*saturation_mean* saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation); - (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_skewness); + (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_skewness); (void) SetImageProperty(image,"filter:saturation:skewness",text); } return(MagickImageFilterSignature); diff --git a/www/magick-core.html b/www/magick-core.html index d99995d5f..5c77f1c86 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -444,7 +444,7 @@ int main(int argc,char **argv) */ MagickCoreGenesis(*argv,MagickTrue); image_info=AcquireImageInfo(); - (void) CopyMagickString(image_info->filename,argv[1],MaxTextExtent); + (void) CopyMagickString(image_info->filename,argv[1],MagickPathExtent); exception=AcquireExceptionInfo(); contrast_image=ReadImage(image_info,exception); if (contrast_image == (Image *) NULL) diff --git a/www/source/analyze.c b/www/source/analyze.c index 5cc4ebad8..4c811f114 100644 --- a/www/source/analyze.c +++ b/www/source/analyze.c @@ -81,7 +81,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, const char **argv,ExceptionInfo *exception) { char - text[MaxTextExtent]; + text[MagickPathExtent]; double area, @@ -185,11 +185,11 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, if (area <= 0.0) break; brightness_mean=brightness_sum_x/area; - (void) FormatMagickString(text,MaxTextExtent,"%g",brightness_mean); + (void) FormatMagickString(text,MagickPathExtent,"%g",brightness_mean); (void) SetImageProperty(image,"filter:brightness:mean",text); brightness_standard_deviation=sqrt(brightness_sum_x2/area-(brightness_sum_x/ area*brightness_sum_x/area)); - (void) FormatMagickString(text,MaxTextExtent,"%g", + (void) FormatMagickString(text,MagickPathExtent,"%g", brightness_standard_deviation); (void) SetImageProperty(image,"filter:brightness:standard-deviation",text); if (brightness_standard_deviation != 0) @@ -199,21 +199,21 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, brightness_mean*brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation* brightness_standard_deviation)-3.0; - (void) FormatMagickString(text,MaxTextExtent,"%g",brightness_kurtosis); + (void) FormatMagickString(text,MagickPathExtent,"%g",brightness_kurtosis); (void) SetImageProperty(image,"filter:brightness:kurtosis",text); if (brightness_standard_deviation != 0) brightness_skewness=(brightness_sum_x3/area-3.0*brightness_mean* brightness_sum_x2/area+2.0*brightness_mean*brightness_mean* brightness_mean)/(brightness_standard_deviation* brightness_standard_deviation*brightness_standard_deviation); - (void) FormatMagickString(text,MaxTextExtent,"%g",brightness_skewness); + (void) FormatMagickString(text,MagickPathExtent,"%g",brightness_skewness); (void) SetImageProperty(image,"filter:brightness:skewness",text); saturation_mean=saturation_sum_x/area; - (void) FormatMagickString(text,MaxTextExtent,"%g",saturation_mean); + (void) FormatMagickString(text,MagickPathExtent,"%g",saturation_mean); (void) SetImageProperty(image,"filter:saturation:mean",text); saturation_standard_deviation=sqrt(saturation_sum_x2/area-(saturation_sum_x/ area*saturation_sum_x/area)); - (void) FormatMagickString(text,MaxTextExtent,"%g", + (void) FormatMagickString(text,MagickPathExtent,"%g", saturation_standard_deviation); (void) SetImageProperty(image,"filter:saturation:standard-deviation",text); if (saturation_standard_deviation != 0) @@ -223,14 +223,14 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, saturation_mean*saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation* saturation_standard_deviation)-3.0; - (void) FormatMagickString(text,MaxTextExtent,"%g",saturation_kurtosis); + (void) FormatMagickString(text,MagickPathExtent,"%g",saturation_kurtosis); (void) SetImageProperty(image,"filter:saturation:kurtosis",text); if (saturation_standard_deviation != 0) saturation_skewness=(saturation_sum_x3/area-3.0*saturation_mean* saturation_sum_x2/area+2.0*saturation_mean*saturation_mean* saturation_mean)/(saturation_standard_deviation* saturation_standard_deviation*saturation_standard_deviation); - (void) FormatMagickString(text,MaxTextExtent,"%g",saturation_skewness); + (void) FormatMagickString(text,MagickPathExtent,"%g",saturation_skewness); (void) SetImageProperty(image,"filter:saturation:skewness",text); } return(MagickImageFilterSignature); diff --git a/www/source/core/sigmoidal-contrast.c b/www/source/core/sigmoidal-contrast.c index cc33070c0..b01222d35 100644 --- a/www/source/core/sigmoidal-contrast.c +++ b/www/source/core/sigmoidal-contrast.c @@ -87,7 +87,7 @@ int main(int argc,char **argv) */ MagickCoreGenesis(*argv,MagickTrue); image_info=AcquireImageInfo(); - (void) CopyMagickString(image_info->filename,argv[1],MaxTextExtent); + (void) CopyMagickString(image_info->filename,argv[1],MagickPathExtent); exception=AcquireExceptionInfo(); contrast_image=ReadImage(image_info,exception); if (contrast_image == (Image *) NULL) diff --git a/www/source/mgk.c b/www/source/mgk.c index 3bc3fcc5d..8e3d5c3ed 100644 --- a/www/source/mgk.c +++ b/www/source/mgk.c @@ -130,7 +130,7 @@ static Image *ReadMGKImage(const ImageInfo *image_info, ExceptionInfo *exception) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; Image *image; @@ -363,7 +363,7 @@ static MagickBooleanType WriteMGKImage(const ImageInfo *image_info, Image *image) { char - buffer[MaxTextExtent]; + buffer[MagickPathExtent]; MagickBooleanType status; @@ -414,7 +414,7 @@ static MagickBooleanType WriteMGKImage(const ImageInfo *image_info, Initialize raster file header. */ (void) WriteBlobString(image,"id=mgk\n"); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n",image->columns, + (void) FormatMagickString(buffer,MagickPathExtent,"%lu %lu\n",image->columns, image->rows); (void) WriteBlobString(image,buffer); for (y=0; y < (ssize_t) image->rows; y++)