Initialize noise image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
noise_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (noise_image == (Image *) NULL)
return((Image *) NULL);
Allocate blue shift image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
shift_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (shift_image == (Image *) NULL)
return((Image *) NULL);
*edge_image;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
Allocate colorized image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
colorize_image=CloneImage(image,0,0,MagickTrue,exception);
if (colorize_image == (Image *) NULL)
return((Image *) NULL);
Map given color_matrix, into a 6x6 matrix RGBKA and a constant
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
i=0;
for (v=0; v < (ssize_t) color_matrix->height; v++)
for (u=0; u < (ssize_t) color_matrix->width; u++)
{
channel=(PixelChannel) option;
channel_mask=(ChannelType) (channel_mask | (1 << channel));
- SetPixelChannelMask(image,channel_mask);
+ (void) SetPixelChannelMask(image,channel_mask);
}
}
(void) FormatLocaleString(key,MagickPathExtent,"%p.%.20g.%s",(void *) image,
if (value != (const char *) NULL)
{
if (channel_mask != UndefinedChannel)
- SetPixelChannelMask(image,channel_mask);
+ (void) SetPixelChannelMask(image,channel_mask);
return(QuantumScale*StringToDouble(value,(char **) NULL));
}
(void) DeleteNodeFromSplayTree(fx_info->symbols,key);
standard_deviation);
}
if (channel_mask != UndefinedChannel)
- SetPixelChannelMask(image,channel_mask);
+ (void) SetPixelChannelMask(image,channel_mask);
(void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
ConstantString(statistic));
return(QuantumScale*StringToDouble(statistic,(char **) NULL));
static double
FxEvaluateSubexpression(FxInfo *,const PixelChannel,const ssize_t,
- const ssize_t,const char *,double *,ExceptionInfo *);
+ const ssize_t,const char *,size_t *,double *,ExceptionInfo *);
static MagickOffsetType FxGCD(MagickOffsetType alpha,MagickOffsetType beta)
{
i;
size_t
+ depth,
length,
level;
p=expression;
i=GetImageIndexInList(fx_info->images);
+ depth=0;
level=0;
point.x=(double) x;
point.y=(double) y;
}
*q='\0';
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,
- &beta,exception);
+ &depth,&beta,exception);
i=(ssize_t) (alpha+0.5);
p++;
}
}
*q='\0';
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,
- &beta,exception);
+ &depth,&beta,exception);
point.x=alpha;
point.y=beta;
p++;
}
*q='\0';
alpha=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,
- &beta,exception);
+ &depth,&beta,exception);
point.x+=alpha;
point.y+=beta;
p++;
return((double) image->page.y);
break;
}
+ case 'Q':
+ case 'q':
+ {
+ if (LocaleCompare(symbol,"quality") == 0)
+ return((double) image->quality);
+ break;
+ }
case 'R':
case 'r':
{
static double FxEvaluateSubexpression(FxInfo *fx_info,
const PixelChannel channel,const ssize_t x,const ssize_t y,
- const char *expression,double *beta,ExceptionInfo *exception)
+ const char *expression,size_t *depth,double *beta,ExceptionInfo *exception)
{
+#define FxMaxParenthesisDepth 58
+
char
*q,
subexpression[MagickPathExtent];
{
(void) CopyMagickString(subexpression,expression,(size_t)
(p-expression+1));
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,depth,
+ beta,exception);
switch ((unsigned char) *p)
{
case '~':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=(double) (~(size_t) *beta);
return(*beta);
}
case '!':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(*beta == 0.0 ? 1.0 : 0.0);
}
case '^':
{
*beta=pow((double) alpha,(double) FxEvaluateSubexpression(fx_info,
- channel,x,y,++p,beta,exception));
+ channel,x,y,++p,depth,beta,exception));
return(*beta);
}
case '*':
case ExponentialNotation:
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha*(*beta));
}
case '/':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
if (*beta == 0.0)
{
(void) ThrowMagickException(exception,GetMagickModule(),
}
case '%':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=fabs(floor(((double) *beta)+0.5));
if (*beta == 0.0)
{
}
case '+':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha+(*beta));
}
case '-':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha-(*beta));
}
case LeftShiftOperator:
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=(double) ((size_t) (alpha+0.5) << (size_t) (gamma+0.5));
return(*beta);
}
case RightShiftOperator:
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=(double) ((size_t) (alpha+0.5) >> (size_t) (gamma+0.5));
return(*beta);
}
case '<':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha < *beta ? 1.0 : 0.0);
}
case LessThanEqualOperator:
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha <= *beta ? 1.0 : 0.0);
}
case '>':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha > *beta ? 1.0 : 0.0);
}
case GreaterThanEqualOperator:
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha >= *beta ? 1.0 : 0.0);
}
case EqualOperator:
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(fabs(alpha-(*beta)) < MagickEpsilon ? 1.0 : 0.0);
}
case NotEqualOperator:
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(fabs(alpha-(*beta)) >= MagickEpsilon ? 1.0 : 0.0);
}
case '&':
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=(double) ((size_t) (alpha+0.5) & (size_t) (gamma+0.5));
return(*beta);
}
case '|':
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
*beta=(double) ((size_t) (alpha+0.5) | (size_t) (gamma+0.5));
return(*beta);
}
case LogicalAndOperator:
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
- *beta=(alpha > 0.0) && (gamma > 0.0) ? 1.0 : 0.0;
+ p++;
+ if (alpha <= 0.0)
+ {
+ *beta=0.0;
+ return(*beta);
+ }
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth,beta,
+ exception);
+ *beta=(gamma > 0.0) ? 1.0 : 0.0;
return(*beta);
}
case LogicalOrOperator:
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
- *beta=(alpha > 0.0) || (gamma > 0.0) ? 1.0 : 0.0;
+ p++;
+ if (alpha > 0.0)
+ {
+ *beta=1.0;
+ return(*beta);
+ }
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth,beta,
+ exception);
+ *beta=(gamma > 0.0) ? 1.0 : 0.0;
return(*beta);
}
case '?':
return(0.0);
}
if (fabs((double) alpha) >= MagickEpsilon)
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth,beta,
+ exception);
else
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,q,beta,exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,q,depth,beta,
+ exception);
return(gamma);
}
case '=':
return(0.0);
}
ClearMagickException(exception);
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
(void) FormatLocaleString(numeric,MagickPathExtent,"%g",(double)
*beta);
(void) DeleteNodeFromSplayTree(fx_info->symbols,subexpression);
}
case ',':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(alpha);
}
case ';':
{
- *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception);
+ *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,depth,beta,
+ exception);
return(*beta);
}
default:
{
- gamma=alpha*FxEvaluateSubexpression(fx_info,channel,x,y,p,beta,
+ gamma=alpha*FxEvaluateSubexpression(fx_info,channel,x,y,p,depth,beta,
exception);
return(gamma);
}
}
if (strchr("(",(int) *expression) != (char *) NULL)
{
+ (*depth)++;
+ if (*depth >= FxMaxParenthesisDepth)
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "ParenthesisNestedTooDeeply","`%s'",expression);
(void) CopyMagickString(subexpression,expression+1,MagickPathExtent);
subexpression[strlen(subexpression)-1]='\0';
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,beta,
- exception);
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,subexpression,depth,
+ beta,exception);
+ (*depth)--;
return(gamma);
}
switch (*expression)
{
case '+':
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,beta,
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,depth,beta,
exception);
return(1.0*gamma);
}
case '-':
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,beta,
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,depth,beta,
exception);
return(-1.0*gamma);
}
case '~':
{
- gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,beta,
+ gamma=FxEvaluateSubexpression(fx_info,channel,x,y,expression+1,depth,beta,
exception);
return((double) (~(size_t) (gamma+0.5)));
}
{
if (LocaleNCompare(expression,"abs",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) fabs((double) alpha));
}
#if defined(MAGICKCORE_HAVE_ACOSH)
if (LocaleNCompare(expression,"acosh",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) acosh((double) alpha));
}
#endif
if (LocaleNCompare(expression,"acos",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) acos((double) alpha));
}
#if defined(MAGICKCORE_HAVE_J1)
if (LocaleNCompare(expression,"airy",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
if (alpha == 0.0)
return(1.0);
gamma=2.0*j1((double) (MagickPI*alpha))/(MagickPI*alpha);
#if defined(MAGICKCORE_HAVE_ASINH)
if (LocaleNCompare(expression,"asinh",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) asinh((double) alpha));
}
#endif
if (LocaleNCompare(expression,"asin",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) asin((double) alpha));
}
if (LocaleNCompare(expression,"alt",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return(((ssize_t) alpha) & 0x01 ? -1.0 : 1.0);
}
if (LocaleNCompare(expression,"atan2",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) atan2((double) alpha,(double) *beta));
}
#if defined(MAGICKCORE_HAVE_ATANH)
if (LocaleNCompare(expression,"atanh",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) atanh((double) alpha));
}
#endif
if (LocaleNCompare(expression,"atan",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) atan((double) alpha));
}
if (LocaleCompare(expression,"a") == 0)
{
if (LocaleNCompare(expression,"ceil",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) ceil((double) alpha));
}
if (LocaleNCompare(expression,"clamp",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
if (alpha < 0.0)
return(0.0);
if (alpha > 1.0)
}
if (LocaleNCompare(expression,"cosh",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) cosh((double) alpha));
}
if (LocaleNCompare(expression,"cos",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) cos((double) alpha));
}
if (LocaleCompare(expression,"c") == 0)
const char
*type;
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
if (fx_info->images->colorspace == CMYKColorspace)
switch (channel)
{
}
if (LocaleNCompare(expression,"drc",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) (alpha/(*beta*(alpha-1.0)+1.0)));
}
break;
return((double) MagickEpsilon);
if (LocaleNCompare(expression,"exp",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) exp((double) alpha));
}
if (LocaleCompare(expression,"e") == 0)
{
if (LocaleNCompare(expression,"floor",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) floor((double) alpha));
}
break;
{
if (LocaleNCompare(expression,"gauss",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
gamma=exp((double) (-alpha*alpha/2.0))/sqrt(2.0*MagickPI);
return((double) gamma);
}
MagickOffsetType
gcd;
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
gcd=FxGCD((MagickOffsetType) (alpha+0.5),(MagickOffsetType) (*beta+
0.5));
return((double) gcd);
return(FxGetSymbol(fx_info,channel,x,y,expression,exception));
if (LocaleNCompare(expression,"hypot",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) hypot((double) alpha,(double) *beta));
}
break;
return(FxGetSymbol(fx_info,channel,x,y,expression,exception));
if (LocaleNCompare(expression,"int",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) floor(alpha));
}
-#if defined(MAGICKCORE_HAVE_ISNAN)
if (LocaleNCompare(expression,"isnan",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
- return((double) !!isnan((double) alpha));
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
+ return((double) !!IsNaN((double) alpha));
}
-#endif
if (LocaleCompare(expression,"i") == 0)
return(FxGetSymbol(fx_info,channel,x,y,expression,exception));
break;
#if defined(MAGICKCORE_HAVE_J0)
if (LocaleNCompare(expression,"j0",2) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,depth,
+ beta,exception);
return((double) j0((double) alpha));
}
#endif
#if defined(MAGICKCORE_HAVE_J1)
if (LocaleNCompare(expression,"j1",2) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,depth,
+ beta,exception);
return((double) j1((double) alpha));
}
#endif
#if defined(MAGICKCORE_HAVE_J1)
if (LocaleNCompare(expression,"jinc",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
if (alpha == 0.0)
return(1.0);
gamma=(double) (2.0*j1((double) (MagickPI*alpha))/(MagickPI*alpha));
{
if (LocaleNCompare(expression,"ln",2) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+2,depth,
+ beta,exception);
return((double) log((double) alpha));
}
if (LocaleNCompare(expression,"logtwo",6) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+6,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+6,depth,
+ beta,exception);
return((double) log10((double) alpha))/log10(2.0);
}
if (LocaleNCompare(expression,"log",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) log10((double) alpha));
}
if (LocaleCompare(expression,"lightness") == 0)
break;
if (LocaleNCompare(expression,"max",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return(alpha > *beta ? alpha : *beta);
}
if (LocaleNCompare(expression,"minima",6) == 0)
break;
if (LocaleNCompare(expression,"min",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return(alpha < *beta ? alpha : *beta);
}
if (LocaleNCompare(expression,"mod",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
gamma=alpha-floor((double) (alpha/(*beta)))*(*beta);
return(gamma);
}
{
if (LocaleNCompare(expression,"not",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) (alpha < MagickEpsilon));
}
if (LocaleCompare(expression,"n") == 0)
return((double) MagickPI);
if (LocaleNCompare(expression,"pow",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) pow((double) alpha,(double) *beta));
}
if (LocaleCompare(expression,"p") == 0)
}
if (LocaleNCompare(expression,"round",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
return((double) floor((double) alpha+0.5));
}
if (LocaleCompare(expression,"r") == 0)
return(FxGetSymbol(fx_info,channel,x,y,expression,exception));
if (LocaleNCompare(expression,"sign",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return(alpha < 0.0 ? -1.0 : 1.0);
}
if (LocaleNCompare(expression,"sinc",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
if (alpha == 0)
return(1.0);
gamma=(double) (sin((double) (MagickPI*alpha))/
}
if (LocaleNCompare(expression,"sinh",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) sinh((double) alpha));
}
if (LocaleNCompare(expression,"sin",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) sin((double) alpha));
}
if (LocaleNCompare(expression,"sqrt",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) sqrt((double) alpha));
}
if (LocaleNCompare(expression,"squish",6) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+6,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+6,depth,
+ beta,exception);
return((double) (1.0/(1.0+exp((double) (-alpha)))));
}
if (LocaleCompare(expression,"s") == 0)
{
if (LocaleNCompare(expression,"tanh",4) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,depth,
+ beta,exception);
return((double) tanh((double) alpha));
}
if (LocaleNCompare(expression,"tan",3) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3,depth,
+ beta,exception);
return((double) tan((double) alpha));
}
if (LocaleCompare(expression,"Transparent") == 0)
return(0.0);
if (LocaleNCompare(expression,"trunc",5) == 0)
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,depth,
+ beta,exception);
if (alpha >= 0.0)
return((double) floor((double) alpha));
return((double) ceil((double) alpha));
{
do
{
- alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
- exception);
+ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,
+ depth,beta,exception);
} while (fabs((double) alpha) >= MagickEpsilon);
return((double) *beta);
}
double
beta;
+ size_t
+ depth;
+
+ depth=0;
beta=0.0;
- *alpha=FxEvaluateSubexpression(fx_info,channel,x,y,fx_info->expression,&beta,
- exception);
+ *alpha=FxEvaluateSubexpression(fx_info,channel,x,y,fx_info->expression,&depth,
+ &beta,exception);
return(exception->severity == OptionError ? MagickFalse : MagickTrue);
}
\f
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
fx_info=AcquireFxThreadSet(image,expression,exception);
Initialize implode image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
implode_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (implode_image == (Image *) NULL)
Clone first frame in sequence.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
morph_images=CloneImage(image,0,0,MagickTrue,exception);
if (morph_images == (Image *) NULL)
return((Image *) NULL);
plasma=ClampToQuantum(pixel+noise*GetPseudoRandomValue(random_info)-
noise/2.0);
+ if (plasma <= 0)
+ return((Quantum) 0);
+ if (plasma >= QuantumRange)
+ return(QuantumRange);
return(plasma);
}
y,
y_mid;
- if (((segment->x2-segment->x1) == 0.0) && ((segment->y2-segment->y1) == 0.0))
+ if ((fabs(segment->x2-segment->x1) <= MagickEpsilon) &&
+ (fabs(segment->y2-segment->y1) <= MagickEpsilon))
return(MagickTrue);
if (depth != 0)
{
+ MagickBooleanType
+ status;
+
SegmentInfo
local_info;
local_info=(*segment);
local_info.x1=(double) x_mid;
local_info.y1=(double) y_mid;
- return(PlasmaImageProxy(image,image_view,u_view,v_view,random_info,
- &local_info,attenuate,depth,exception));
+ status=PlasmaImageProxy(image,image_view,u_view,v_view,random_info,
+ &local_info,attenuate,depth,exception);
+ return(status);
}
x_mid=(ssize_t) ceil((segment->x1+segment->x2)/2-0.5);
y_mid=(ssize_t) ceil((segment->y1+segment->y2)/2-0.5);
- if ((segment->x1 == (double) x_mid) && (segment->x2 == (double) x_mid) &&
- (segment->y1 == (double) y_mid) && (segment->y2 == (double) y_mid))
+ if ((fabs(segment->x1-x_mid) < MagickEpsilon) &&
+ (fabs(segment->x2-x_mid) < MagickEpsilon) &&
+ (fabs(segment->y1-y_mid) < MagickEpsilon) &&
+ (fabs(segment->y2-y_mid) < MagickEpsilon))
return(MagickFalse);
/*
Average pixels and apply plasma.
*/
plasma=(double) QuantumRange/(2.0*attenuate);
- if ((segment->x1 != (double) x_mid) || (segment->x2 != (double) x_mid))
+ if ((fabs(segment->x1-x_mid) > MagickEpsilon) ||
+ (fabs(segment->x2-x_mid) > MagickEpsilon))
{
/*
Left pixel.
q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
- if (segment->x1 != segment->x2)
+ if (fabs(segment->x1-segment->x2) > MagickEpsilon)
{
/*
Right pixel.
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
}
- if ((segment->y1 != (double) y_mid) || (segment->y2 != (double) y_mid))
+ if ((fabs(segment->y1-y_mid) > MagickEpsilon) ||
+ (fabs(segment->y2-y_mid) > MagickEpsilon))
{
- if ((segment->x1 != (double) x_mid) || (segment->y2 != (double) y_mid))
+ if ((fabs(segment->x1-x_mid) > MagickEpsilon) ||
+ (fabs(segment->y2-y_mid) > MagickEpsilon))
{
/*
Bottom pixel.
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
- if (segment->y1 != segment->y2)
+ if (fabs(segment->y1-segment->y2) > MagickEpsilon)
{
/*
Top pixel.
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
}
- if ((segment->x1 != segment->x2) || (segment->y1 != segment->y2))
+ if ((fabs(segment->x1-segment->x2) > MagickEpsilon) ||
+ (fabs(segment->y1-segment->y2) > MagickEpsilon))
{
/*
Middle pixel.
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
- if (((segment->x2-segment->x1) < 3.0) && ((segment->y2-segment->y1) < 3.0))
+ if ((fabs(segment->x2-segment->x1) < 3.0) &&
+ (fabs(segment->y2-segment->y1) < 3.0))
return(MagickTrue);
return(MagickFalse);
}
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
Simulate a Polaroid picture.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
quantum=(ssize_t) MagickMax(MagickMax((double) image->columns,(double)
image->rows)/25.0,10.0);
height=image->rows+2*quantum;
Initialize sepia-toned image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
sepia_image=CloneImage(image,0,0,MagickTrue,exception);
if (sepia_image == (Image *) NULL)
return((Image *) NULL);
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
border_image=DestroyImage(border_image);
if (shadow_image == (Image *) NULL)
return((Image *) NULL);
- SetPixelChannelMask(shadow_image,channel_mask);
+ (void) SetPixelChannelMask(shadow_image,channel_mask);
if (shadow_image->page.width == 0)
shadow_image->page.width=shadow_image->columns;
if (shadow_image->page.height == 0)
y;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (IsGrayColorspace(image->colorspace) != MagickFalse)
Initialize steganographic image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(watermark != (const Image *) NULL);
- assert(watermark->signature == MagickSignature);
+ assert(watermark->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
one=1UL;
stegano_image=CloneImage(image,0,0,MagickTrue,exception);
if (stegano_image == (Image *) NULL)
y;
assert(left_image != (const Image *) NULL);
- assert(left_image->signature == MagickSignature);
+ assert(left_image->signature == MagickCoreSignature);
if (left_image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
left_image->filename);
assert(right_image != (const Image *) NULL);
- assert(right_image->signature == MagickSignature);
+ assert(right_image->signature == MagickCoreSignature);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
assert(right_image != (const Image *) NULL);
image=left_image;
if ((left_image->columns != right_image->columns) ||
Initialize swirl image attributes.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
swirl_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (swirl_image == (Image *) NULL)
return((Image *) NULL);
Allocate tint image.
*/
assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
tint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (tint_image == (Image *) NULL)
return((Image *) NULL);
if ((flags & ChiValue) != 0)
color_vector.alpha=geometry_info.chi;
}
- intensity=(double) GetPixelInfoIntensity(image,tint);
+ intensity=(double) GetPixelInfoIntensity((const Image *) NULL,tint);
color_vector.red=(double) (color_vector.red*tint->red/100.0-intensity);
color_vector.green=(double) (color_vector.green*tint->green/100.0-intensity);
color_vector.blue=(double) (color_vector.blue*tint->blue/100.0-intensity);
*vignette_image;
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
canvas_image=CloneImage(image,0,0,MagickTrue,exception);
if (canvas_image == (Image *) NULL)
return((Image *) NULL);
Initialize wave image attributes.
*/
assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
+ assert(image->signature == MagickCoreSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
+ assert(exception->signature == MagickCoreSignature);
wave_image=CloneImage(image,image->columns,(size_t) (image->rows+2.0*
fabs(amplitude)),MagickTrue,exception);
if (wave_image == (Image *) NULL)
projects / imagemagick / blobdiff