% February 1997 %
% %
% %
-% 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 %
{"y", RealReference}, { "fill", StringReference},
{"color", StringReference} } },
{ "Spread", { {"radius", RealReference},
- {"interpolate", MagickInterpolateOptions} } },
+ {"interpolate", MagickInterpolateOptions} } },
{ "Swirl", { {"degrees", RealReference},
{"interpolate", MagickInterpolateOptions} } },
{ "Resize", { {"geometry", StringReference}, {"width", IntegerReference},
{ "Morphology", { {"kernel", StringReference},
{"channel", MagickChannelOptions}, {"method", MagickMorphologyOptions},
{"iterations", IntegerReference} } },
- { "Sans", { {"matrix", ArrayReference} } },
- { "Color", { {"color", StringReference} } },
{ "Mode", { {"geometry", StringReference},
{"width", IntegerReference},{"height", IntegerReference},
{"channel", MagickChannelOptions} } },
{"x", IntegerReference}, {"y", IntegerReference},
{"gravity", MagickGravityOptions}, {"offset", StringReference},
{"dx", IntegerReference}, {"dy", IntegerReference} } },
+ { "Color", { {"color", StringReference} } },
+ { "WaveletDenoise", { {"geometry", StringReference},
+ {"threshold", RealReference}, {"softness", RealReference},
+ {"channel", MagickChannelOptions} } },
+ { "Colorspace", { {"colorspace", MagickColorspaceOptions} } },
+ { "AutoThreshold", { {"method", MagickAutoThresholdOptions} } },
};
static SplayTreeInfo
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'B':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'C':
break;
}
for ( ; image; image=image->next)
- (void) TransformImageColorspace(image,(ColorspaceType) sp,
- exception);
+ (void) SetImageColorspace(image,(ColorspaceType) sp,exception);
break;
}
if (LocaleCompare(attribute,"comment") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'D':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'E':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'F':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'G':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'I':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'L':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'M':
if (LocaleCompare(attribute,"magick") == 0)
{
if (info)
- (void) FormatLocaleString(info->image_info->filename,MagickPathExtent,
- "%s:",SvPV(sval,na));
+ (void) FormatLocaleString(info->image_info->filename,
+ MagickPathExtent,"%s:",SvPV(sval,na));
for ( ; image; image=image->next)
- (void) CopyMagickString(image->magick,SvPV(sval,na),MagickPathExtent);
+ (void) CopyMagickString(image->magick,SvPV(sval,na),
+ MagickPathExtent);
break;
}
if (LocaleCompare(attribute,"map-limit") == 0)
(void) QueryColorCompliance(SvPV(sval,na),AllCompliance,&target_color,
exception);
if (info)
- info->image_info->matte_color=target_color;
+ info->image_info->alpha_color=target_color;
for ( ; image; image=image->next)
- image->matte_color=target_color;
+ image->alpha_color=target_color;
break;
}
if (LocaleCompare(attribute,"matte") == 0)
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'O':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'P':
}
break;
}
- if (LocaleCompare(attribute,"preview") == 0)
- {
- sp=SvPOK(sval) ? ParseCommandOption(MagickPreviewOptions,MagickFalse,
- SvPV(sval,na)) : SvIV(sval);
- if (sp < 0)
- {
- ThrowPerlException(exception,OptionError,"UnrecognizedType",
- SvPV(sval,na));
- break;
- }
- if (info)
- info->image_info->preview_type=(PreviewType) sp;
- break;
- }
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'Q':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'R':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'S':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'T':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'U':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'V':
info->image_info->verbose=sp != 0 ? MagickTrue : MagickFalse;
break;
}
- if (LocaleCompare(attribute,"view") == 0)
- {
- if (info)
- (void) CloneString(&info->image_info->view,SvPV(sval,na));
- break;
- }
if (LocaleCompare(attribute,"virtual-pixel") == 0)
{
sp=SvPOK(sval) ? ParseCommandOption(MagickVirtualPixelOptions,
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
case 'W':
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
default:
if (info)
SetImageOption(info->image_info,attribute,SvPV(sval,na));
for ( ; image; image=image->next)
- SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ {
+ (void) SetImageProperty(image,attribute,SvPV(sval,na),exception);
+ (void) SetImageArtifact(image,attribute,SvPV(sval,na));
+ }
break;
}
}
{
#define ChannelFeatures(channel,direction) \
{ \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].angular_second_moment[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].contrast[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].contrast[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].variance_sum_of_squares[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].inverse_difference_moment[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].sum_average[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].sum_variance[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].sum_entropy[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].entropy[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].difference_variance[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].difference_entropy[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].measure_of_correlation_1[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].measure_of_correlation_2[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_features[channel].maximum_correlation_coefficient[direction]); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
}
count=0;
for ( ; image; image=image->next)
{
+ register ssize_t
+ j;
+
channel_features=GetImageFeatures(image,distance,exception);
if (channel_features == (ChannelFeatures *) NULL)
continue;
count++;
- EXTEND(sp,280*count);
- for (i=0; i < 4; i++)
+ for (j=0; j < 4; j++)
{
- ChannelFeatures(RedChannel,i);
- ChannelFeatures(GreenChannel,i);
- ChannelFeatures(BlueChannel,i);
- if (image->colorspace == CMYKColorspace)
- ChannelFeatures(BlackChannel,i);
- if (image->alpha_trait != UndefinedPixelTrait)
- ChannelFeatures(AlphaChannel,i);
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if (traits == UndefinedPixelTrait)
+ continue;
+ EXTEND(sp,14*(i+1)*count);
+ ChannelFeatures(channel,j);
+ }
}
channel_features=(ChannelFeatures *)
RelinquishMagickMemory(channel_features);
{
if (image == (Image *) NULL)
break;
- (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g",
+ (void) FormatLocaleString(color,MagickPathExtent,"%.20g,%.20g",
image->chromaticity.blue_primary.x,
image->chromaticity.blue_primary.y);
s=newSVpv(color,0);
sv=NULL;
if (image->read_mask == MagickFalse)
ClipImage(image,exception);
- mask_image=GetImageMask(image,exception);
+ mask_image=GetImageMask(image,ReadPixelMask,exception);
if (mask_image != (Image *) NULL)
{
AddImageToRegistry(sv,mask_image);
sv=NULL;
if (image->read_mask != MagickFalse)
ClipImage(image,exception);
- mask_image=GetImageMask(image,exception);
+ mask_image=GetImageMask(image,ReadPixelMask,exception);
if (mask_image != (Image *) NULL)
{
AddImageToRegistry(sv,mask_image);
if (image == (Image *) NULL)
break;
- (void) FormatLocaleString(geometry,MagickPathExtent,"%.15gx%.15g",
+ (void) FormatLocaleString(geometry,MagickPathExtent,"%.20gx%.20g",
image->resolution.x,image->resolution.y);
s=newSVpv(geometry,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
{
if (image == (Image *) NULL)
break;
- (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g",
+ (void) FormatLocaleString(color,MagickPathExtent,"%.20g,%.20g",
image->chromaticity.green_primary.x,
image->chromaticity.green_primary.y);
s=newSVpv(color,0);
if (image == (Image *) NULL)
break;
(void) FormatLocaleString(color,MagickPathExtent,
- "%.20g,%.20g,%.20g,%.20g",(double) image->matte_color.red,
- (double) image->matte_color.green,
- (double) image->matte_color.blue,
- (double) image->matte_color.alpha);
+ "%.20g,%.20g,%.20g,%.20g",(double) image->alpha_color.red,
+ (double) image->alpha_color.green,
+ (double) image->alpha_color.blue,
+ (double) image->alpha_color.alpha);
s=newSVpv(color,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
- if (LocaleCompare(attribute,"preview") == 0)
- {
- s=newSViv(info->image_info->preview_type);
- (void) sv_setpv(s,CommandOptionToMnemonic(MagickPreviewOptions,
- info->image_info->preview_type));
- SvIOK_on(s);
- PUSHs(s ? sv_2mortal(s) : &sv_undef);
- continue;
- }
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
attribute);
break;
{
if (image == (Image *) NULL)
break;
- (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g",
+ (void) FormatLocaleString(color,MagickPathExtent,"%.20g,%.20g",
image->chromaticity.red_primary.x,
image->chromaticity.red_primary.y);
s=newSVpv(color,0);
PUSHs(s ? sv_2mortal(s) : &sv_undef);
continue;
}
- if (LocaleCompare(attribute,"view") == 0)
- {
- if (info && info->image_info->view)
- s=newSVpv(info->image_info->view,0);
- PUSHs(s ? sv_2mortal(s) : &sv_undef);
- continue;
- }
if (LocaleCompare(attribute,"virtual-pixel") == 0)
{
if (image == (Image *) NULL)
{
if (image == (Image *) NULL)
break;
- (void) FormatLocaleString(color,MagickPathExtent,"%.15g,%.15g",
+ (void) FormatLocaleString(color,MagickPathExtent,"%.20g,%.20g",
image->chromaticity.white_point.x,
image->chromaticity.white_point.y);
s=newSVpv(color,0);
BrightnessContrastImage = 262
Morphology = 263
MorphologyImage = 264
- Color = 265
- ColorImage = 266
- Mode = 267
- ModeImage = 268
- Statistic = 269
- StatisticImage = 270
- Perceptible = 271
- PerceptibleImage = 272
- Poly = 273
- PolyImage = 274
- Grayscale = 275
- GrayscaleImage = 276
- CannyEdge = 278
- CannyEdgeImage = 279
- HoughLine = 280
- HoughLineImage = 281
- MeanShift = 282
- MeanShiftImage = 283
- Kuwahara = 284
- KuwaharaImage = 285
- ConnectedComponent = 286
- ConnectedComponentImage = 287
- CopyPixels = 288
- CopyImagePixels = 289
+ Mode = 265
+ ModeImage = 266
+ Statistic = 267
+ StatisticImage = 268
+ Perceptible = 269
+ PerceptibleImage = 270
+ Poly = 271
+ PolyImage = 272
+ Grayscale = 273
+ GrayscaleImage = 274
+ CannyEdge = 275
+ CannyEdgeImage = 276
+ HoughLine = 277
+ HoughLineImage = 278
+ MeanShift = 279
+ MeanShiftImage = 280
+ Kuwahara = 281
+ KuwaharaImage = 282
+ ConnectedComponents = 283
+ ConnectedComponentsImage = 284
+ CopyPixels = 285
+ CopyImagePixels = 286
+ Color = 287
+ ColorImage = 288
+ WaveletDenoise = 289
+ WaveletDenoiseImage= 290
+ Colorspace = 291
+ ColorspaceImage = 292
+ AutoThreshold = 293
+ AutoThresholdImage = 294
MogrifyRegion = 666
PPCODE:
{
frame_info.width=image->columns+2*frame_info.x;
frame_info.height=image->rows+2*frame_info.y;
if ((attribute_flag[5] != 0) || (attribute_flag[6] != 0))
- image->matte_color=fill_color;
+ image->alpha_color=fill_color;
compose=image->compose;
if (attribute_flag[7] != 0)
compose=(CompositeOperator) argument_list[7].integer_reference;
SetImageArtifact(image,"filter:support",
argument_list[4].string_reference);
image=ResizeImage(image,geometry.width,geometry.height,
- (FilterTypes) argument_list[3].integer_reference,
+ (FilterType) argument_list[3].integer_reference,
exception);
break;
}
if (attribute_flag[0] == 0)
{
(void) FormatLocaleString(message,MagickPathExtent,
- "%.15g,%.15g,%.15g",(double) argument_list[2].real_reference,
+ "%.20g,%.20g,%.20g",(double) argument_list[2].real_reference,
(double) argument_list[3].real_reference,
(double) argument_list[4].real_reference);
argument_list[0].string_reference=message;
geometry_info.rho=argument_list[6].real_reference;
SetImageArtifact(image,"modulate:colorspace","HWB");
}
- (void) FormatLocaleString(modulate,MagickPathExtent,"%.15g,%.15g,%.15g",
+ (void) FormatLocaleString(modulate,MagickPathExtent,"%.20g,%.20g,%.20g",
geometry_info.rho,geometry_info.sigma,geometry_info.xi);
(void) ModulateImage(image,modulate,exception);
break;
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
channel_mask=SetImageChannelMask(image,channel);
- (void) OrderedPosterizeImage(image,argument_list[0].string_reference,
+ (void) OrderedDitherImage(image,argument_list[0].string_reference,
exception);
(void) SetImageChannelMask(image,channel_mask);
break;
(image->resolution.x == 0.0 ? 72.0 : image->resolution.x)+0.5);
height=(size_t) (geometry_info.sigma*image->rows/
(image->resolution.y == 0.0 ? 72.0 : image->resolution.y)+0.5);
- image=ResizeImage(image,width,height,(FilterTypes)
+ image=ResizeImage(image,width,height,(FilterType)
argument_list[3].integer_reference,exception);
if (image != (Image *) NULL)
{
if (attribute_flag[2] != 0)
geometry.height=argument_list[2].integer_reference;
if (attribute_flag[3] != 0)
- image->filter=(FilterTypes) argument_list[4].integer_reference;
+ image->filter=(FilterType) argument_list[4].integer_reference;
if (attribute_flag[4] != 0)
SetImageArtifact(image,"filter:support",
argument_list[4].string_reference);
double
*coordinates;
- DistortImageMethod
+ DistortMethod
method;
size_t
break;
method=UndefinedDistortion;
if (attribute_flag[1] != 0)
- method=(DistortImageMethod) argument_list[1].integer_reference;
+ method=(DistortMethod) argument_list[1].integer_reference;
av=(AV *) argument_list[0].array_reference;
number_coordinates=(size_t) av_len(av)+1;
coordinates=(double *) AcquireQuantumMemory(number_coordinates,
(void) SetImageChannelMask(image,channel_mask);
break;
}
- case 142: /* ConnectedComponent */
+ case 142: /* ConnectedComponents */
{
size_t
connectivity;
exception);
break;
}
+ case 144: /* 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,exception);
+ break;
+ }
+ case 145: /* WaveletDenoise */
+ {
+ if (attribute_flag[0] != 0)
+ {
+ flags=ParseGeometry(argument_list[0].string_reference,
+ &geometry_info);
+ if ((flags & PercentValue) != 0)
+ {
+ geometry_info.rho=QuantumRange*geometry_info.rho/100.0;
+ geometry_info.sigma=QuantumRange*geometry_info.sigma/100.0;
+ }
+ if ((flags & SigmaValue) == 0)
+ geometry_info.sigma=0.0;
+ }
+ if (attribute_flag[1] != 0)
+ geometry_info.rho=argument_list[1].real_reference;
+ if (attribute_flag[2] != 0)
+ geometry_info.sigma=argument_list[2].real_reference;
+ if (attribute_flag[3] != 0)
+ channel=(ChannelType) argument_list[3].integer_reference;
+ channel_mask=SetImageChannelMask(image,channel);
+ image=WaveletDenoiseImage(image,geometry_info.rho,geometry_info.sigma,
+ exception);
+ if (image != (Image *) NULL)
+ (void) SetImageChannelMask(image,channel_mask);
+ break;
+ }
+ case 146: /* Colorspace */
+ {
+ ColorspaceType
+ colorspace;
+
+ colorspace=sRGBColorspace;
+ if (attribute_flag[0] != 0)
+ colorspace=(ColorspaceType) argument_list[0].integer_reference;
+ (void) TransformImageColorspace(image,colorspace,exception);
+ break;
+ }
+ case 147: /* AutoThreshold */
+ {
+ AutoThresholdMethod
+ method;
+
+ method=UndefinedThresholdMethod;
+ if (attribute_flag[0] != 0)
+ method=(AutoThresholdMethod) argument_list[0].integer_reference;
+ (void) AutoThresholdImage(image,method,exception);
+ break;
+ }
}
if (next != (Image *) NULL)
(void) CatchImageException(next);
if (LocaleCompare(attribute,"mattecolor") == 0)
{
(void) QueryColorCompliance(SvPV(ST(i),na),AllCompliance,
- &montage_info->matte_color,exception);
+ &montage_info->alpha_color,exception);
for (next=image; next; next=next->next)
- next->matte_color=montage_info->matte_color;
+ next->alpha_color=montage_info->alpha_color;
break;
}
if (LocaleCompare(attribute,"mode") == 0)
{
draw_info->geometry=AcquireString((char *) NULL);
(void) FormatLocaleString(draw_info->geometry,MagickPathExtent,
- "%.15g,%.15g",x,y);
+ "%.20g,%.20g",x,y);
}
status=GetTypeMetrics(image,draw_info,&metrics,exception);
(void) CatchImageException(image);
{
draw_info->geometry=AcquireString((char *) NULL);
(void) FormatLocaleString(draw_info->geometry,MagickPathExtent,
- "%.15g,%.15g",x,y);
+ "%.20g,%.20g",x,y);
}
status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
(void) CatchException(exception);
(void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
(double) channel_statistics[channel].depth); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
- channel_statistics[channel].minima/scale); \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
+ channel_statistics[channel].minima/QuantumRange); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
- channel_statistics[channel].maxima/scale); \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
+ channel_statistics[channel].maxima/QuantumRange); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
- channel_statistics[channel].mean/scale); \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
+ channel_statistics[channel].mean/QuantumRange); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
- channel_statistics[channel].standard_deviation/scale); \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
+ channel_statistics[channel].standard_deviation/QuantumRange); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_statistics[channel].kurtosis); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_statistics[channel].skewness); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
- (void) FormatLocaleString(message,MagickPathExtent,"%.15g", \
+ (void) FormatLocaleString(message,MagickPathExtent,"%.20g", \
channel_statistics[channel].entropy); \
PUSHs(sv_2mortal(newSVpv(message,0))); \
}
ChannelStatistics
*channel_statistics;
- double
- scale;
-
ExceptionInfo
*exception;
count=0;
for ( ; image; image=image->next)
{
+ register size_t
+ i;
+
channel_statistics=GetImageStatistics(image,exception);
if (channel_statistics == (ChannelStatistics *) NULL)
continue;
count++;
- EXTEND(sp,35*count);
- scale=(double) QuantumRange;
- ChannelStatistics(RedChannel);
- ChannelStatistics(GreenChannel);
- ChannelStatistics(BlueChannel);
- if (image->colorspace == CMYKColorspace)
- ChannelStatistics(BlackChannel);
- if (image->alpha_trait != UndefinedPixelTrait)
- ChannelStatistics(AlphaChannel);
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if (traits == UndefinedPixelTrait)
+ continue;
+ EXTEND(sp,8*(i+1)*count);
+ ChannelStatistics(channel);
+ }
+ EXTEND(sp,8*(i+1)*count);
+ ChannelStatistics(CompositePixelChannel);
channel_statistics=(ChannelStatistics *)
RelinquishMagickMemory(channel_statistics);
}
# #
# #
# #
-# T r a n s f o r m #
-# #
-# #
-# #
-###############################################################################
-#
-#
-void
-Transform(ref,...)
- Image::Magick ref=NO_INIT
- ALIAS:
- TransformImage = 1
- transform = 2
- transformimage = 3
- PPCODE:
- {
- AV
- *av;
-
- char
- *attribute,
- *crop_geometry,
- *geometry;
-
- ExceptionInfo
- *exception;
-
- HV
- *hv;
-
- Image
- *clone,
- *image;
-
- register ssize_t
- i;
-
- struct PackageInfo
- *info;
-
- SV
- *av_reference,
- *perl_exception,
- *reference,
- *rv,
- *sv;
-
- PERL_UNUSED_VAR(ref);
- PERL_UNUSED_VAR(ix);
- exception=AcquireExceptionInfo();
- perl_exception=newSVpv("",0);
- sv=NULL;
- av=NULL;
- attribute=NULL;
- if (sv_isobject(ST(0)) == 0)
- {
- ThrowPerlException(exception,OptionError,"ReferenceIsNotMyType",
- PackageName);
- goto PerlException;
- }
- reference=SvRV(ST(0));
- hv=SvSTASH(reference);
- av=newAV();
- av_reference=sv_2mortal(sv_bless(newRV((SV *) av),hv));
- SvREFCNT_dec(av);
- image=SetupList(aTHX_ reference,&info,(SV ***) NULL,exception);
- if (image == (Image *) NULL)
- {
- ThrowPerlException(exception,OptionError,"NoImagesDefined",
- PackageName);
- goto PerlException;
- }
- info=GetPackageInfo(aTHX_ (void *) av,info,exception);
- /*
- Get attribute.
- */
- crop_geometry=(char *) NULL;
- geometry=(char *) NULL;
- for (i=2; i < items; i+=2)
- {
- attribute=(char *) SvPV(ST(i-1),na);
- switch (*attribute)
- {
- case 'c':
- case 'C':
- {
- if (LocaleCompare(attribute,"crop") == 0)
- {
- crop_geometry=SvPV(ST(i),na);
- break;
- }
- ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
- attribute);
- break;
- }
- case 'g':
- case 'G':
- {
- if (LocaleCompare(attribute,"geometry") == 0)
- {
- geometry=SvPV(ST(i),na);
- break;
- }
- ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
- attribute);
- break;
- }
- default:
- {
- ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
- attribute);
- break;
- }
- }
- }
- for ( ; image; image=image->next)
- {
- clone=CloneImage(image,0,0,MagickTrue,exception);
- if (clone == (Image *) NULL)
- goto PerlException;
- TransformImage(&clone,crop_geometry,geometry,exception);
- for ( ; clone; clone=clone->next)
- {
- AddImageToRegistry(sv,clone);
- rv=newRV(sv);
- av_push(av,sv_bless(rv,hv));
- SvREFCNT_dec(sv);
- }
- }
- exception=DestroyExceptionInfo(exception);
- ST(0)=av_reference;
- SvREFCNT_dec(perl_exception); /* can't return warning messages */
- XSRETURN(1);
-
- PerlException:
- InheritPerlException(exception,perl_exception);
- exception=DestroyExceptionInfo(exception);
- sv_setiv(perl_exception,(IV) SvCUR(perl_exception) != 0);
- SvPOK_on(perl_exception);
- ST(0)=sv_2mortal(perl_exception);
- XSRETURN(1);
- }
-\f
-#
-###############################################################################
-# #
-# #
-# #
# W r i t e #
# #
# #
projects / imagemagick / blobdiff