% March 2000 %
% %
% %
-% Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2017 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 %
% obtain a copy of the License at %
% %
-% http://www.imagemagick.org/script/license.php %
+% https://www.imagemagick.org/script/license.php %
% %
% Unless required by applicable law or agreed to in writing, software %
% distributed under the License is distributed on an "AS IS" BASIS, %
if (clone_image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
clone_image->filename);
- (void) CopyMagickString(image->filename,clone_image->filename,MagickPathExtent);
+ (void) CopyMagickString(image->filename,clone_image->filename,
+ MagickPathExtent);
(void) CopyMagickString(image->magick_filename,clone_image->magick_filename,
MagickPathExtent);
image->compression=clone_image->compression;
image->quality=clone_image->quality;
image->depth=clone_image->depth;
- image->alpha_color=clone_image->alpha_color;
+ image->matte_color=clone_image->matte_color;
image->background_color=clone_image->background_color;
image->border_color=clone_image->border_color;
image->transparent_color=clone_image->transparent_color;
%
% DefineImageProperty() associates an assignment string of the form
% "key=value" with an artifact or options. It is equivelent to
-% SetImageProperty()
+% SetImageProperty().
%
% The format of the DefineImageProperty method is:
%
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- image->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->properties == (void *) NULL)
return(MagickFalse);
return(DeleteNodeFromSplayTree((SplayTreeInfo *) image->properties,property));
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- image->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->properties != (void *) NULL)
image->properties=(void *) DestroySplayTree((SplayTreeInfo *)
image->properties);
register ssize_t
i;
+ size_t
+ length;
+
ssize_t
count,
id,
sub_number;
- size_t
- length;
-
/*
There are no newlines in path names, so it's safe as terminator.
*/
if ((count & 0x01) == 0)
(void) ReadPropertyByte(&info,&length);
count=(ssize_t) ReadPropertyMSBLong(&info,&length);
+ if ((count < 0) || ((size_t) count > length))
+ {
+ length=0;
+ continue;
+ }
if ((*name != '\0') && (*name != '#'))
if ((resource == (char *) NULL) || (LocaleCompare(name,resource) != 0))
{
info+=count;
length-=MagickMin(count,(ssize_t) length);
if ((id <= 1999) || (id >= 2999))
- (void) SetImageProperty((Image *) image,key,(const char *)
- attribute,exception);
+ (void) SetImageProperty((Image *) image,key,(const char *) attribute,
+ exception);
else
{
char
value|=(unsigned int) buffer[2] << 8;
value|=(unsigned int) buffer[3];
return(value & 0xffffffff);
-}
+}
static inline signed short ReadPropertySignedShort(const EndianType endian,
const unsigned char *buffer)
char
info[MagickPathExtent];
- (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,
- "en","US",info,MagickPathExtent);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en","US",
+ info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:description",info,
exception);
- (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,
- "en","US",info,MagickPathExtent);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en","US",
+ info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:manufacturer",info,
exception);
- (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en",
- "US",info,MagickPathExtent);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US",info,
+ MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:model",info,exception);
- (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,
- "en","US",info,MagickPathExtent);
+ (void) cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en","US",
+ info,MagickPathExtent);
(void) SetImageProperty((Image *) image,"icc:copyright",info,exception);
#endif
(void) cmsCloseProfile(icc_profile);
description=GetXMLTreeChild(rdf,"rdf:Description");
while (description != (XMLTreeInfo *) NULL)
{
+ char
+ *xmp_namespace;
+
node=GetXMLTreeChild(description,(const char *) NULL);
while (node != (XMLTreeInfo *) NULL)
{
content=GetXMLTreeContent(node);
if ((child == (XMLTreeInfo *) NULL) &&
(SkipXMPValue(content) == MagickFalse))
- (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
- ConstantString(GetXMLTreeTag(node)),ConstantString(content));
+ {
+ xmp_namespace=ConstantString(GetXMLTreeTag(node));
+ (void) SubstituteString(&xmp_namespace,"exif:","xmp:");
+ (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
+ xmp_namespace,ConstantString(content));
+ }
while (child != (XMLTreeInfo *) NULL)
{
content=GetXMLTreeContent(child);
if (SkipXMPValue(content) == MagickFalse)
- (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
- ConstantString(GetXMLTreeTag(child)),ConstantString(content));
+ {
+ xmp_namespace=ConstantString(GetXMLTreeTag(node));
+ (void) SubstituteString(&xmp_namespace,"exif:","xmp:");
+ (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
+ xmp_namespace,ConstantString(content));
+ }
child=GetXMLTreeSibling(child);
}
node=GetXMLTreeSibling(node);
"<svg xmlns=\"http://www.w3.org/2000/svg\""
" width=\"%.20g\" height=\"%.20g\">\n"
"<g>\n"
- "<path fill-rule=\"evenodd\" style=\"fill:#00000000;stroke:#00000000;"
+ "<path fill-rule=\"evenodd\" style=\"fill:#000000;stroke:#000000;"
"stroke-width:0;stroke-antialiasing:false\" d=\"\n"),(double) columns,
(double) rows);
(void) ConcatenateString(&path,message);
}
char
- value[MagickPathExtent]; /* formated string to store as a returned artifact */
+ value[MagickPathExtent]; /* formatted string to store as an artifact */
const char
*string; /* return a string already stored somewher */
{
WarnNoImageReturn("\"%%%c\"",letter);
GetPathComponent(image->magick_filename,HeadPath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
case 'e': /* Filename extension (suffix) of image file */
{
WarnNoImageReturn("\"%%%c\"",letter);
GetPathComponent(image->magick_filename,ExtensionPath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
case 'f': /* Filename without directory component */
{
WarnNoImageReturn("\"%%%c\"",letter);
GetPathComponent(image->magick_filename,TailPath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
case 'g': /* Image geometry, canvas and offset %Wx%H+%X+%Y */
{
WarnNoImageReturn("\"%%%c\"",letter);
string=GetImageProperty(image,"label",exception);
- if ( string == (const char *) NULL)
+ if (string == (const char *) NULL)
string="";
break;
}
{
WarnNoImageReturn("\"%%%c\"",letter);
GetPathComponent(image->magick_filename,BasePath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
case 'u': /* Unique filename */
case 'z': /* Image depth as read in */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
- (double) image->depth);
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
+ image->depth);
break;
}
case 'A': /* Image alpha channel */
case 'C': /* Image compression method. */
{
WarnNoImageReturn("\"%%%c\"",letter);
- string=CommandOptionToMnemonic(MagickCompressOptions,
- (ssize_t) image->compression);
+ string=CommandOptionToMnemonic(MagickCompressOptions,(ssize_t)
+ image->compression);
break;
}
case 'D': /* Image dispose method. */
{
WarnNoImageReturn("\"%%%c\"",letter);
- string=CommandOptionToMnemonic(MagickDisposeOptions,
- (ssize_t) image->dispose);
+ string=CommandOptionToMnemonic(MagickDisposeOptions,(ssize_t)
+ image->dispose);
break;
}
case 'G': /* Image size as geometry = "%wx%h" */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",
- (double)image->magick_columns,(double) image->magick_rows);
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",(double)
+ image->magick_columns,(double) image->magick_rows);
break;
}
case 'H': /* layer canvas height */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MagickPathExtent,"%.20g",
- (double) image->page.height);
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
+ image->page.height);
break;
}
case 'M': /* Magick filename - filename given incl. coder & read mods */
case 'P': /* layer canvas page size = "%Wx%H" */
{
WarnNoImageReturn("\"%%%c\"",letter);
- (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",
- (double) image->page.width,(double) image->page.height);
+ (void) FormatLocaleString(value,MagickPathExtent,"%.20gx%.20g",(double)
+ image->page.width,(double) image->page.height);
break;
}
case 'Q': /* image compression quality */
case 'U': /* Image resolution units. */
{
WarnNoImageReturn("\"%%%c\"",letter);
- string=CommandOptionToMnemonic(MagickResolutionOptions,
- (ssize_t) image->units);
+ string=CommandOptionToMnemonic(MagickResolutionOptions,(ssize_t)
+ image->units);
break;
}
case 'W': /* layer canvas width */
assert(property[0] != '\0');
assert(image != (Image *) NULL || image_info != (ImageInfo *) NULL );
-
if (property[1] == '\0') /* single letter property request */
return(GetMagickPropertyLetter(image_info,image,*property,exception));
-
- if (image != (Image *) NULL && image->debug != MagickFalse)
+ if ((image != (Image *) NULL) && (image->debug != MagickFalse))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- else if( image_info != (ImageInfo *) NULL && image_info->debug != MagickFalse)
+ else
+ if ((image_info != (ImageInfo *) NULL) &&
+ (image_info->debug != MagickFalse))
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s","no-images");
-
*value='\0'; /* formated string */
string=(char *) NULL; /* constant string reference */
switch (*property)
{
WarnNoImageReturn("\"%%[%s]\"",property);
GetPathComponent(image->magick_filename,BasePath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
if (LocaleCompare("bit-depth",property) == 0)
{
(void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
- GetImageDepth(image, exception));
+ GetImageDepth(image,exception));
break;
}
break;
{
WarnNoImageReturn("\"%%[%s]\"",property);
GetPathComponent(image->magick_filename,HeadPath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
break;
{
WarnNoImageReturn("\"%%[%s]\"",property);
GetPathComponent(image->magick_filename,ExtensionPath,value);
- if (*value == '\0') string="";
+ if (*value == '\0')
+ string="";
break;
}
break;
image->units);
break;
}
- if (LocaleCompare("copyright",property) == 0)
break;
}
case 'v':
if (string != (char *) NULL)
return(string);
if (*value != '\0')
- {
- /* create a cloned copy of result, that will get cleaned up, eventually */
- if (image != (Image *) NULL)
- {
- (void) SetImageArtifact(image,"get-property",value);
- return(GetImageArtifact(image,"get-property"));
- }
- else
- {
- (void) SetImageOption(image_info,"get-property",value);
- return(GetImageOption(image_info,"get-property"));
- }
- }
+ {
+ /*
+ Create a cloned copy of result, that will get cleaned up, eventually.
+ */
+ if (image != (Image *) NULL)
+ {
+ (void) SetImageArtifact(image,"get-property",value);
+ return(GetImageArtifact(image,"get-property"));
+ }
+ else
+ {
+ (void) SetImageOption(image_info,"get-property",value);
+ return(GetImageOption(image_info,"get-property"));
+ }
+ }
return((char *) NULL);
}
#undef WarnNoImageReturn
image->filename);
if (image->properties == (void *) NULL)
return((const char *) NULL);
- return((const char *) GetNextKeyInSplayTree(
- (SplayTreeInfo *) image->properties));
+ return((const char *) GetNextKeyInSplayTree((SplayTreeInfo *) image->properties));
}
\f
/*
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport char *InterpretImageProperties(ImageInfo *image_info,
- Image *image,const char *embed_text,ExceptionInfo *exception)
+MagickExport char *InterpretImageProperties(ImageInfo *image_info,Image *image,
+ const char *embed_text,ExceptionInfo *exception)
{
#define ExtendInterpretText(string_length) \
DisableMSCWarning(4127) \
char
*interpret_text;
+ MagickBooleanType
+ number;
+
register char
*q; /* current position in interpret_text */
size_t
extent; /* allocated length of interpret_text */
- MagickBooleanType
- number;
-
assert(image == NULL || image->signature == MagickCoreSignature);
assert(image_info == NULL || image_info->signature == MagickCoreSignature);
if ((image != (Image *) NULL) && (image->debug != MagickFalse))
interpret_text=AcquireString(embed_text); /* new string with extra space */
extent=MagickPathExtent; /* allocated space in string */
number=MagickFalse; /* is last char a number? */
- for (q=interpret_text; *p!='\0';
- number=isdigit(*p) ? MagickTrue : MagickFalse,p++)
+ for (q=interpret_text; *p!='\0'; number=isdigit(*p) ? MagickTrue : MagickFalse,p++)
{
/*
Look for the various escapes, (and handle other specials)
pattern[63] = '.';
pattern[64] = '\0';
}
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnbalancedBraces","\"%%[%s\"",pattern);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "UnbalancedBraces","\"%%[%s\"",pattern);
interpret_text=DestroyString(interpret_text);
return((char *) NULL);
}
*/
if (LocaleNCompare("fx:",pattern,3) == 0)
{
- FxInfo
- *fx_info;
-
double
value;
+ FxInfo
+ *fx_info;
+
MagickBooleanType
status;
}
continue;
}
- if (LocaleNCompare("pixel:",pattern,6) == 0)
+ if (LocaleNCompare("hex:",pattern,4) == 0)
{
+ double
+ value;
+
FxInfo
*fx_info;
+ MagickStatusType
+ status;
+
+ PixelInfo
+ pixel;
+
+ /*
+ Pixel - color value calculator.
+ */
+ if (image == (Image *) NULL)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ OptionWarning,"NoImageForProperty","\"%%[%s]\"",pattern);
+ continue; /* else no image to retrieve artifact */
+ }
+ GetPixelInfo(image,&pixel);
+ fx_info=AcquireFxInfo(image,pattern+4,exception);
+ status=FxEvaluateChannelExpression(fx_info,RedPixelChannel,0,0,
+ &value,exception);
+ pixel.red=(double) QuantumRange*value;
+ status&=FxEvaluateChannelExpression(fx_info,GreenPixelChannel,0,0,
+ &value,exception);
+ pixel.green=(double) QuantumRange*value;
+ status&=FxEvaluateChannelExpression(fx_info,BluePixelChannel,0,0,
+ &value,exception);
+ pixel.blue=(double) QuantumRange*value;
+ if (image->colorspace == CMYKColorspace)
+ {
+ status&=FxEvaluateChannelExpression(fx_info,BlackPixelChannel,0,0,
+ &value,exception);
+ pixel.black=(double) QuantumRange*value;
+ }
+ status&=FxEvaluateChannelExpression(fx_info,AlphaPixelChannel,0,0,
+ &value,exception);
+ pixel.alpha=(double) QuantumRange*value;
+ fx_info=DestroyFxInfo(fx_info);
+ if (status != MagickFalse)
+ {
+ char
+ hex[MagickPathExtent],
+ name[MagickPathExtent];
+
+ (void) QueryColorname(image,&pixel,SVGCompliance,name,exception);
+ GetColorTuple(&pixel,MagickTrue,hex);
+ AppendString2Text(hex+1);
+ }
+ continue;
+ }
+ if (LocaleNCompare("pixel:",pattern,6) == 0)
+ {
double
value;
+ FxInfo
+ *fx_info;
+
MagickStatusType
status;
char
name[MagickPathExtent];
- (void) QueryColorname(image,&pixel,SVGCompliance,name,
- exception);
+ (void) QueryColorname(image,&pixel,SVGCompliance,name,exception);
AppendString2Text(name);
}
continue;
% o property: the image property.
%
*/
-MagickExport char *RemoveImageProperty(Image *image,
- const char *property)
+MagickExport char *RemoveImageProperty(Image *image,const char *property)
{
char
*value;
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- image->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->properties == (void *) NULL)
return((char *) NULL);
value=(char *) RemoveNodeFromSplayTree((SplayTreeInfo *) image->properties,
assert(image != (Image *) NULL);
assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- image->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->properties == (void *) NULL)
return;
ResetSplayTreeIterator((SplayTreeInfo *) image->properties);
{
if (LocaleNCompare("8bim:",property,5) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break;
}
if (LocaleCompare("delay_units",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
if (LocaleCompare("density",property) == 0)
{
if (LocaleNCompare("exif:",property,5) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
{
if (LocaleNCompare("fx:",property,3) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
{
if (LocaleCompare("height",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
ssize_t
intensity;
- intensity=ParseCommandOption(MagickIntentOptions,MagickFalse,
- value);
+ intensity=ParseCommandOption(MagickIntentOptions,MagickFalse,value);
if (intensity < 0)
return(MagickFalse);
image->intensity=(PixelIntensityMethod) intensity;
Throwing an exception causes this setting to fail */
if (LocaleNCompare("iptc:",property,5) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
#endif
case 'k':
if (LocaleCompare("kurtosis",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
}
case 'M':
case 'm':
- if ( (LocaleCompare("magick",property) == 0) ||
- (LocaleCompare("max",property) == 0) ||
- (LocaleCompare("mean",property) == 0) ||
- (LocaleCompare("min",property) == 0) ||
- (LocaleCompare("min",property) == 0) )
+ if ((LocaleCompare("magick",property) == 0) ||
+ (LocaleCompare("max",property) == 0) ||
+ (LocaleCompare("mean",property) == 0) ||
+ (LocaleCompare("min",property) == 0) ||
+ (LocaleCompare("min",property) == 0))
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
"SetReadOnlyProperty","`%s'",property);
case 'o':
if (LocaleCompare("opaque",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
Throwing an exception causes this setting to fail */
if (LocaleNCompare("pixel:",property,6) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
#endif
}
case 'S':
case 's':
- if ( (LocaleCompare("size",property) == 0) ||
- (LocaleCompare("skewness",property) == 0) ||
- (LocaleCompare("scenes",property) == 0) ||
- (LocaleCompare("standard-deviation",property) == 0) )
+ if ((LocaleCompare("size",property) == 0) ||
+ (LocaleCompare("skewness",property) == 0) ||
+ (LocaleCompare("scenes",property) == 0) ||
+ (LocaleCompare("standard-deviation",property) == 0))
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
{
if (LocaleCompare("version",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
{
if (LocaleCompare("width",property) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
{
if (LocaleNCompare("xmp:",property,4) == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"SetReadOnlyProperty","`%s'",property);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "SetReadOnlyProperty","`%s'",property);
return(MagickFalse);
}
break; /* not an attribute, add as a property */
projects / imagemagick / blobdiff