{ "ClipMask", { {"mask", ImageReference} } },
{ "LinearStretch", { {"levels", StringReference},
{"black-point", RealReference},{"white-point", RealReference} } },
- { "Recolor", { {"matrix", ArrayReference} } },
+ { "ColorMatrix", { {"matrix", ArrayReference} } },
{ "Mask", { {"mask", ImageReference} } },
{ "Polaroid", { {"caption", StringReference}, {"angle", RealReference},
{"font", StringReference}, {"stroke", StringReference},
{ "Morphology", { {"kernel", StringReference},
{"channel", MagickChannelOptions}, {"method", MagickMorphologyOptions},
{"iterations", IntegerReference} } },
- { "ColorMatrix", { {"matrix", ArrayReference} } },
+ { "Sans", { {"matrix", ArrayReference} } },
{ "Color", { {"color", StringReference} } },
{ "Mode", { {"geometry", StringReference},
{"width", IntegerReference},{"height", IntegerReference},
%
*/
-static double SiPrefixToDouble(const char *string,const double interval)
+static double SiPrefixToDoubleInterval(const char *string,const double interval)
+{
+ char
+ *q;
+
+ double
+ value;
+
+ value=InterpretSiPrefixValue(string,&q);
+ if (*q == '%')
+ value*=interval/100.0;
+ return(value);
+}
+
+static inline double StringToDouble(const char *restrict string,
+ char **restrict sentinal)
+{
+ return(InterpretLocaleValue(string,sentinal));
+}
+
+static double StringToDoubleInterval(const char *string,const double interval)
{
char
*q;
double
- scale,
value;
value=InterpretLocaleValue(string,&q);
- scale=1000.0;
- if ((*q != '\0') && (tolower((int) ((unsigned char) *(q+1))) == 'i'))
- scale=1024.0;
- switch (tolower((int) ((unsigned char) *q)))
- {
- case '%': value*=pow(scale,0)*interval/100.0; break;
- case 'k': value*=pow(scale,1); break;
- case 'm': value*=pow(scale,2); break;
- case 'g': value*=pow(scale,3); break;
- case 't': value*=pow(scale,4); break;
- case 'p': value*=pow(scale,5); break;
- case 'e': value*=pow(scale,6); break;
- case 'z': value*=pow(scale,7); break;
- case 'y': value*=pow(scale,8); break;
- default: break;
- }
+ if (*q == '%')
+ value*=interval/100.0;
return(value);
}
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(AreaResource,limit);
break;
}
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'B':
if (LocaleCompare(attribute,"bias") == 0)
{
for ( ; image; image=image->next)
- image->bias=SiPrefixToDouble(SvPV(sval,na),QuantumRange);
+ image->bias=StringToDoubleInterval(SvPV(sval,na),(double)
+ QuantumRange+1.0);
break;
}
if (LocaleCompare(attribute,"blue-primary") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'C':
if (LocaleCompare(attribute,"cache-threshold") == 0)
{
(void) SetMagickResourceLimit(MemoryResource,(MagickSizeType)
- SiPrefixToDouble(SvPV(sval,na),100.0));
+ SiPrefixToDoubleInterval(SvPV(sval,na),100.0));
(void) SetMagickResourceLimit(MapResource,(MagickSizeType)
- (2*SiPrefixToDouble(SvPV(sval,na),100.0)));
+ (2.0*SiPrefixToDoubleInterval(SvPV(sval,na),100.0)));
break;
}
if (LocaleCompare(attribute,"clip-mask") == 0)
break;
}
for ( ; image; image=image->next)
- (void) TransformImageColorspace(image,(ColorspaceType) sp);
+ (void) TransformImageColorspace(image,(ColorspaceType) sp,
+ exception);
break;
}
if (LocaleCompare(attribute,"comment") == 0)
for ( ; image; image=image->next)
(void) SetImageProperty(image,"Comment",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,image,
- SvPV(sval,na),exception));
+ SvPV(sval,na),exception),exception);
break;
}
if (LocaleCompare(attribute,"compression") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'D':
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(DiskResource,limit);
break;
}
for ( ; image; image=image->next)
{
flags=ParseGeometry(SvPV(sval,na),&geometry_info);
- image->x_resolution=geometry_info.rho;
- image->y_resolution=geometry_info.sigma;
+ image->resolution.x=geometry_info.rho;
+ image->resolution.y=geometry_info.sigma;
if ((flags & SigmaValue) == 0)
- image->y_resolution=image->x_resolution;
+ image->resolution.y=image->resolution.x;
}
break;
}
if (info)
info->image_info->depth=SvIV(sval);
for ( ; image; image=image->next)
- (void) SetImageDepth(image,SvIV(sval));
+ (void) SetImageDepth(image,SvIV(sval),exception);
break;
}
if (LocaleCompare(attribute,"dispose") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'E':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'F':
if (LocaleCompare(attribute,"fuzz") == 0)
{
if (info)
- info->image_info->fuzz=SiPrefixToDouble(SvPV(sval,na),QuantumRange);
+ info->image_info->fuzz=StringToDoubleInterval(SvPV(sval,na),(double)
+ QuantumRange+1.0);
for ( ; image; image=image->next)
- image->fuzz=SiPrefixToDouble(SvPV(sval,na),QuantumRange);
+ image->fuzz=StringToDoubleInterval(SvPV(sval,na),(double)
+ QuantumRange+1.0);
break;
}
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'G':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'I':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'L':
for ( ; image; image=image->next)
(void) SetImageProperty(image,"label",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,image,
- SvPV(sval,na),exception));
+ SvPV(sval,na),exception),exception);
break;
}
if (LocaleCompare(attribute,"loop") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'M':
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(MapResource,limit);
break;
}
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(MemoryResource,limit);
break;
}
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'O':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'P':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'Q':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'R':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'S':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'T':
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(ThreadResource,limit);
break;
}
limit=MagickResourceInfinity;
if (LocaleCompare(SvPV(sval,na),"unlimited") != 0)
- limit=(MagickSizeType) SiPrefixToDouble(SvPV(sval,na),100.0);
+ limit=(MagickSizeType) SiPrefixToDoubleInterval(SvPV(sval,na),
+ 100.0);
(void) SetMagickResourceLimit(TimeResource,limit);
break;
}
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'U':
{
if (units == PixelsPerCentimeterResolution)
{
- image->x_resolution*=2.54;
- image->y_resolution*=2.54;
+ image->resolution.x*=2.54;
+ image->resolution.y*=2.54;
}
break;
}
{
if (units == PixelsPerInchResolution)
{
- image->x_resolution/=2.54;
- image->y_resolution/=2.54;
+ image->resolution.x/=2.54;
+ image->resolution.y/=2.54;
}
break;
}
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'V':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
case 'W':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
default:
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na));
+ SetImageProperty(image,attribute,SvPV(sval,na),exception);
break;
}
}
"UnrecognizedType",SvPV(ST(i),na));
return;
}
- SetPixelChannelMap(image,(ChannelType) option);
+ SetPixelChannelMapMask(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
{
if (LocaleCompare(attribute,"fuzz") == 0)
{
- image->fuzz=SiPrefixToDouble(SvPV(ST(i),na),100.0);
+ image->fuzz=StringToDoubleInterval(SvPV(ST(i),na),100.0);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
count=0;
for ( ; image; image=image->next)
{
- channel_features=GetImageFeatures(image,distance,
- &image->exception);
+ channel_features=GetImageFeatures(image,distance,exception);
if (channel_features == (ChannelFeatures *) NULL)
continue;
count++;
const char
*value;
- value=GetImageProperty(image,attribute);
+ value=GetImageProperty(image,attribute,exception);
if (value != (const char *) NULL)
s=newSVpv(value,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
if (image == (Image *) NULL)
break;
- page=GetImageBoundingBox(image,&image->exception);
+ page=GetImageBoundingBox(image,exception);
(void) FormatLocaleString(geometry,MaxTextExtent,
"%.20gx%.20g%+.20g%+.20g",(double) page.width,(double)
page.height,(double) page.x,(double) page.y);
{
if (image != (Image *) NULL)
s=newSViv((ssize_t) GetNumberColors(image,(FILE *) NULL,
- &image->exception));
+ exception));
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
const char
*value;
- value=GetImageProperty(image,attribute);
+ value=GetImageProperty(image,attribute,exception);
if (value != (const char *) NULL)
s=newSVpv(value,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
if (image == (Image *) NULL)
break;
(void) FormatLocaleString(geometry,MaxTextExtent,"%.15gx%.15g",
- image->x_resolution,image->y_resolution);
+ image->resolution.x,image->resolution.y);
s=newSVpv(geometry,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
{
s=newSViv(MAGICKCORE_QUANTUM_DEPTH);
if (image != (Image *) NULL)
- s=newSViv((ssize_t) GetImageDepth(image,&image->exception));
+ s=newSViv((ssize_t) GetImageDepth(image,exception));
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
if (info && (*info->image_info->magick != '\0'))
magick_info=GetMagickInfo(info->image_info->magick,exception);
if (image != (Image *) NULL)
- magick_info=GetMagickInfo(image->magick,&image->exception);
+ magick_info=GetMagickInfo(image->magick,exception);
if ((magick_info != (const MagickInfo *) NULL) &&
(*magick_info->description != '\0'))
s=newSVpv((char *) magick_info->description,0);
(void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double)
id);
status=SetImageRegistry(ImageRegistryType,key,image,
- &image->exception);
+ exception);
(void) status;
s=newSViv(id++);
}
items=sscanf(attribute,"%*[^[][%ld%*[,/]%ld",&x,&y);
(void) items;
image_view=AcquireCacheView(image);
- p=GetCacheViewVirtualPixels(image_view,x,y,1,1,&image->exception);
+ p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception);
if (p != (const Quantum *) NULL)
{
(void) FormatLocaleString(name,MaxTextExtent,QuantumFormat,
if (image == (Image *) NULL)
break;
- value=GetImageProperty(image,"Label");
+ value=GetImageProperty(image,"Label",exception);
if (value != (const char *) NULL)
s=newSVpv(value,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
if (image == (Image *) NULL)
continue;
j=info ? info->image_info->monochrome :
- IsImageMonochrome(image,&image->exception);
+ IsImageMonochrome(image,exception);
s=newSViv(j);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
if (image == (Image *) NULL)
break;
(void) SignatureImage(image,exception);
- value=GetImageProperty(image,"Signature");
+ value=GetImageProperty(image,"Signature",exception);
if (value != (const char *) NULL)
s=newSVpv(value,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
{
s=newSViv(MAGICKCORE_QUANTUM_DEPTH);
if (image != (Image *) NULL)
- s=newSVnv(GetImageTotalInkDensity(image));
+ s=newSVnv(GetImageTotalInkDensity(image,exception));
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
{
if (image == (Image *) NULL)
break;
- j=(ssize_t) GetImageType(image,&image->exception);
+ j=(ssize_t) GetImageType(image,exception);
s=newSViv(j);
(void) sv_setpv(s,CommandOptionToMnemonic(MagickTypeOptions,j));
SvIOK_on(s);
if (LocaleCompare(attribute,"x-resolution") == 0)
{
if (image != (Image *) NULL)
- s=newSVnv(image->x_resolution);
+ s=newSVnv(image->resolution.x);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
if (LocaleCompare(attribute,"y-resolution") == 0)
{
if (image != (Image *) NULL)
- s=newSVnv(image->y_resolution);
+ s=newSVnv(image->resolution.y);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
attribute)
else
{
- value=GetImageProperty(image,attribute);
+ value=GetImageProperty(image,attribute,exception);
if (value != (const char *) NULL)
{
s=newSVpv(value,0);
count=0;
for ( ; image; image=image->next)
{
- histogram=GetImageHistogram(image,&number_colors,&image->exception);
+ histogram=GetImageHistogram(image,&number_colors,exception);
if (histogram == (PixelInfo *) NULL)
continue;
count+=(ssize_t) number_colors;
SvPV(ST(i),na));
return;
}
- SetPixelChannelMap(image,(ChannelType) option);
+ SetPixelChannelMapMask(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
next->scene=scene++;
}
SetImageInfo(package_info->image_info,(unsigned int)
- GetImageListLength(image),&image->exception);
+ GetImageListLength(image),exception);
EXTEND(sp,(ssize_t) GetImageListLength(image));
for ( ; image; image=image->next)
{
case OptimizeTransLayer:
{
OptimizeImageTransparency(image,exception);
- InheritException(&(image->exception),exception);
break;
}
case RemoveDupsLayer:
{
RemoveDuplicateLayers(&image,exception);
- InheritException(&(image->exception),exception);
break;
}
case RemoveZeroLayer:
{
RemoveZeroDelayLayers(&image,exception);
- InheritException(&(image->exception),exception);
break;
}
case OptimizeLayer:
layers=CoalesceImages(image,exception);
if (layers == (Image *) NULL)
break;
- InheritException(&(layers->exception),exception);
image=layers;
layers=OptimizeImageLayers(image,exception);
if (layers == (Image *) NULL)
break;
- InheritException(&(layers->exception),exception);
image=DestroyImageList(image);
image=layers;
layers=(Image *) NULL;
OptimizeImageTransparency(image,exception);
- InheritException(&(image->exception),exception);
quantize_info=AcquireQuantizeInfo(info->image_info);
(void) RemapImages(quantize_info,image,(Image *) NULL,exception);
quantize_info=DestroyQuantizeInfo(quantize_info);
image->rows,image->gravity,&geometry);
CompositeLayers(image,compose,source,geometry.x,geometry.y,exception);
source=DestroyImageList(source);
- InheritException(&(image->exception),exception);
break;
}
}
if (layers != (Image *) NULL)
- {
- InheritException(&(layers->exception),exception);
- image=layers;
- }
+ image=layers;
if ((image == (Image *) NULL) || (exception->severity >= ErrorException))
goto PerlException;
for ( ; image; image=image->next)
ClipMaskImage = 212
LinearStretch = 213
LinearStretchImage = 214
- RecolorImage = 215
- Recolor = 216
+ ColorMatrix = 215
+ ColorMatrixImage = 216
Mask = 217
MaskImage = 218
Polaroid = 219
LevelImageColors = 258
Clamp = 259
ClampImage = 260
- BrightnessContrast = 263
- BrightnessContrastImage = 264
- Morphology = 265
- MorphologyImage = 266
- ColorMatrix = 267
- ColorMatrixImage = 268
- Color = 269
- ColorImage = 270
- Mode = 271
- ModeImage = 272
- Statistic = 273
- StatisticImage = 274
+ BrightnessContrast = 261
+ BrightnessContrastImage = 262
+ Morphology = 263
+ MorphologyImage = 264
+ Color = 265
+ ColorImage = 266
+ Mode = 267
+ ModeImage = 268
+ Statistic = 269
+ StatisticImage = 270
MogrifyRegion = 666
PPCODE:
{
argument_list[0].string_reference=(char *) NULL;
(void) SetImageProperty(image,"comment",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,image,
- argument_list[0].string_reference,exception));
+ argument_list[0].string_reference,exception),exception);
break;
}
case 2: /* Label */
argument_list[0].string_reference=(char *) NULL;
(void) SetImageProperty(image,"label",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,image,
- argument_list[0].string_reference,exception));
+ argument_list[0].string_reference,exception),exception);
break;
}
case 3: /* AddNoise */
if (attribute_flag[4] != 0)
geometry.y=argument_list[4].integer_reference;
if (attribute_flag[5] != 0)
- image->fuzz=
- SiPrefixToDouble(argument_list[5].string_reference,QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
image=CropImage(image,&geometry,exception);
break;
}
invert=MagickTrue;
}
if (attribute_flag[5] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[6] != 0)
invert=(MagickBooleanType) argument_list[6].integer_reference;
(void) FloodfillPaintImage(image,draw_info,&target,geometry.x,
{
if (compose != DissolveCompositeOp)
(void) SetImageAlpha(composite_image,(Quantum)
- SiPrefixToDouble(argument_list[6].string_reference,
- QuantumRange));
+ StringToDoubleInterval(argument_list[6].string_reference,
+ (double) QuantumRange+1.0),exception);
else
{
CacheView
*/
(void) CloneString(&image->geometry,
argument_list[6].string_reference);
- opacity=(Quantum) SiPrefixToDouble(
- argument_list[6].string_reference,QuantumRange);
+ opacity=(Quantum) StringToDoubleInterval(
+ argument_list[6].string_reference,(double) QuantumRange+
+ 1.0);
if (composite_image->matte != MagickTrue)
- (void) SetImageAlpha(composite_image,OpaqueAlpha);
+ (void) SetImageAlpha(composite_image,OpaqueAlpha,exception);
composite_view=AcquireCacheView(composite_image);
for (y=0; y < (ssize_t) composite_image->rows ; y++)
{
if (rotate_image == (Image *) NULL)
break;
}
- if (attribute_flag[7] && argument_list[7].integer_reference) /* tile */
+ if ((attribute_flag[7] != 0) &&
+ (argument_list[7].integer_reference != 0)) /* tile */
{
ssize_t
x,
for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) composite_image->columns)
{
if (attribute_flag[8] != 0) /* rotate */
- (void) CompositeImage(image,compose,rotate_image,x,y);
+ (void) CompositeImage(image,compose,rotate_image,x,y,
+ exception);
else
- (void) CompositeImage(image,compose,composite_image,x,y);
+ (void) CompositeImage(image,compose,composite_image,x,y,
+ exception);
}
if (attribute_flag[8] != 0) /* rotate */
rotate_image=DestroyImage(rotate_image);
Merge Y displacement into X displacement image.
*/
composite_image=CloneImage(composite_image,0,0,MagickTrue,
- &image->exception);
+ exception);
(void) CompositeImage(composite_image,CopyGreenCompositeOp,
- argument_list[10].image_reference,0,0);
+ argument_list[10].image_reference,0,0,exception);
}
else
{
Set a blending mask for the composition.
*/
image->mask=CloneImage(argument_list[10].image_reference,0,0,
- MagickTrue,&image->exception);
+ MagickTrue,exception);
(void) NegateImage(image->mask,MagickFalse,exception);
}
}
exception);
channel_mask=SetPixelChannelMask(image,channel);
if (attribute_flag[8] == 0) /* no rotate */
- CompositeImage(image,compose,composite_image,geometry.x,geometry.y);
+ CompositeImage(image,compose,composite_image,geometry.x,geometry.y,
+ exception);
else
{
/*
composite_image->columns)/2;
geometry.y-=(ssize_t) (rotate_image->rows-
composite_image->rows)/2;
- CompositeImage(image,compose,rotate_image,geometry.x,geometry.y);
+ CompositeImage(image,compose,rotate_image,geometry.x,geometry.y,
+ exception);
rotate_image=DestroyImage(rotate_image);
}
if (attribute_flag[10] != 0) /* mask */
(double) argument_list[4].real_reference);
argument_list[0].string_reference=message;
}
- (void) GammaImage(image,InterpretLocaleValue(
+ (void) GammaImage(image,StringToDouble(
argument_list[0].string_reference,(char **) NULL),exception);
break;
}
if (attribute_flag[2] != 0)
geometry.y=argument_list[2].integer_reference;
if (image->matte == MagickFalse)
- (void) SetImageAlpha(image,OpaqueAlpha);
+ (void) SetImageAlpha(image,OpaqueAlpha,exception);
(void) GetOneVirtualPixel(image,geometry.x,geometry.y,virtual_pixel,
exception);
target.red=virtual_pixel[RedPixelChannel];
QueryColorCompliance(argument_list[4].string_reference,
AllCompliance,&target,exception);
if (attribute_flag[3] != 0)
- target.alpha=SiPrefixToDouble(argument_list[3].string_reference,
- QuantumRange);
+ target.alpha=StringToDoubleInterval(
+ argument_list[3].string_reference,(double) (double) QuantumRange+
+ 1.0);
if (attribute_flag[5] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
invert=MagickFalse;
if (attribute_flag[6] != 0)
invert=(MagickBooleanType) argument_list[6].integer_reference;
(void) QueryColorCompliance(argument_list[1].string_reference,
AllCompliance,&fill_color,exception);
if (attribute_flag[2] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[2].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[2].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
invert=MagickFalse;
flags=ParseGeometry(argument_list[0].string_reference,
&geometry_info);
if (attribute_flag[1] != 0)
- geometry_info.rho=SiPrefixToDouble(
- argument_list[1].string_reference,QuantumRange);
+ geometry_info.rho=StringToDoubleInterval(
+ argument_list[1].string_reference,(double) QuantumRange+1.0);
(void) SolarizeImage(image,geometry_info.rho,exception);
break;
}
case 53: /* Sync */
{
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
break;
}
case 54: /* Texture */
{
if (attribute_flag[0] == 0)
break;
- TextureImage(image,argument_list[0].image_reference);
+ TextureImage(image,argument_list[0].image_reference,exception);
break;
}
case 55: /* Evalute */
AllCompliance,&target,exception);
opacity=TransparentAlpha;
if (attribute_flag[1] != 0)
- opacity=SiPrefixToDouble(argument_list[1].string_reference,
- QuantumRange);
+ opacity=StringToDoubleInterval(argument_list[1].string_reference,
+ (double) QuantumRange+1.0);
if (attribute_flag[2] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[2].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[2].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[3] == 0)
argument_list[3].integer_reference=0;
invert=MagickFalse;
argument_list[0].string_reference="50%";
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- threshold=SiPrefixToDouble(argument_list[0].string_reference,
- QuantumRange);
+ threshold=StringToDoubleInterval(argument_list[0].string_reference,
+ (double) QuantumRange+1.0);
channel_mask=SetPixelChannelMask(image,channel);
- (void) BilevelImage(image,threshold);
+ (void) BilevelImage(image,threshold,exception);
(void) SetPixelChannelMask(image,channel_mask);
break;
}
case 59: /* Trim */
{
if (attribute_flag[0] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[0].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[0].string_reference,(double) QuantumRange+1.0);
image=TrimImage(image,exception);
break;
}
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
channel_mask=SetPixelChannelMask(image,channel);
- (void) SeparateImage(image);
+ (void) SeparateImage(image,exception);
(void) SetPixelChannelMask(image,channel_mask);
break;
}
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
if (attribute_flag[2] != 0)
- image->bias=SiPrefixToDouble(argument_list[2].string_reference,
- QuantumRange);
+ image->bias=StringToDoubleInterval(
+ argument_list[2].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[3] != 0)
{
kernel=AcquireKernelInfo(argument_list[3].string_reference);
Remove a profile from the image.
*/
(void) ProfileImage(image,name,(const unsigned char *) NULL,0,
- MagickTrue);
+ exception);
break;
}
/*
SetStringInfoDatum(profile,(const unsigned char *)
argument_list[1].string_reference);
(void) ProfileImage(image,name,GetStringInfoDatum(profile),
- (size_t) GetStringInfoLength(profile),MagickFalse);
+ (size_t) GetStringInfoLength(profile),exception);
profile=DestroyStringInfo(profile);
break;
}
profile_info=
CloneImageInfo(info ? info->image_info : (ImageInfo *) NULL);
(void) CopyMagickString(profile_info->filename,name,MaxTextExtent);
- profile_image=ReadImages(profile_info,&image->exception);
+ profile_image=ReadImages(profile_info,exception);
if (profile_image == (Image *) NULL)
break;
ResetImageProfileIterator(profile_image);
profile=GetImageProfile(profile_image,name);
if (profile != (const StringInfo *) NULL)
(void) ProfileImage(image,name,GetStringInfoDatum(profile),
- (size_t) GetStringInfoLength(profile),MagickFalse);
+ (size_t) GetStringInfoLength(profile),exception);
name=GetNextImageProfile(profile_image);
}
profile_image=DestroyImage(profile_image);
goto PerlException;
}
if (attribute_flag[1] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[1].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[1].string_reference,(double) QuantumRange+1.0);
(void) IsImagesEqual(image,argument_list[0].image_reference,
exception);
break;
if (attribute_flag[5] != 0)
argument_list[5].real_reference=1.0;
width=(size_t) (geometry_info.rho*image->columns/
- (image->x_resolution == 0.0 ? 72.0 : image->x_resolution)+0.5);
+ (image->resolution.x == 0.0 ? 72.0 : image->resolution.x)+0.5);
height=(size_t) (geometry_info.sigma*image->rows/
- (image->y_resolution == 0.0 ? 72.0 : image->y_resolution)+0.5);
+ (image->resolution.y == 0.0 ? 72.0 : image->resolution.y)+0.5);
image=ResizeImage(image,width,height,(FilterTypes)
argument_list[3].integer_reference,argument_list[5].real_reference,
exception);
if (image != (Image *) NULL)
{
- image->x_resolution=geometry_info.rho;
- image->y_resolution=geometry_info.sigma;
+ image->resolution.x=geometry_info.rho;
+ image->resolution.y=geometry_info.sigma;
}
break;
}
}
case 84: /* Strip */
{
- (void) StripImage(image);
+ (void) StripImage(image,exception);
break;
}
case 85: /* Tint */
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
channel_mask=SetPixelChannelMask(image,channel);
- (void) SeparateImage(image);
+ (void) SeparateImage(image,exception);
(void) SetPixelChannelMask(image,channel_mask);
break;
}
if (attribute_flag[4] != 0)
geometry.y=argument_list[4].integer_reference;
if (attribute_flag[5] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[6] != 0)
(void) QueryColorCompliance(argument_list[6].string_reference,
AllCompliance,&image->background_color,exception);
if (attribute_flag[4] != 0)
geometry.y=argument_list[4].integer_reference;
if (attribute_flag[5] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[6] != 0)
(void) QueryColorCompliance(argument_list[6].string_reference,
AllCompliance,&image->background_color,exception);
(void) LinearStretchImage(image,black_point,white_point,exception);
break;
}
+ case 108: /* ColorMatrix */
+ {
+ AV
+ *av;
+
+ double
+ *color_matrix;
+
+ KernelInfo
+ *kernel_info;
+
+ size_t
+ order;
+
+ if (attribute_flag[0] == 0)
+ break;
+ av=(AV *) argument_list[0].array_reference;
+ order=(size_t) sqrt(av_len(av)+1);
+ color_matrix=(double *) AcquireQuantumMemory(order,order*
+ sizeof(*color_matrix));
+ if (color_matrix == (double *) NULL)
+ {
+ ThrowPerlException(exception,ResourceLimitFatalError,
+ "MemoryAllocationFailed",PackageName);
+ goto PerlException;
+ }
+ for (j=0; (j < (ssize_t) (order*order)) && (j < (av_len(av)+1)); j++)
+ color_matrix[j]=(double) SvNV(*(av_fetch(av,j,0)));
+ for ( ; j < (ssize_t) (order*order); j++)
+ color_matrix[j]=0.0;
+ kernel_info=AcquireKernelInfo((const char *) NULL);
+ if (kernel_info == (KernelInfo *) NULL)
+ break;
+ kernel_info->width=order;
+ kernel_info->height=order;
+ kernel_info->values=color_matrix;
+ image=ColorMatrixImage(image,kernel_info,exception);
+ kernel_info->values=(double *) NULL;
+ kernel_info=DestroyKernelInfo(kernel_info);
+ color_matrix=(double *) RelinquishMagickMemory(color_matrix);
+ break;
+ }
case 109: /* Mask */
{
if (attribute_flag[0] == 0)
if (attribute_flag[0] != 0)
(void) SetImageProperty(image,"caption",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,image,
- argument_list[0].string_reference,exception));
+ argument_list[0].string_reference,exception),exception);
angle=0.0;
if (attribute_flag[1] != 0)
angle=argument_list[1].real_reference;
QueryColorCompliance(argument_list[4].string_reference,
AllCompliance,&target,exception);
if (attribute_flag[5] != 0)
- image->fuzz=SiPrefixToDouble(argument_list[5].string_reference,
- QuantumRange);
+ image->fuzz=StringToDoubleInterval(
+ argument_list[5].string_reference,(double) QuantumRange+1.0);
if (attribute_flag[6] != 0)
channel=(ChannelType) argument_list[6].integer_reference;
invert=MagickFalse;
flags=ParseGeometry(argument_list[0].string_reference,
&geometry_info);
if (attribute_flag[1] != 0)
- geometry_info.rho=SiPrefixToDouble(
- argument_list[1].string_reference,QuantumRange);
+ geometry_info.rho=StringToDoubleInterval(
+ argument_list[1].string_reference,(double) QuantumRange+1.0);
image=DeskewImage(image,geometry_info.rho,exception);
break;
}
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
channel_mask=SetPixelChannelMask(image,channel);
- (void) ClampImage(image);
+ (void) ClampImage(image,exception);
(void) SetPixelChannelMask(image,channel_mask);
break;
}
- case 132: /* BrightnessContrast */
+ case 131: /* BrightnessContrast */
{
double
brightness,
(void) SetPixelChannelMask(image,channel_mask);
break;
}
- case 133: /* Morphology */
+ case 132: /* Morphology */
{
KernelInfo
*kernel;
method=argument_list[2].integer_reference;
iterations=1;
if (attribute_flag[3] != 0)
- iterations=argument_list[4].integer_reference;
+ iterations=argument_list[3].integer_reference;
channel_mask=SetPixelChannelMask(image,channel);
image=MorphologyImage(image,method,iterations,kernel,exception);
if (image != (Image *) NULL)
kernel=DestroyKernelInfo(kernel);
break;
}
- case 108: /* Recolor */
- case 134: /* ColorMatrix */
- {
- AV
- *av;
-
- double
- *color_matrix;
-
- KernelInfo
- *kernel_info;
-
- size_t
- order;
-
- if (attribute_flag[0] == 0)
- break;
- av=(AV *) argument_list[0].array_reference;
- if (av == (AV *) NULL)
- break;
- order=(size_t) sqrt(av_len(av)+1);
- color_matrix=(double *) AcquireQuantumMemory(order,order*
- sizeof(*color_matrix));
- if (color_matrix == (double *) NULL)
- {
- ThrowPerlException(exception,ResourceLimitFatalError,
- "MemoryAllocationFailed",PackageName);
- goto PerlException;
- }
- for (j=0; (j < (ssize_t) (order*order)) && (j < (av_len(av)+1)); j++)
- color_matrix[j]=(double) SvNV(*(av_fetch(av,j,0)));
- for ( ; j < (ssize_t) (order*order); j++)
- color_matrix[j]=0.0;
- kernel_info=AcquireKernelInfo((const char *) NULL);
- if (kernel_info == (KernelInfo *) NULL)
- break;
- kernel_info->width=order;
- kernel_info->height=order;
- kernel_info->values=color_matrix;
- image=ColorMatrixImage(image,kernel_info,exception);
- kernel_info->values=(double *) NULL;
- kernel_info=DestroyKernelInfo(kernel_info);
- color_matrix=(double *) RelinquishMagickMemory(color_matrix);
- break;
- }
- case 135: /* Color */
- {
- PixelInfo
- color;
-
- (void) QueryColorCompliance("none",AllCompliance,&color,
- exception);
- if (attribute_flag[0] != 0)
- (void) QueryColorCompliance(argument_list[0].string_reference,
- AllCompliance,&color,exception);
- (void) SetImageColor(image,&color);
- break;
- }
- case 136: /* Mode */
+ case 133: /* Mode */
{
if (attribute_flag[0] != 0)
{
(void) SetPixelChannelMask(image,channel_mask);
break;
}
- case 137: /* Statistic */
+ case 134: /* Statistic */
{
StatisticType
statistic;
Composite region.
*/
status=CompositeImage(region_image,CopyCompositeOp,image,
- region_info.x,region_info.y);
+ region_info.x,region_info.y,exception);
(void) status;
(void) CatchImageException(region_image);
image=DestroyImage(image);
for (next=image; next; next=next->next)
(void) SetImageProperty(next,"label",InterpretImageProperties(
info ? info->image_info : (ImageInfo *) NULL,next,
- SvPV(ST(i),na),exception));
+ SvPV(ST(i),na),exception),exception);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
info=GetPackageInfo(aTHX_ (void *) av,info,exception);
(void) CopyMagickString(info->image_info->filename,image->filename,
MaxTextExtent);
- SetImageInfo(info->image_info,0,&image->exception);
+ SetImageInfo(info->image_info,0,exception);
exception=DestroyExceptionInfo(exception);
SvREFCNT_dec(perl_exception);
XSRETURN(1);
{
if (info)
(void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
- &draw_info->fill,&image->exception);
+ &draw_info->fill,exception);
break;
}
if (LocaleCompare(attribute,"font") == 0)
{
if (info)
(void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
- &draw_info->stroke,&image->exception);
+ &draw_info->stroke,exception);
break;
}
if (LocaleCompare(attribute,"style") == 0)
{
if (info)
(void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
- &draw_info->fill,&image->exception);
+ &draw_info->fill,exception);
break;
}
if (LocaleCompare(attribute,"font") == 0)
{
if (info)
(void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
- &draw_info->stroke,&image->exception);
+ &draw_info->stroke,exception);
break;
}
if (LocaleCompare(attribute,"style") == 0)
count=0;
for ( ; image; image=image->next)
{
- channel_statistics=GetImageStatistics(image,&image->exception);
+ channel_statistics=GetImageStatistics(image,exception);
if (channel_statistics == (ChannelStatistics *) NULL)
continue;
count++;
status=SyncAuthenticPixels(image,exception);
if (status != MagickFalse)
return;
- InheritException(exception,&image->exception);
PerlException:
InheritPerlException(exception,perl_exception);
clone=CloneImage(image,0,0,MagickTrue,exception);
if ((clone == (Image *) NULL) || (exception->severity >= ErrorException))
goto PerlException;
- TransformImage(&clone,crop_geometry,geometry);
+ TransformImage(&clone,crop_geometry,geometry,exception);
for ( ; clone; clone=clone->next)
{
AddImageToRegistry(sv,clone);
next->scene=scene++;
}
SetImageInfo(package_info->image_info,(unsigned int)
- GetImageListLength(image),&image->exception);
+ GetImageListLength(image),exception);
for (next=image; next; next=next->next)
{
(void) WriteImage(package_info->image_info,next,exception);
projects / imagemagick / blobdiff