% December 2001 %
% %
% %
-% Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/colormap.h"
-#include "magick/color-private.h"
-#include "magick/composite.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/display.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/resize.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/display.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/signature.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
-# if defined(__WINDOWS__)
+# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
# define _MSC_VER
# else
*/
typedef struct _MSLGroupInfo
{
- unsigned long
+ size_t
numImages; /* how many images are in this group */
} MSLGroupInfo;
ExceptionInfo
*exception;
- long
+ ssize_t
n,
number_groups;
*/
#if defined(MAGICKCORE_XML_DELEGATE)
static MagickBooleanType
- WriteMSLImage(const ImageInfo *,Image *);
+ WriteMSLImage(const ImageInfo *,Image *,ExceptionInfo *);
static MagickBooleanType
SetMSLAttributes(MSLInfo *,const char *,const char *);
extern "C" {
#endif
+static inline Image *GetImageCache(const ImageInfo *image_info,const char *path,
+ ExceptionInfo *exception)
+{
+ char
+ key[MaxTextExtent];
+
+ ExceptionInfo
+ *sans_exception;
+
+ Image
+ *image;
+
+ ImageInfo
+ *read_info;
+
+ (void) FormatLocaleString(key,MaxTextExtent,"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);
+ image=ReadImage(read_info,exception);
+ read_info=DestroyImageInfo(read_info);
+ if (image != (Image *) NULL)
+ (void) SetImageRegistry(ImageRegistryType,key,image,exception);
+ return(image);
+}
+
+static int IsPathDirectory(const char *path)
+{
+ MagickBooleanType
+ status;
+
+ struct stat
+ attributes;
+
+ if ((path == (const char *) NULL) || (*path == '\0'))
+ return(MagickFalse);
+ status=GetPathAttributes(path,&attributes);
+ if (status == MagickFalse)
+ return(-1);
+ if (S_ISDIR(attributes.st_mode) == 0)
+ return(0);
+ return(1);
+}
+
static int MSLIsStandalone(void *context)
{
MSLInfo
" SAX.setDocumentLocator()\n");
(void) location;
msl_info=(MSLInfo *) context;
+ (void) msl_info;
}
static void MSLStartDocument(void *context)
static void MSLPushImage(MSLInfo *msl_info,Image *image)
{
- long
+ ssize_t
n;
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
msl_info->draw_info[n]=CloneDrawInfo(msl_info->image_info[n-1],
msl_info->draw_info[n-1]);
if (image == (Image *) NULL)
- msl_info->attributes[n]=AcquireImage(msl_info->image_info[n]);
+ msl_info->attributes[n]=AcquireImage(msl_info->image_info[n],
+ msl_info->exception);
else
- msl_info->attributes[n]=CloneImage(image,0,0,MagickTrue,&image->exception);
+ msl_info->attributes[n]=CloneImage(image,0,0,MagickTrue,
+ msl_info->exception);
msl_info->image[n]=(Image *) image;
if ((msl_info->image_info[n] == (ImageInfo *) NULL) ||
(msl_info->attributes[n] == (Image *) NULL))
ChannelType
channel;
+ ChannelType
+ channel_mask;
+
char
key[MaxTextExtent],
*value;
int
flags;
- long
+ ssize_t
option,
j,
n,
RectangleInfo
geometry;
- register long
+ register ssize_t
i;
- unsigned long
+ size_t
height,
width;
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"noise") == 0)
{
- option=ParseMagickOption(MagickNoiseOptions,MagickFalse,
+ option=ParseCommandOption(MagickNoiseOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedNoiseType",
}
}
}
- noise_image=AddNoiseImageChannel(msl_info->image[n],channel,noise,
- &msl_info->image[n]->exception);
+ channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ noise_image=AddNoiseImage(msl_info->image[n],noise,1.0,
+ msl_info->exception);
+ (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
if (noise_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
*p;
p=value;
- draw_info->affine.sx=strtod(p,&p);
+ draw_info->affine.sx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=strtod(p,&p);
+ draw_info->affine.rx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=strtod(p,&p);
+ draw_info->affine.ry=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=strtod(p,&p);
+ draw_info->affine.sy=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=strtod(p,&p);
+ draw_info->affine.tx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=strtod(p,&p);
+ draw_info->affine.ty=StringToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
{
- option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+ option=ParseCommandOption(MagickAlignOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedAlignType",
}
if (LocaleCompare(keyword,"antialias") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickBooleanOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
value);
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
{
if (LocaleCompare(keyword,"geometry") == 0)
{
- flags=ParsePageGeometry(msl_info->image[n],value,
+ flags=ParseGravityGeometry(msl_info->image[n],value,
&geometry,&exception);
- if ((flags & HeightValue) == 0)
- geometry.height=geometry.width;
break;
}
if (LocaleCompare(keyword,"gravity") == 0)
{
- option=ParseMagickOption(MagickGravityOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickGravityOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedGravityType",
value);
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=atof(value);
+ draw_info->pointsize=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.ry=tan(DegreesToRadians(fmod((double) angle,
360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.rx=tan(DegreesToRadians(fmod((double) angle,
360.0)));
break;
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseMagickOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
{
- draw_info->stroke_width=atol(value);
+ draw_info->stroke_width=StringToLong(value);
break;
}
if (LocaleCompare(keyword,"style") == 0)
{
- option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+ option=ParseCommandOption(MagickStyleOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStyleType",
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"weight") == 0)
{
- draw_info->weight=atol(value);
+ draw_info->weight=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld",
- geometry.width,geometry.height,geometry.x,geometry.y);
+ (void) FormatLocaleString(text,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
+ geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
- draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx;
- draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx;
- draw_info->affine.ry=current.sx*affine.ry+current.ry*affine.sy;
- draw_info->affine.sy=current.rx*affine.ry+current.sy*affine.sy;
- draw_info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+
- current.tx;
- draw_info->affine.ty=current.rx*affine.tx+current.sy*affine.ty+
- current.ty;
- (void) AnnotateImage(msl_info->image[n],draw_info);
+ draw_info->affine.sx=affine.sx*current.sx+affine.ry*current.rx;
+ draw_info->affine.rx=affine.rx*current.sx+affine.sy*current.rx;
+ draw_info->affine.ry=affine.sx*current.ry+affine.ry*current.sy;
+ draw_info->affine.sy=affine.rx*current.ry+affine.sy*current.sy;
+ draw_info->affine.tx=affine.sx*current.tx+affine.ry*current.ty+
+ affine.tx;
+ draw_info->affine.ty=affine.rx*current.tx+affine.sy*current.ty+
+ affine.ty;
+ (void) AnnotateImage(msl_info->image[n],draw_info,
+ msl_info->exception);
draw_info=DestroyDrawInfo(draw_info);
break;
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"stack") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
}
}
append_image=AppendImages(msl_info->image[n],stack,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (append_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"sigma") == 0)
{
- geometry_info.sigma=atol(value);
+ geometry_info.sigma=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- blur_image=BlurImageChannel(msl_info->image[n],channel,
- geometry_info.rho,geometry_info.sigma,
- &msl_info->image[n]->exception);
+ channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ blur_image=BlurImage(msl_info->image[n],geometry_info.rho,
+ geometry_info.sigma,msl_info->exception);
+ (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
if (blur_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"compose") == 0)
{
- option=ParseMagickOption(MagickComposeOptions,MagickFalse,
+ option=ParseCommandOption(MagickComposeOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedComposeType",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->border_color,&exception);
break;
}
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=atol(value);
+ geometry.height=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
border_image=BorderImage(msl_info->image[n],&geometry,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->compose,msl_info->exception);
if (border_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
if (LocaleCompare((const char *) tag,"colorize") == 0)
{
char
- opacity[MaxTextExtent];
+ blend[MaxTextExtent];
Image
*colorize_image;
- PixelPacket
+ PixelInfo
target;
/*
(const char *) tag);
break;
}
- target=msl_info->image[n]->background_color;
- (void) CopyMagickString(opacity,"100",MaxTextExtent);
+ GetPixelInfo(msl_info->image[n],&target);
+ (void) CopyMagickString(blend,"100",MaxTextExtent);
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
- case 'F':
- case 'f':
+ case 'B':
+ case 'b':
{
- if (LocaleCompare(keyword,"fill") == 0)
+ if (LocaleCompare(keyword,"blend") == 0)
{
- (void) QueryColorDatabase(value,&target,
- &msl_info->image[n]->exception);
+ (void) CopyMagickString(blend,value,MaxTextExtent);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
keyword);
break;
}
- case 'O':
- case 'o':
+ case 'F':
+ case 'f':
{
- if (LocaleCompare(keyword,"opacity") == 0)
+ if (LocaleCompare(keyword,"fill") == 0)
{
- (void) CopyMagickString(opacity,value,MaxTextExtent);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &target,msl_info->exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- colorize_image=ColorizeImage(msl_info->image[n],opacity,target,
- &msl_info->image[n]->exception);
+ colorize_image=ColorizeImage(msl_info->image[n],blend,&target,
+ msl_info->exception);
if (colorize_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
if (LocaleCompare((const char *) tag, "charcoal") == 0)
{
- double radius = 0.0,
+ double
+ radius = 0.0,
sigma = 1.0;
if (msl_info->image[n] == (Image *) NULL)
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'R':
case 'r':
{
- if (LocaleCompare(keyword, "radius") == 0)
+ if (LocaleCompare(keyword,"radius") == 0)
{
- radius = atof( value );
+ radius=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"sigma") == 0)
{
- sigma = atol( value );
+ sigma = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
*newImage;
newImage=CharcoalImage(msl_info->image[n],radius,sigma,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=atol(value);
+ geometry.height=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
chop_image=ChopImage(msl_info->image[n],&geometry,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (chop_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
PaintMethod
paint_method;
- MagickPixelPacket
+ PixelInfo
target;
/*
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=atof(value);
+ msl_info->image[n]->fuzz=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
&geometry,&exception);
if ((flags & HeightValue) == 0)
geometry.height=geometry.width;
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ geometry.x=StringToLong(value);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ geometry.y=StringToLong(value);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) FloodfillPaintImage(msl_info->image[n],DefaultChannels,
- draw_info,&target,geometry.x,geometry.y,
- paint_method == FloodfillMethod ? MagickFalse : MagickTrue);
+ (void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
+ geometry.x,geometry.y,paint_method == FloodfillMethod ?
+ MagickFalse : MagickTrue,msl_info->exception);
draw_info=DestroyDrawInfo(draw_info);
break;
}
*composite_image,
*rotate_image;
- PixelPacket
- target;
-
/*
Composite image.
*/
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"compose") == 0)
{
- option=ParseMagickOption(MagickComposeOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickComposeOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedComposeType",
value);
const char
*attribute;
- attribute=GetImageProperty(msl_info->attributes[j],"id");
+ attribute=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if ((attribute != (const char *) NULL) &&
(LocaleCompare(attribute,value) == 0))
{
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
if (LocaleCompare(keyword, "color") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&composite_image->background_color,&exception);
break;
}
&geometry,&exception);
if ((flags & HeightValue) == 0)
geometry.height=geometry.width;
- (void) GetOneVirtualPixel(msl_info->image[n],geometry.x,
- geometry.y,&target,&exception);
break;
}
if (LocaleCompare(keyword,"gravity") == 0)
{
- option=ParseMagickOption(MagickGravityOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickGravityOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedGravityType",
value);
const char
*attribute;
- attribute=GetImageProperty(msl_info->attributes[j],"id");
+ attribute=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if ((attribute != (const char *) NULL) &&
(LocaleCompare(value,value) == 0))
{
- SetImageType(composite_image,TrueColorMatteType);
+ SetImageType(composite_image,TrueColorMatteType,
+ &exception);
(void) CompositeImage(composite_image,
- CopyOpacityCompositeOp,msl_info->image[j],0,0);
+ msl_info->image[j],CopyAlphaCompositeOp,MagickTrue,
+ 0,0,&exception);
break;
}
}
{
if (LocaleCompare(keyword,"opacity") == 0)
{
- long
+ ssize_t
opacity,
y;
- register long
+ register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
CacheView
*composite_view;
- opacity=QuantumRange-atol(value);
+ opacity=StringToLong(value);
if (compose != DissolveCompositeOp)
{
- (void) SetImageOpacity(composite_image,(Quantum)
- opacity);
+ (void) SetImageAlpha(composite_image,(Quantum)
+ opacity,&exception);
break;
}
(void) SetImageArtifact(msl_info->image[n],
"compose:args",value);
if (composite_image->matte != MagickTrue)
- (void) SetImageOpacity(composite_image,OpaqueOpacity);
- composite_view=AcquireCacheView(composite_image);
- for (y=0; y < (long) composite_image->rows ; y++)
+ (void) SetImageAlpha(composite_image,OpaqueAlpha,
+ &exception);
+ composite_view=AcquireAuthenticCacheView(composite_image,
+ &exception);
+ for (y=0; y < (ssize_t) composite_image->rows ; y++)
{
- q=GetCacheViewAuthenticPixels(composite_view,0,y,(long)
- composite_image->columns,1,&exception);
- for (x=0; x < (long) composite_image->columns; x++)
+ q=GetCacheViewAuthenticPixels(composite_view,0,y,
+ (ssize_t) composite_image->columns,1,&exception);
+ for (x=0; x < (ssize_t) composite_image->columns; x++)
{
- if (q->opacity == OpaqueOpacity)
- q->opacity=RoundToQuantum(opacity);
- q++;
+ if (GetPixelAlpha(composite_image,q) == OpaqueAlpha)
+ SetPixelAlpha(composite_image,
+ ClampToQuantum(opacity),q);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,&exception) == MagickFalse)
break;
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- rotate_image=RotateImage(composite_image,atof(value),
- &exception);
+ rotate_image=RotateImage(composite_image,
+ StringToDouble(value,(char **) NULL),&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
MagickBooleanType
tile;
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
value);
tile=(MagickBooleanType) option;
+ (void) tile;
if (rotate_image != (Image *) NULL)
(void) SetImageArtifact(rotate_image,
"compose:outside-overlay","false");
image=msl_info->image[n];
height=composite_image->rows;
width=composite_image->columns;
- for (y=0; y < (long) image->rows; y+=height)
- for (x=0; x < (long) image->columns; x+=width)
+ for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) height)
+ for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) width)
{
if (rotate_image != (Image *) NULL)
- (void) CompositeImage(image,compose,rotate_image,
- x,y);
+ (void) CompositeImage(image,rotate_image,compose,
+ MagickTrue,x,y,&exception);
else
- (void) CompositeImage(image,compose,
- composite_image,x,y);
+ (void) CompositeImage(image,composite_image,
+ compose,MagickTrue,x,y,&exception);
}
if (rotate_image != (Image *) NULL)
rotate_image=DestroyImage(rotate_image);
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
- (void) GetOneVirtualPixel(msl_info->image[n],geometry.x,
- geometry.y,&target,&exception);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
- (void) GetOneVirtualPixel(msl_info->image[n],geometry.x,
- geometry.y,&target,&exception);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
image=msl_info->image[n];
- (void) FormatMagickString(composite_geometry,MaxTextExtent,
- "%lux%lu%+ld%+ld",composite_image->columns,composite_image->rows,
- geometry.x,geometry.y);
+ (void) FormatLocaleString(composite_geometry,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) composite_image->columns,
+ (double) composite_image->rows,(double) geometry.x,(double)
+ geometry.y);
flags=ParseGravityGeometry(image,composite_geometry,&geometry,
&exception);
+ channel_mask=SetPixelChannelMask(image,channel);
if (rotate_image == (Image *) NULL)
- CompositeImageChannel(image,channel,compose,composite_image,
- geometry.x,geometry.y);
+ CompositeImage(image,composite_image,compose,MagickTrue,geometry.x,
+ geometry.y,&exception);
else
{
/*
Rotate image.
*/
- geometry.x-=(long) (rotate_image->columns-
+ geometry.x-=(ssize_t) (rotate_image->columns-
composite_image->columns)/2;
- geometry.y-=(long) (rotate_image->rows-composite_image->rows)/2;
- CompositeImageChannel(image,channel,compose,rotate_image,
- geometry.x,geometry.y);
+ geometry.y-=(ssize_t) (rotate_image->rows-
+ composite_image->rows)/2;
+ CompositeImage(image,rotate_image,compose,MagickTrue,geometry.x,
+ geometry.y,&exception);
rotate_image=DestroyImage(rotate_image);
}
+ (void) SetPixelChannelMask(image,channel_mask);
composite_image=DestroyImage(composite_image);
break;
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"sharpen") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
}
}
}
- (void) ContrastImage(msl_info->image[n],sharpen);
+ (void) ContrastImage(msl_info->image[n],sharpen,
+ msl_info->exception);
break;
}
if (LocaleCompare((const char *) tag,"crop") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"geometry") == 0)
{
- flags=ParsePageGeometry(msl_info->image[n],value,
+ flags=ParseGravityGeometry(msl_info->image[n],value,
&geometry,&exception);
- if ((flags & HeightValue) == 0)
- geometry.height=geometry.width;
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=atol(value);
+ geometry.height=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
crop_image=CropImage(msl_info->image[n],&geometry,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (crop_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
if (LocaleCompare((const char *) tag,"cycle-colormap") == 0)
{
- long
+ ssize_t
display;
/*
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"display") == 0)
{
- display=atol(value);
+ display=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) CycleColormapImage(msl_info->image[n],display);
+ (void) CycleColormapImage(msl_info->image[n],display,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
despeckle_image=DespeckleImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (despeckle_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
}
}
- (void) DisplayImages(msl_info->image_info[n],msl_info->image[n]);
+ (void) DisplayImages(msl_info->image_info[n],msl_info->image[n],
+ msl_info->exception);
break;
}
if (LocaleCompare((const char *) tag,"draw") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
*p;
p=value;
- draw_info->affine.sx=strtod(p,&p);
+ draw_info->affine.sx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=strtod(p,&p);
+ draw_info->affine.rx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=strtod(p,&p);
+ draw_info->affine.ry=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=strtod(p,&p);
+ draw_info->affine.sy=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=strtod(p,&p);
+ draw_info->affine.tx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=strtod(p,&p);
+ draw_info->affine.ty=StringToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
{
- option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+ option=ParseCommandOption(MagickAlignOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedAlignType",
}
if (LocaleCompare(keyword,"antialias") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
}
if (LocaleCompare(keyword,"gravity") == 0)
{
- option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+ option=ParseCommandOption(MagickGravityOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedGravityType",
}
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=atof(value);
+ draw_info->pointsize=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.ry=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.rx=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseMagickOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
{
- draw_info->stroke_width=atol(value);
+ draw_info->stroke_width=StringToLong(value);
break;
}
if (LocaleCompare(keyword,"style") == 0)
{
- option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+ option=ParseCommandOption(MagickStyleOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStyleType",
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"weight") == 0)
{
- draw_info->weight=atol(value);
+ draw_info->weight=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld",
- geometry.width,geometry.height,geometry.x,geometry.y);
+ (void) FormatLocaleString(text,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
+ geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
- draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx;
- draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx;
- draw_info->affine.ry=current.sx*affine.ry+current.ry*affine.sy;
- draw_info->affine.sy=current.rx*affine.ry+current.sy*affine.sy;
- draw_info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+
- current.tx;
- draw_info->affine.ty=current.rx*affine.tx+current.sy*affine.ty+
- current.ty;
- (void) DrawImage(msl_info->image[n],draw_info);
+ draw_info->affine.sx=affine.sx*current.sx+affine.ry*current.rx;
+ draw_info->affine.rx=affine.rx*current.sx+affine.sy*current.rx;
+ draw_info->affine.ry=affine.sx*current.ry+affine.ry*current.sy;
+ draw_info->affine.sy=affine.rx*current.ry+affine.sy*current.sy;
+ draw_info->affine.tx=affine.sx*current.tx+affine.ry*current.ty+
+ affine.tx;
+ draw_info->affine.ty=affine.rx*current.tx+affine.sy*current.ty+
+ affine.ty;
+ (void) DrawImage(msl_info->image[n],draw_info,&exception);
draw_info=DestroyDrawInfo(draw_info);
break;
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
edge_image=EdgeImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ geometry_info.sigma,msl_info->exception);
if (edge_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"sigma") == 0)
{
- geometry_info.sigma=atol(value);
+ geometry_info.sigma=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
emboss_image=EmbossImage(msl_info->image[n],geometry_info.rho,
- geometry_info.sigma,&msl_info->image[n]->exception);
+ geometry_info.sigma,msl_info->exception);
if (emboss_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
enhance_image=EnhanceImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (enhance_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
}
}
- (void) EqualizeImage(msl_info->image[n]);
+ (void) EqualizeImage(msl_info->image[n],
+ msl_info->exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
*newImage;
newImage=MergeImageLayers(msl_info->image[n],FlattenLayer,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
flip_image=FlipImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (flip_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
flop_image=FlopImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (flop_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"compose") == 0)
{
- option=ParseMagickOption(MagickComposeOptions,
+ option=ParseCommandOption(MagickComposeOptions,
MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedComposeType",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->matte_color,&exception);
break;
}
{
if (LocaleCompare(keyword,"height") == 0)
{
- frame_info.height=atol(value);
+ frame_info.height=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"inner") == 0)
{
- frame_info.inner_bevel=atol(value);
+ frame_info.inner_bevel=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"outer") == 0)
{
- frame_info.outer_bevel=atol(value);
+ frame_info.outer_bevel=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- frame_info.width=atol(value);
+ frame_info.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- frame_info.x=(long) frame_info.width;
- frame_info.y=(long) frame_info.height;
+ frame_info.x=(ssize_t) frame_info.width;
+ frame_info.y=(ssize_t) frame_info.height;
frame_info.width=msl_info->image[n]->columns+2*frame_info.x;
frame_info.height=msl_info->image[n]->rows+2*frame_info.y;
frame_image=FrameImage(msl_info->image[n],&frame_info,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->compose,msl_info->exception);
if (frame_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
char
gamma[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
/*
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"blue") == 0)
{
- pixel.blue=atof(value);
+ pixel.blue=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
if (LocaleCompare(keyword,"green") == 0)
{
- pixel.green=atof(value);
+ pixel.green=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"red") == 0)
{
- pixel.red=atof(value);
+ pixel.red=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
if (*gamma == '\0')
- (void) FormatMagickString(gamma,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(gamma,MaxTextExtent,"%g,%g,%g",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
- switch (channel)
- {
- default:
- {
- (void) GammaImage(msl_info->image[n],gamma);
- break;
- }
- case RedChannel:
- {
- (void) GammaImageChannel(msl_info->image[n],RedChannel,pixel.red);
- break;
- }
- case GreenChannel:
- {
- (void) GammaImageChannel(msl_info->image[n],GreenChannel,
- pixel.green);
- break;
- }
- case BlueChannel:
- {
- (void) GammaImageChannel(msl_info->image[n],BlueChannel,
- pixel.blue);
- break;
- }
- }
+ (void) GammaImage(msl_info->image[n],atof(gamma),
+ msl_info->exception);
break;
}
else if (LocaleCompare((const char *) tag,"get") == 0)
{
if (LocaleCompare(keyword,"height") == 0)
{
- (void) FormatMagickString(value,MaxTextExtent,"%ld",
- msl_info->image[n]->rows);
- (void) SetImageProperty(msl_info->attributes[n],key,value);
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (double) msl_info->image[n]->rows);
+ (void) SetImageProperty(msl_info->attributes[n],key,value,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"width") == 0)
{
- (void) FormatMagickString(value,MaxTextExtent,"%ld",
- msl_info->image[n]->columns);
- (void) SetImageProperty(msl_info->attributes[n],key,value);
+ (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
+ (double) msl_info->image[n]->columns);
+ (void) SetImageProperty(msl_info->attributes[n],key,value,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'C':
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"amount") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
implode_image=ImplodeImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->interpolate,msl_info->exception);
if (implode_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
if (LocaleCompare(keyword,"black") == 0)
{
- levelBlack = atof( value );
+ levelBlack = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"gamma") == 0)
{
- levelGamma = atof( value );
+ levelGamma = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"white") == 0)
{
- levelWhite = atof( value );
+ levelWhite = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
/* process image */
- {
- char level[MaxTextExtent + 1];
- (void) FormatMagickString(level,MaxTextExtent,"%3.6f/%3.6f/%3.6f/",
- levelBlack,levelGamma,levelWhite);
- LevelImage ( msl_info->image[n], level );
- break;
- }
+ LevelImage(msl_info->image[n],levelBlack,levelWhite,levelGamma,
+ msl_info->exception);
+ break;
}
}
case 'M':
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
magnify_image=MagnifyImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (magnify_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"dither") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
const char
*attribute;
- attribute=GetImageProperty(msl_info->attributes[j],"id");
+ attribute=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if ((attribute != (const char *) NULL) &&
(LocaleCompare(attribute,value) == 0))
{
quantize_info=AcquireQuantizeInfo(msl_info->image_info[n]);
quantize_info->dither=dither;
(void) RemapImages(quantize_info,msl_info->image[n],
- affinity_image);
+ affinity_image,&exception);
quantize_info=DestroyQuantizeInfo(quantize_info);
affinity_image=DestroyImage(affinity_image);
break;
double
opacity;
- MagickPixelPacket
+ PixelInfo
target;
PaintMethod
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &target,&exception);
paint_method=FillToBorderMethod;
break;
}
{
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=atof(value);
+ msl_info->image[n]->fuzz=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
&geometry,&exception);
if ((flags & HeightValue) == 0)
geometry.height=geometry.width;
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"opacity") == 0)
{
- opacity=atof(value);
+ opacity=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ geometry.x=StringToLong(value);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
- (void) GetOneVirtualMagickPixel(msl_info->image[n],
- geometry.x,geometry.y,&target,&exception);
+ geometry.y=StringToLong(value);
+ (void) GetOneVirtualPixelInfo(msl_info->image[n],
+ TileVirtualPixelMethod,geometry.x,geometry.y,&target,
+ &exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
draw_info=CloneDrawInfo(msl_info->image_info[n],
msl_info->draw_info[n]);
- draw_info->fill.opacity=RoundToQuantum(opacity);
- (void) FloodfillPaintImage(msl_info->image[n],OpacityChannel,
- draw_info,&target,geometry.x,geometry.y,
- paint_method == FloodfillMethod ? MagickFalse : MagickTrue);
+ draw_info->fill.alpha=ClampToQuantum(opacity);
+ channel_mask=SetPixelChannelMask(msl_info->image[n],AlphaChannel);
+ (void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
+ geometry.x,geometry.y,paint_method == FloodfillMethod ?
+ MagickFalse : MagickTrue,msl_info->exception);
+ (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
draw_info=DestroyDrawInfo(draw_info);
break;
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- median_image=MedianFilterImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ median_image=StatisticImage(msl_info->image[n],MedianStatistic,
+ (size_t) geometry_info.rho,(size_t) geometry_info.sigma,
+ msl_info->exception);
if (median_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
minify_image=MinifyImage(msl_info->image[n],
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (minify_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"blackness") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
if (LocaleCompare(keyword,"brightness") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"hue") == 0)
{
- geometry_info.xi=atof(value);
+ geometry_info.xi=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"lightness") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"saturation") == 0)
{
- geometry_info.sigma=atof(value);
+ geometry_info.sigma=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"whiteness") == 0)
{
- geometry_info.sigma=atof(value);
+ geometry_info.sigma=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) FormatMagickString(modulate,MaxTextExtent,"%g,%g,%g",
+ (void) FormatLocaleString(modulate,MaxTextExtent,"%g,%g,%g",
geometry_info.rho,geometry_info.sigma,geometry_info.xi);
- (void) ModulateImage(msl_info->image[n],modulate);
+ (void) ModulateImage(msl_info->image[n],modulate,
+ msl_info->exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"gray") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
}
}
}
- (void) NegateImageChannel(msl_info->image[n],channel,gray);
+ channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ (void) NegateImage(msl_info->image[n],gray,
+ msl_info->exception);
+ (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
break;
}
if (LocaleCompare((const char *) tag,"normalize") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
}
}
- (void) NormalizeImageChannel(msl_info->image[n],channel);
+ (void) NormalizeImage(msl_info->image[n],
+ msl_info->exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
paint_image=OilPaintImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ geometry_info.sigma,msl_info->exception);
if (paint_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
if (LocaleCompare((const char *) tag,"opaque") == 0)
{
- MagickPixelPacket
+ PixelInfo
fill_color,
target;
(const char *) tag);
break;
}
- (void) QueryMagickColor("none",&target,&exception);
- (void) QueryMagickColor("none",&fill_color,&exception);
+ (void) QueryColorCompliance("none",AllCompliance,&target,
+ &exception);
+ (void) QueryColorCompliance("none",AllCompliance,&fill_color,
+ &exception);
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryMagickColor(value,&fill_color,&exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &fill_color,&exception);
break;
}
if (LocaleCompare(keyword,"fuzz") == 0)
{
- msl_info->image[n]->fuzz=atof(value);
+ msl_info->image[n]->fuzz=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) OpaquePaintImageChannel(msl_info->image[n],channel,
- &target,&fill_color,MagickFalse);
+ channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ (void) OpaquePaintImage(msl_info->image[n],&target,&fill_color,
+ MagickFalse,msl_info->exception);
+ (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"output") == 0)
{
- (void) fprintf(stdout,"%s",value);
+ (void) FormatLocaleFile(stdout,"%s",value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
break;
}
+ if (LocaleCompare((const char *) tag, "profile") == 0)
+ {
+ if (msl_info->image[n] == (Image *) NULL)
+ {
+ ThrowMSLException(OptionError,"NoImagesDefined",
+ (const char *) tag);
+ break;
+ }
+ if (attributes == (const xmlChar **) NULL)
+ break;
+ for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
+ {
+ const char
+ *name;
+
+ const StringInfo
+ *profile;
+
+ Image
+ *profile_image;
+
+ ImageInfo
+ *profile_info;
+
+ keyword=(const char *) attributes[i++];
+ attribute=InterpretImageProperties(msl_info->image_info[n],
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
+ CloneString(&value,attribute);
+ if (*keyword == '+')
+ {
+ /*
+ Remove a profile from the image.
+ */
+ (void) ProfileImage(msl_info->image[n],keyword,
+ (const unsigned char *) NULL,0,&exception);
+ continue;
+ }
+ /*
+ Associate a profile with the image.
+ */
+ profile_info=CloneImageInfo(msl_info->image_info[n]);
+ profile=GetImageProfile(msl_info->image[n],"iptc");
+ if (profile != (StringInfo *) NULL)
+ profile_info->profile=(void *) CloneStringInfo(profile);
+ profile_image=GetImageCache(profile_info,keyword,&exception);
+ profile_info=DestroyImageInfo(profile_info);
+ if (profile_image == (Image *) NULL)
+ {
+ char
+ name[MaxTextExtent],
+ filename[MaxTextExtent];
+
+ register char
+ *p;
+
+ StringInfo
+ *profile;
+
+ (void) CopyMagickString(filename,keyword,MaxTextExtent);
+ (void) CopyMagickString(name,keyword,MaxTextExtent);
+ for (p=filename; *p != '\0'; p++)
+ if ((*p == ':') && (IsPathDirectory(keyword) < 0) &&
+ (IsPathAccessible(keyword) == MagickFalse))
+ {
+ register char
+ *q;
+
+ /*
+ Look for profile name (e.g. name:profile).
+ */
+ (void) CopyMagickString(name,filename,(size_t)
+ (p-filename+1));
+ for (q=filename; *q != '\0'; q++)
+ *q=(*++p);
+ break;
+ }
+ profile=FileToStringInfo(filename,~0UL,&exception);
+ if (profile != (StringInfo *) NULL)
+ {
+ (void) ProfileImage(msl_info->image[n],name,
+ GetStringInfoDatum(profile),(size_t)
+ GetStringInfoLength(profile),&exception);
+ profile=DestroyStringInfo(profile);
+ }
+ continue;
+ }
+ ResetImageProfileIterator(profile_image);
+ name=GetNextImageProfile(profile_image);
+ while (name != (const char *) NULL)
+ {
+ profile=GetImageProfile(profile_image,name);
+ if (profile != (StringInfo *) NULL)
+ (void) ProfileImage(msl_info->image[n],name,
+ GetStringInfoDatum(profile),(size_t)
+ GetStringInfoLength(profile),&exception);
+ name=GetNextImageProfile(profile_image);
+ }
+ profile_image=DestroyImage(profile_image);
+ }
+ break;
+ }
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
}
case 'Q':
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"colors") == 0)
{
- quantize_info.number_colors=atol(value);
+ quantize_info.number_colors=StringToLong(value);
break;
}
if (LocaleCompare(keyword,"colorspace") == 0)
{
- option=ParseMagickOption(MagickColorspaceOptions,
+ option=ParseCommandOption(MagickColorspaceOptions,
MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,
{
if (LocaleCompare(keyword,"dither") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
{
if (LocaleCompare(keyword,"measure") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
{
if (LocaleCompare(keyword,"treedepth") == 0)
{
- quantize_info.tree_depth=atol(value);
+ quantize_info.tree_depth=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) QuantizeImage(&quantize_info,msl_info->image[n]);
+ (void) QuantizeImage(&quantize_info,msl_info->image[n],&exception);
break;
}
if (LocaleCompare((const char *) tag,"query-font-metrics") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
*p;
p=value;
- draw_info->affine.sx=strtod(p,&p);
+ draw_info->affine.sx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.rx=strtod(p,&p);
+ draw_info->affine.rx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ry=strtod(p,&p);
+ draw_info->affine.ry=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.sy=strtod(p,&p);
+ draw_info->affine.sy=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.tx=strtod(p,&p);
+ draw_info->affine.tx=StringToDouble(p,&p);
if (*p ==',')
p++;
- draw_info->affine.ty=strtod(p,&p);
+ draw_info->affine.ty=StringToDouble(p,&p);
break;
}
if (LocaleCompare(keyword,"align") == 0)
{
- option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+ option=ParseCommandOption(MagickAlignOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedAlignType",
}
if (LocaleCompare(keyword,"antialias") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedBooleanType",
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->fill,&exception);
break;
}
if (LocaleCompare(keyword,"family") == 0)
}
if (LocaleCompare(keyword,"gravity") == 0)
{
- option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+ option=ParseCommandOption(MagickGravityOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedGravityType",
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=atof(value);
+ draw_info->pointsize=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"rotate") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.sx=cos(DegreesToRadians(fmod(angle,360.0)));
affine.rx=sin(DegreesToRadians(fmod(angle,360.0)));
affine.ry=(-sin(DegreesToRadians(fmod(angle,360.0))));
}
if (LocaleCompare(keyword,"skewX") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.ry=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"skewY") == 0)
{
- angle=atof(value);
+ angle=StringToDouble(value,(char **) NULL);
affine.rx=cos(DegreesToRadians(fmod(angle,360.0)));
break;
}
if (LocaleCompare(keyword,"stretch") == 0)
{
- option=ParseMagickOption(MagickStretchOptions,MagickFalse,
- value);
+ option=ParseCommandOption(MagickStretchOptions,
+ MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStretchType",
value);
}
if (LocaleCompare(keyword, "stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->stroke,&exception);
break;
}
if (LocaleCompare(keyword,"strokewidth") == 0)
{
- draw_info->stroke_width=atol(value);
+ draw_info->stroke_width=StringToLong(value);
break;
}
if (LocaleCompare(keyword,"style") == 0)
{
- option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+ option=ParseCommandOption(MagickStyleOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedStyleType",
{
if (LocaleCompare(keyword, "undercolor") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->undercolor,
- &exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &draw_info->undercolor,&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"weight") == 0)
{
- draw_info->weight=atol(value);
+ draw_info->weight=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld",
- geometry.width,geometry.height,geometry.x,geometry.y);
+ (void) FormatLocaleString(text,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
+ geometry.height,(double) geometry.x,(double) geometry.y);
CloneString(&draw_info->geometry,text);
- draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx;
- draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx;
- draw_info->affine.ry=current.sx*affine.ry+current.ry*affine.sy;
- draw_info->affine.sy=current.rx*affine.ry+current.sy*affine.sy;
- draw_info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+
- current.tx;
- draw_info->affine.ty=current.rx*affine.tx+current.sy*affine.ty+
- current.ty;
- status=GetTypeMetrics(msl_info->attributes[n],draw_info,&metrics);
+ draw_info->affine.sx=affine.sx*current.sx+affine.ry*current.rx;
+ draw_info->affine.rx=affine.rx*current.sx+affine.sy*current.rx;
+ draw_info->affine.ry=affine.sx*current.ry+affine.ry*current.sy;
+ draw_info->affine.sy=affine.rx*current.ry+affine.sy*current.sy;
+ draw_info->affine.tx=affine.sx*current.tx+affine.ry*current.ty+
+ affine.tx;
+ draw_info->affine.ty=affine.rx*current.tx+affine.sy*current.ty+
+ affine.ty;
+ status=GetTypeMetrics(msl_info->attributes[n],draw_info,&metrics,
+ msl_info->exception);
if (status != MagickFalse)
{
Image
*image;
image=msl_info->attributes[n];
- FormatImageProperty(image,"msl:font-metrics.pixels_per_em.x","%g",
- metrics.pixels_per_em.x);
- FormatImageProperty(image,"msl:font-metrics.pixels_per_em.y","%g",
- metrics.pixels_per_em.y);
+ FormatImageProperty(image,"msl:font-metrics.pixels_per_em.x",
+ "%g",metrics.pixels_per_em.x);
+ FormatImageProperty(image,"msl:font-metrics.pixels_per_em.y",
+ "%g",metrics.pixels_per_em.y);
FormatImageProperty(image,"msl:font-metrics.ascent","%g",
metrics.ascent);
FormatImageProperty(image,"msl:font-metrics.descent","%g",
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=atol(value);
+ geometry.height=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"raise") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedNoiseType",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) RaiseImage(msl_info->image[n],&geometry,raise);
+ (void) RaiseImage(msl_info->image[n],&geometry,raise,
+ msl_info->exception);
break;
}
if (LocaleCompare((const char *) tag,"read") == 0)
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'F':
AppendImageToList(&msl_info->image[n],image);
break;
}
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
- break;
- }
- case 'G':
- case 'g':
- {
- if (LocaleCompare(keyword,"gravity") == 0)
- {
- option=ParseMagickOption(MagickGravityOptions,MagickFalse,
- value);
- if (option < 0)
- ThrowMSLException(OptionError,"UnrecognizedGravityType",
- value);
- (void) SetImageOption(msl_info->image_info[n],keyword,
- value);
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
- break;
- }
- case 'P':
- case 'p':
- {
- if (LocaleCompare(keyword,"pointsize") == 0)
- {
- msl_info->image_info[n]->pointsize=atof(value);
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
- break;
- }
- case 'S':
- case 's':
- {
- if (LocaleCompare(keyword,"size") == 0)
- {
- msl_info->image_info[n]->size=AcquireString(value);
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+ (void) SetMSLAttributes(msl_info,keyword,value);
break;
}
default:
{
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+ (void) SetMSLAttributes(msl_info,keyword,value);
break;
}
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- paint_image=ReduceNoiseImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ paint_image=StatisticImage(msl_info->image[n],NonpeakStatistic,
+ (size_t) geometry_info.rho,(size_t) geometry_info.sigma,
+ msl_info->exception);
if (paint_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'G':
{
if (LocaleCompare(keyword,"height") == 0)
{
- height = atol( value );
+ height = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"width") == 0)
{
- width = atol( value );
+ width = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"x") == 0)
{
- x = atol( value );
+ x = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"y") == 0)
{
- y = atol( value );
+ y = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
- case 'b':
- {
- if (LocaleCompare(keyword,"blur") == 0)
- {
- msl_info->image[n]->blur=atof(value);
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
- break;
- }
case 'G':
case 'g':
{
if (LocaleCompare(keyword,"geometry") == 0)
{
- long
+ ssize_t
flags;
flags=ParseGeometry(value,&geometry_info);
{
if (LocaleCompare(keyword,"x-resolution") == 0)
{
- x_resolution=atof(value);
+ x_resolution=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"y-resolution") == 0)
{
- y_resolution=atof(value);
+ y_resolution=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
factor=1.0;
if (msl_info->image[n]->units == PixelsPerCentimeterResolution)
factor=2.54;
- width=(unsigned long) (x_resolution*msl_info->image[n]->columns/
- (factor*(msl_info->image[n]->x_resolution == 0.0 ? DefaultResolution :
- msl_info->image[n]->x_resolution))+0.5);
- height=(unsigned long) (y_resolution*msl_info->image[n]->rows/
- (factor*(msl_info->image[n]->y_resolution == 0.0 ? DefaultResolution :
- msl_info->image[n]->y_resolution))+0.5);
+ width=(size_t) (x_resolution*msl_info->image[n]->columns/
+ (factor*(msl_info->image[n]->resolution.x == 0.0 ? DefaultResolution :
+ msl_info->image[n]->resolution.x))+0.5);
+ height=(size_t) (y_resolution*msl_info->image[n]->rows/
+ (factor*(msl_info->image[n]->resolution.y == 0.0 ? DefaultResolution :
+ msl_info->image[n]->resolution.y))+0.5);
resample_image=ResizeImage(msl_info->image[n],width,height,
- msl_info->image[n]->filter,msl_info->image[n]->blur,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->filter,msl_info->exception);
if (resample_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
if (LocaleCompare((const char *) tag,"resize") == 0)
{
- double
- blur;
-
FilterTypes
filter;
break;
}
filter=UndefinedFilter;
- blur=1.0;
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"filter") == 0)
{
- option=ParseMagickOption(MagickFilterOptions,MagickFalse,
+ option=ParseCommandOption(MagickFilterOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedNoiseType",
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=(unsigned long) atol(value);
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",
- keyword);
- break;
- }
- case 'S':
- case 's':
- {
- if (LocaleCompare(keyword,"support") == 0)
- {
- blur=atof(value);
+ geometry.height=StringToUnsignedLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
resize_image=ResizeImage(msl_info->image[n],geometry.width,
- geometry.height,filter,blur,&msl_info->image[n]->exception);
+ geometry.height,filter,msl_info->exception);
if (resize_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry.x=atol(value);
+ geometry.x=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry.y=atol(value);
+ geometry.y=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
roll_image=RollImage(msl_info->image[n],geometry.x,geometry.y,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (roll_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'G':
{
if (LocaleCompare(keyword,"x") == 0)
{
- x = atol( value );
+ x = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"y") == 0)
{
- y = atol( value );
+ y = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
Image
*newImage;
- newImage=RollImage(msl_info->image[n], x, y, &msl_info->image[n]->exception);
+ newImage=RollImage(msl_info->image[n], x, y, msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
rotate_image=RotateImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (rotate_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'D':
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- degrees = atof( value );
+ degrees = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
Image
*newImage;
- newImage=RotateImage(msl_info->image[n], degrees, &msl_info->image[n]->exception);
+ newImage=RotateImage(msl_info->image[n], degrees, msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=(unsigned long) atol(value);
+ geometry.height=StringToUnsignedLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
sample_image=SampleImage(msl_info->image[n],geometry.width,
- geometry.height,&msl_info->image[n]->exception);
+ geometry.height,msl_info->exception);
if (sample_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"height") == 0)
{
- geometry.height=(unsigned long) atol(value);
+ geometry.height=StringToUnsignedLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"width") == 0)
{
- geometry.width=atol(value);
+ geometry.width=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
scale_image=ScaleImage(msl_info->image[n],geometry.width,
- geometry.height,&msl_info->image[n]->exception);
+ geometry.height,msl_info->exception);
if (scale_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
geometry_info.rho=1.0;
geometry_info.sigma=1.5;
- colorspace=RGBColorspace;
+ colorspace=sRGBColorspace;
verbose=MagickFalse;
if (attributes != (const xmlChar **) NULL)
for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"cluster-threshold") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
if (LocaleCompare(keyword,"colorspace") == 0)
{
- option=ParseMagickOption(MagickColorspaceOptions,
+ option=ParseCommandOption(MagickColorspaceOptions,
MagickFalse,value);
if (option < 0)
ThrowMSLException(OptionError,
{
if (LocaleCompare(keyword,"smoothing-threshold") == 0)
{
- geometry_info.sigma=atof(value);
+ geometry_info.sigma=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
(void) SegmentImage(msl_info->image[n],colorspace,verbose,
- geometry_info.rho,geometry_info.sigma);
+ geometry_info.rho,geometry_info.sigma,&exception);
break;
}
else if (LocaleCompare((const char *) tag, "set") == 0)
{
if (msl_info->image[n] == (Image *) NULL)
{
- ThrowMSLException(OptionError,"NoImagesDefined",
- (const char *) tag);
+ ThrowMSLException(OptionError,"NoImagesDefined",(const char *) tag);
break;
}
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'C':
const char
*property;
- property=GetImageProperty(msl_info->attributes[j],"id");
+ property=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if (LocaleCompare(property,value) == 0)
{
- SetImageMask(msl_info->image[n],msl_info->image[j]);
+ SetImageMask(msl_info->image[n],msl_info->image[j],
+ &exception);
break;
}
}
const char
*property;
- property=GetImageProperty(msl_info->attributes[j],"id");
+ property=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if (LocaleCompare(property,value) == 0)
{
- SetImageClipMask(msl_info->image[n],msl_info->image[j]);
+ SetImageMask(msl_info->image[n],msl_info->image[j],
+ &exception);
break;
}
}
}
if (LocaleCompare(keyword,"colorspace") == 0)
{
- long
+ ssize_t
colorspace;
- colorspace=(ColorspaceType) ParseMagickOption(
- MagickColorspaceOptions,MagickFalse,keyword);
+ colorspace=(ColorspaceType) ParseCommandOption(
+ MagickColorspaceOptions,MagickFalse,value);
if (colorspace < 0)
ThrowMSLException(OptionError,"UnrecognizedColorspace",
value);
(void) TransformImageColorspace(msl_info->image[n],
- (ColorspaceType) colorspace);
+ (ColorspaceType) colorspace,&exception);
break;
}
(void) SetMSLAttributes(msl_info,keyword,value);
+ (void) SetImageProperty(msl_info->image[n],keyword,value,
+ &exception);
break;
}
case 'D':
if (LocaleCompare(keyword,"density") == 0)
{
flags=ParseGeometry(value,&geometry_info);
- msl_info->image[n]->x_resolution=geometry_info.rho;
- msl_info->image[n]->y_resolution=geometry_info.sigma;
+ msl_info->image[n]->resolution.x=geometry_info.rho;
+ msl_info->image[n]->resolution.y=geometry_info.sigma;
if ((flags & SigmaValue) == 0)
- msl_info->image[n]->y_resolution=
- msl_info->image[n]->x_resolution;
+ msl_info->image[n]->resolution.y=
+ msl_info->image[n]->resolution.x;
break;
}
(void) SetMSLAttributes(msl_info,keyword,value);
+ (void) SetImageProperty(msl_info->image[n],keyword,value,
+ &exception);
break;
}
case 'O':
{
if (LocaleCompare(keyword, "opacity") == 0)
{
- long opac = OpaqueOpacity,
- len = (long) strlen( value );
+ ssize_t opac = OpaqueAlpha,
+ len = (ssize_t) strlen( value );
if (value[len-1] == '%') {
char tmp[100];
(void) CopyMagickString(tmp,value,len);
- opac = atol( tmp );
+ opac = StringToLong( tmp );
opac = (int)(QuantumRange * ((float)opac/100));
} else
- opac = atol( value );
- (void) SetImageOpacity( msl_info->image[n], (Quantum) opac );
+ opac = StringToLong( value );
+ (void) SetImageAlpha( msl_info->image[n], (Quantum) opac,
+ &exception);
break;
}
(void) SetMSLAttributes(msl_info,keyword,value);
+ (void) SetImageProperty(msl_info->image[n],keyword,value,
+ msl_info->exception);
break;
}
case 'P':
if (image_option != (const char *) NULL)
flags=ParseAbsoluteGeometry(image_option,&geometry);
flags=ParseAbsoluteGeometry(value,&geometry);
- (void) FormatMagickString(page,MaxTextExtent,"%lux%lu",
- geometry.width,geometry.height);
+ (void) FormatLocaleString(page,MaxTextExtent,"%.20gx%.20g",
+ (double) geometry.width,(double) geometry.height);
if (((flags & XValue) != 0) || ((flags & YValue) != 0))
- (void) FormatMagickString(page,MaxTextExtent,"%lux%lu%+ld%+ld",
- geometry.width,geometry.height,geometry.x,geometry.y);
+ (void) FormatLocaleString(page,MaxTextExtent,
+ "%.20gx%.20g%+.20g%+.20g",(double) geometry.width,
+ (double) geometry.height,(double) geometry.x,(double)
+ geometry.y);
(void) SetImageOption(msl_info->image_info[n],keyword,page);
msl_info->image_info[n]->page=GetPageGeometry(page);
break;
}
(void) SetMSLAttributes(msl_info,keyword,value);
+ (void) SetImageProperty(msl_info->image[n],keyword,value,
+ msl_info->exception);
break;
}
default:
{
(void) SetMSLAttributes(msl_info,keyword,value);
+ (void) SetImageProperty(msl_info->image[n],keyword,value,
+ msl_info->exception);
break;
}
}
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"azimuth") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"elevation") == 0)
{
- geometry_info.sigma=atof(value);
+ geometry_info.sigma=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
if (LocaleCompare(keyword,"gray") == 0)
{
- option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+ option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
value);
if (option < 0)
ThrowMSLException(OptionError,"UnrecognizedNoiseType",
}
}
shade_image=ShadeImage(msl_info->image[n],gray,geometry_info.rho,
- geometry_info.sigma,&msl_info->image[n]->exception);
+ geometry_info.sigma,msl_info->exception);
if (shade_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"opacity") == 0)
{
- geometry_info.rho=atol(value);
+ geometry_info.rho=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"sigma") == 0)
{
- geometry_info.sigma=atol(value);
+ geometry_info.sigma=StringToLong(value);
break;
}
break;
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry_info.xi=atof(value);
+ geometry_info.xi=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry_info.psi=atol(value);
+ geometry_info.psi=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
shadow_image=ShadowImage(msl_info->image[n],geometry_info.rho,
- geometry_info.sigma,(long) (geometry_info.xi+0.5),(long)
- (geometry_info.psi+0.5),&msl_info->image[n]->exception);
+ geometry_info.sigma,(ssize_t) ceil(geometry_info.xi-0.5),
+ (ssize_t) ceil(geometry_info.psi-0.5),msl_info->exception);
if (shadow_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
}
if (LocaleCompare((const char *) tag,"sharpen") == 0)
{
- double radius = 0.0,
+ double
+ radius = 0.0,
sigma = 1.0;
if (msl_info->image[n] == (Image *) NULL)
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'R':
{
if (LocaleCompare(keyword, "radius") == 0)
{
- radius = atof( value );
+ radius = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"sigma") == 0)
{
- sigma = atol( value );
+ sigma = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
Image
*newImage;
- newImage=SharpenImage(msl_info->image[n],radius,sigma,&msl_info->image[n]->exception);
+ newImage=SharpenImage(msl_info->image[n],radius,sigma,
+ msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'G':
{
if (LocaleCompare(keyword,"height") == 0)
{
- height = atol( value );
+ height = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"width") == 0)
{
- width = atol( value );
+ width = StringToLong( value );
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
newImage=ShaveImage(msl_info->image[n], &rectInfo,
- &msl_info->image[n]->exception);
+ msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword, "fill") == 0)
{
- (void) QueryColorDatabase(value,
+ (void) QueryColorCompliance(value,AllCompliance,
&msl_info->image[n]->background_color,&exception);
break;
}
{
if (LocaleCompare(keyword,"x") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(keyword,"y") == 0)
{
- geometry_info.sigma=atol(value);
+ geometry_info.sigma=StringToLong(value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
shear_image=ShearImage(msl_info->image[n],geometry_info.rho,
- geometry_info.sigma,&msl_info->image[n]->exception);
+ geometry_info.sigma,msl_info->exception);
if (shear_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
}
}
- (void) SignatureImage(msl_info->image[n]);
+ (void) SignatureImage(msl_info->image[n],&exception);
break;
}
if (LocaleCompare((const char *) tag,"solarize") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"threshold") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
}
- (void) SolarizeImage(msl_info->image[n],geometry_info.rho);
+ (void) SolarizeImage(msl_info->image[n],geometry_info.rho,
+ msl_info->exception);
break;
}
if (LocaleCompare((const char *) tag,"spread") == 0)
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"radius") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
spread_image=SpreadImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->interpolate,msl_info->exception);
if (spread_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'I':
for (j=0; j<msl_info->n;j++)
{
const char *
- theAttr = GetImageProperty(msl_info->attributes[j], "id");
+ theAttr = GetImageProperty(msl_info->attributes[j], "id",
+ &exception);
if (theAttr && LocaleCompare(theAttr, value) == 0)
{
watermark = msl_info->image[j];
Image
*newImage;
- newImage=SteganoImage(msl_info->image[n], watermark, &msl_info->image[n]->exception);
+ newImage=SteganoImage(msl_info->image[n], watermark, msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'I':
for (j=0; j<msl_info->n;j++)
{
const char *
- theAttr = GetImageProperty(msl_info->attributes[j], "id");
+ theAttr = GetImageProperty(msl_info->attributes[j], "id",
+ &exception);
if (theAttr && LocaleCompare(theAttr, value) == 0)
{
stereoImage = msl_info->image[j];
Image
*newImage;
- newImage=StereoImage(msl_info->image[n], stereoImage, &msl_info->image[n]->exception);
+ newImage=StereoImage(msl_info->image[n], stereoImage, msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
*q,
*swap;
- long
+ ssize_t
index,
swap_index;
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
if (LocaleCompare(keyword,"indexes") == 0)
{
flags=ParseGeometry(value,&geometry_info);
- index=(long) geometry_info.rho;
+ index=(ssize_t) geometry_info.rho;
if ((flags & SigmaValue) == 0)
- swap_index=(long) geometry_info.sigma;
+ swap_index=(ssize_t) geometry_info.sigma;
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
ThrowMSLException(OptionError,"NoSuchImage",(const char *) tag);
break;
}
- swap=CloneImage(p,0,0,MagickTrue,&p->exception);
- ReplaceImageInList(&p,CloneImage(q,0,0,MagickTrue,&q->exception));
+ swap=CloneImage(p,0,0,MagickTrue,msl_info->exception);
+ ReplaceImageInList(&p,CloneImage(q,0,0,MagickTrue,
+ msl_info->exception));
ReplaceImageInList(&q,swap);
msl_info->image[n]=GetFirstImageInList(q);
break;
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
{
if (LocaleCompare(keyword,"degrees") == 0)
{
- geometry_info.rho=atof(value);
+ geometry_info.rho=StringToDouble(value,
+ (char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
}
}
swirl_image=SwirlImage(msl_info->image[n],geometry_info.rho,
- &msl_info->image[n]->exception);
+ msl_info->image[n]->interpolate,msl_info->exception);
if (swirl_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
}
}
}
- (void) SyncImage(msl_info->image[n]);
+ (void) SyncImage(msl_info->image[n],&exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
{
keyword=(const char *) attributes[i++];
attribute=InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]);
+ msl_info->attributes[n],(const char *) attributes[i],
+ &exception);
CloneString(&value,attribute);
switch (*keyword)
{
const char
*attribute;
- attribute=GetImageProperty(msl_info->attributes[j],"id");
+ attribute=GetImageProperty(msl_info->attributes[j],"id",
+ &exception);
if ((attribute != (const char *) NULL) &&
(LocaleCompare(attribute,value) == 0))
{
}
}
}
- (void) TextureImage(msl_info->image[n],texture_image);
+ (void) TextureImage(msl_info->image[n],texture_image,&exception);
texture_image=DestroyImage(texture_image);
break;
}
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'T':
{
if (LocaleCompare(keyword,"threshold") == 0)
{
- threshold = atof( value );
+ threshold = StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
process image.
*/
{
- BilevelImageChannel(msl_info->image[n],
- (ChannelType) ((long) (AllChannels &~ (long) OpacityChannel)),
- threshold);
- break;
+ BilevelImage(msl_info->image[n],threshold,&exception);
+ break;
}
}
else if (LocaleCompare((const char *) tag, "transparent") == 0)
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'C':
{
if (LocaleCompare(keyword,"color") == 0)
{
- MagickPixelPacket
+ PixelInfo
target;
- (void) QueryMagickColor(value,&target,&exception);
+ (void) QueryColorCompliance(value,AllCompliance,&target,
+ &exception);
(void) TransparentPaintImage(msl_info->image[n],&target,
- TransparentOpacity,MagickFalse);
+ TransparentAlpha,MagickFalse,msl_info->exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
rectInfo.height = rectInfo.width = 0;
rectInfo.x = rectInfo.y = 0;
- newImage=CropImage(msl_info->image[n],&rectInfo, &msl_info->image[n]->exception);
+ newImage=CropImage(msl_info->image[n],&rectInfo, msl_info->exception);
if (newImage == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
{
keyword=(const char *) attributes[i++];
CloneString(&value,InterpretImageProperties(msl_info->image_info[n],
- msl_info->attributes[n],(const char *) attributes[i]));
+ msl_info->attributes[n],(const char *) attributes[i],&exception));
switch (*keyword)
{
case 'F':
MaxTextExtent);
break;
}
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
- }
- case 'Q':
- case 'q':
- {
- if (LocaleCompare(keyword,"quality") == 0)
- {
- msl_info->image_info[n]->quality=atol(value);
- msl_info->image[n]->quality=
- msl_info->image_info[n]->quality;
- break;
- }
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+ (void) SetMSLAttributes(msl_info,keyword,value);
}
default:
{
- ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+ (void) SetMSLAttributes(msl_info,keyword,value);
break;
}
}
/* process */
{
- (void) WriteImage(msl_info->image_info[n], msl_info->image[n]);
+ (void) WriteImage(msl_info->image_info[n], msl_info->image[n],
+ msl_info->exception);
break;
}
}
static void MSLEndElement(void *context,const xmlChar *tag)
{
- long
+ ssize_t
n;
MSLInfo
break;
StripString(msl_info->content);
(void) SetImageProperty(msl_info->image[n],"comment",
- msl_info->content);
+ msl_info->content,msl_info->exception);
break;
}
break;
{
if (msl_info->group_info[msl_info->number_groups-1].numImages > 0 )
{
- long i = (long)
+ ssize_t i = (ssize_t)
(msl_info->group_info[msl_info->number_groups-1].numImages);
while ( i-- )
{
if (msl_info->image[msl_info->n] != (Image *) NULL)
- msl_info->image[msl_info->n]=DestroyImage(msl_info->image[msl_info->n]);
- msl_info->attributes[msl_info->n]=DestroyImage(msl_info->attributes[msl_info->n]);
- msl_info->image_info[msl_info->n]=DestroyImageInfo(msl_info->image_info[msl_info->n]);
+ msl_info->image[msl_info->n]=DestroyImage(
+ msl_info->image[msl_info->n]);
+ msl_info->attributes[msl_info->n]=DestroyImage(
+ msl_info->attributes[msl_info->n]);
+ msl_info->image_info[msl_info->n]=DestroyImageInfo(
+ msl_info->image_info[msl_info->n]);
msl_info->n--;
}
}
break;
StripString(msl_info->content);
(void) SetImageProperty(msl_info->image[n],"label",
- msl_info->content);
+ msl_info->content,msl_info->exception);
break;
}
break;
register char
*p;
- register long
+ register ssize_t
i;
/*
else
{
msl_info->content=(char *) NULL;
- if (~length >= MaxTextExtent)
+ if (~length >= (MaxTextExtent-1))
msl_info->content=(char *) AcquireQuantumMemory(length+MaxTextExtent,
sizeof(*msl_info->content));
if (msl_info->content != (char *) NULL)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" SAX.ignorableWhitespace(%.30s, %d)",c,length);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
}
static void MSLProcessingInstructions(void *context,const xmlChar *target,
" SAX.processingInstruction(%s, %s)",
target,data);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
}
static void MSLComment(void *context,const xmlChar *value)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" SAX.comment(%s)",value);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
}
static void MSLWarning(void *context,const char *format,...)
(void) LogMagickEvent(CoderEvent,GetMagickModule()," SAX.warning: ");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),format,operands);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
(void) LogMagickEvent(CoderEvent,GetMagickModule()," SAX.error: ");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),format,operands);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
#if !defined(MAGICKCORE_HAVE_VSNPRINTF)
(void) vsprintf(reason,format,operands);
#else
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" SAX.pcdata(%s, %d)",value,length);
msl_info=(MSLInfo *) context;
+ (void) msl_info;
parser=msl_info->parser;
child=xmlGetLastChild(parser->node);
if ((child != (xmlNodePtr) NULL) && (child->type == XML_CDATA_SECTION_NODE))
(external_id != (const xmlChar *) NULL ? (const char *) external_id : " "),
(system_id != (const xmlChar *) NULL ? (const char *) system_id : " "));
msl_info=(MSLInfo *) context;
+ (void) msl_info;
parser=msl_info->parser;
if (((external_id == NULL) && (system_id == NULL)) ||
((parser->validate == 0) || (parser->wellFormed == 0) ||
static MagickBooleanType ProcessMSLScript(const ImageInfo *image_info,Image **image,
ExceptionInfo *exception)
{
- xmlSAXHandler
- SAXModules =
- {
- MSLInternalSubset,
- MSLIsStandalone,
- MSLHasInternalSubset,
- MSLHasExternalSubset,
- MSLResolveEntity,
- MSLGetEntity,
- MSLEntityDeclaration,
- MSLNotationDeclaration,
- MSLAttributeDeclaration,
- MSLElementDeclaration,
- MSLUnparsedEntityDeclaration,
- MSLSetDocumentLocator,
- MSLStartDocument,
- MSLEndDocument,
- MSLStartElement,
- MSLEndElement,
- MSLReference,
- MSLCharacters,
- MSLIgnorableWhitespace,
- MSLProcessingInstructions,
- MSLComment,
- MSLWarning,
- MSLError,
- MSLError,
- MSLGetParameterEntity,
- MSLCDataBlock,
- MSLExternalSubset
- };
-
char
message[MaxTextExtent];
int
status;
- long
+ ssize_t
n;
MSLInfo
msl_info;
+ xmlSAXHandler
+ sax_modules;
+
xmlSAXHandlerPtr
- SAXHandler;
+ sax_handler;
/*
Open image file.
assert(image_info != (const ImageInfo *) NULL);
assert(image_info->signature == MagickSignature);
if (image_info->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image_info->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
+ image_info->filename);
assert(image != (Image **) NULL);
- msl_image=AcquireImage(image_info);
+ msl_image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,msl_image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
"UnableToInterpretMSLImage");
*msl_info.image_info=CloneImageInfo(image_info);
*msl_info.draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
- *msl_info.attributes=AcquireImage(image_info);
+ *msl_info.attributes=AcquireImage(image_info,exception);
msl_info.group_info[0].numImages=0;
/* the first slot is used to point to the MSL file image */
*msl_info.image=msl_image;
if (*image != (Image *) NULL)
MSLPushImage(&msl_info,*image);
(void) xmlSubstituteEntitiesDefault(1);
- SAXHandler=(&SAXModules);
- msl_info.parser=xmlCreatePushParserCtxt(SAXHandler,&msl_info,(char *) NULL,0,
+ (void) ResetMagickMemory(&sax_modules,0,sizeof(sax_modules));
+ sax_modules.internalSubset=MSLInternalSubset;
+ sax_modules.isStandalone=MSLIsStandalone;
+ sax_modules.hasInternalSubset=MSLHasInternalSubset;
+ sax_modules.hasExternalSubset=MSLHasExternalSubset;
+ sax_modules.resolveEntity=MSLResolveEntity;
+ sax_modules.getEntity=MSLGetEntity;
+ sax_modules.entityDecl=MSLEntityDeclaration;
+ sax_modules.notationDecl=MSLNotationDeclaration;
+ sax_modules.attributeDecl=MSLAttributeDeclaration;
+ sax_modules.elementDecl=MSLElementDeclaration;
+ sax_modules.unparsedEntityDecl=MSLUnparsedEntityDeclaration;
+ sax_modules.setDocumentLocator=MSLSetDocumentLocator;
+ sax_modules.startDocument=MSLStartDocument;
+ sax_modules.endDocument=MSLEndDocument;
+ sax_modules.startElement=MSLStartElement;
+ sax_modules.endElement=MSLEndElement;
+ sax_modules.reference=MSLReference;
+ sax_modules.characters=MSLCharacters;
+ sax_modules.ignorableWhitespace=MSLIgnorableWhitespace;
+ sax_modules.processingInstruction=MSLProcessingInstructions;
+ sax_modules.comment=MSLComment;
+ sax_modules.warning=MSLWarning;
+ sax_modules.error=MSLError;
+ sax_modules.fatalError=MSLError;
+ sax_modules.getParameterEntity=MSLGetParameterEntity;
+ sax_modules.cdataBlock=MSLCDataBlock;
+ sax_modules.externalSubset=MSLExternalSubset;
+ sax_handler=(&sax_modules);
+ msl_info.parser=xmlCreatePushParserCtxt(sax_handler,&msl_info,(char *) NULL,0,
msl_image->filename);
while (ReadBlobString(msl_image,message) != (char *) NULL)
{
- n=(long) strlen(message);
+ n=(ssize_t) strlen(message);
if (n == 0)
continue;
status=xmlParseChunk(msl_info.parser,message,(int) n,MagickFalse);
msl_info.group_info);
if (*image == (Image *) NULL)
*image=(*msl_info.image);
- return((MagickBooleanType) ((*msl_info.image)->exception.severity == UndefinedException));
+ if (msl_info.exception->severity != UndefinedException)
+ return(MagickFalse);
+ return(MagickTrue);
}
static Image *ReadMSLImage(const ImageInfo *image_info,ExceptionInfo *exception)
%
% The format of the RegisterMSLImage method is:
%
-% unsigned long RegisterMSLImage(void)
+% size_t RegisterMSLImage(void)
%
*/
-ModuleExport unsigned long RegisterMSLImage(void)
+ModuleExport size_t RegisterMSLImage(void)
{
MagickInfo
*entry;
return(MagickImageCoderSignature);
}
\f
+#if defined(MAGICKCORE_XML_DELEGATE)
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
const char *value)
{
+ Image
+ *attributes;
+
DrawInfo
*draw_info;
ExceptionInfo
*exception;
+ GeometryInfo
+ geometry_info;
+
+ Image
+ *image;
+
ImageInfo
*image_info;
- long
+ int
+ flags;
+
+ ssize_t
n;
assert(msl_info != (MSLInfo *) NULL);
return(MagickTrue);
exception=msl_info->exception;
n=msl_info->n;
+ attributes=msl_info->attributes[n];
image_info=msl_info->image_info[n];
draw_info=msl_info->draw_info[n];
+ image=msl_info->image[n];
switch (*keyword)
{
case 'A':
{
if (LocaleCompare(keyword,"adjoin") == 0)
{
- long
+ ssize_t
adjoin;
- adjoin=ParseMagickOption(MagickBooleanOptions,MagickFalse,value);
+ adjoin=ParseCommandOption(MagickBooleanOptions,MagickFalse,value);
if (adjoin < 0)
ThrowMSLException(OptionError,"UnrecognizedType",value);
image_info->adjoin=(MagickBooleanType) adjoin;
break;
}
+ if (LocaleCompare(keyword,"alpha") == 0)
+ {
+ ssize_t
+ alpha;
+
+ alpha=ParseCommandOption(MagickAlphaOptions,MagickFalse,value);
+ if (alpha < 0)
+ ThrowMSLException(OptionError,"UnrecognizedType",value);
+ if (image != (Image *) NULL)
+ (void) SetImageAlphaChannel(image,(AlphaChannelType) alpha,
+ exception);
+ break;
+ }
+ if (LocaleCompare(keyword,"antialias") == 0)
+ {
+ ssize_t
+ antialias;
+
+ antialias=ParseCommandOption(MagickBooleanOptions,MagickFalse,value);
+ if (antialias < 0)
+ ThrowMSLException(OptionError,"UnrecognizedGravityType",value);
+ image_info->antialias=(MagickBooleanType) antialias;
+ break;
+ }
+ if (LocaleCompare(keyword,"area-limit") == 0)
+ {
+ MagickSizeType
+ limit;
+
+ limit=MagickResourceInfinity;
+ if (LocaleCompare(value,"unlimited") != 0)
+ limit=(MagickSizeType) StringToDoubleInterval(value,100.0);
+ (void) SetMagickResourceLimit(AreaResource,limit);
+ break;
+ }
+ if (LocaleCompare(keyword,"attenuate") == 0)
+ {
+ (void) SetImageOption(image_info,keyword,value);
+ break;
+ }
+ if (LocaleCompare(keyword,"authenticate") == 0)
+ {
+ (void) CloneString(&image_info->density,value);
+ break;
+ }
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
break;
}
{
if (LocaleCompare(keyword,"background") == 0)
{
- (void) QueryColorDatabase(value,&image_info->background_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->background_color,exception);
+ break;
+ }
+ if (LocaleCompare(keyword,"blue-primary") == 0)
+ {
+ if (image == (Image *) NULL)
+ break;
+ flags=ParseGeometry(value,&geometry_info);
+ image->chromaticity.blue_primary.x=geometry_info.rho;
+ image->chromaticity.blue_primary.y=geometry_info.sigma;
+ if ((flags & SigmaValue) == 0)
+ image->chromaticity.blue_primary.y=
+ image->chromaticity.blue_primary.x;
break;
}
if (LocaleCompare(keyword,"bordercolor") == 0)
{
- (void) QueryColorDatabase(value,&image_info->border_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->border_color,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"fill") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->fill,exception);
+ (void) QueryColorCompliance(value,AllCompliance,&draw_info->fill,
+ exception);
+ (void) SetImageOption(image_info,keyword,value);
+ break;
+ }
+ if (LocaleCompare(keyword,"filename") == 0)
+ {
+ (void) CopyMagickString(image_info->filename,value,MaxTextExtent);
+ break;
+ }
+ ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+ break;
+ }
+ case 'G':
+ case 'g':
+ {
+ if (LocaleCompare(keyword,"gravity") == 0)
+ {
+ ssize_t
+ gravity;
+
+ gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,value);
+ if (gravity < 0)
+ ThrowMSLException(OptionError,"UnrecognizedGravityType",value);
+ (void) SetImageOption(image_info,keyword,value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"id") == 0)
{
- (void) SetImageProperty(msl_info->attributes[n],keyword,NULL);
- (void) SetImageProperty(msl_info->attributes[n],keyword,value);
+ (void) SetImageProperty(attributes,keyword,value,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
if (LocaleCompare(keyword,"mattecolor") == 0)
{
- (void) QueryColorDatabase(value,&image_info->matte_color,
- exception);
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->matte_color,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
{
if (LocaleCompare(keyword,"pointsize") == 0)
{
- draw_info->pointsize=atof(value);
+ image_info->pointsize=StringToDouble(value,(char **) NULL);
+ draw_info->pointsize=StringToDouble(value,(char **) NULL);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
break;
}
+ case 'Q':
+ case 'q':
+ {
+ if (LocaleCompare(keyword,"quality") == 0)
+ {
+ image_info->quality=StringToLong(value);
+ if (image == (Image *) NULL)
+ break;
+ image->quality=StringToLong(value);
+ break;
+ }
+ break;
+ }
case 'S':
case 's':
{
}
if (LocaleCompare(keyword,"stroke") == 0)
{
- (void) QueryColorDatabase(value,&draw_info->stroke,exception);
+ (void) QueryColorCompliance(value,AllCompliance,&draw_info->stroke,
+ exception);
+ (void) SetImageOption(image_info,keyword,value);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
}
return(MagickTrue);
}
+#endif
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% The format of the WriteMSLImage method is:
%
-% MagickBooleanType WriteMSLImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteMSLImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-static MagickBooleanType WriteMSLImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteMSLImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
assert(image_info != (const ImageInfo *) NULL);
assert(image_info->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
(void) ReferenceImage(image);
- (void) ProcessMSLScript(image_info,&image,&image->exception);
+ (void) ProcessMSLScript(image_info,&image,exception);
return(MagickTrue);
}
#endif
projects / imagemagick / blobdiff