*source_view,
*image_view;
+ const char
+ *value;
+
MagickBooleanType
+ clamp,
status;
MagickOffsetType
*/
status=MagickTrue;
progress=0;
+ clamp=MagickTrue;
+ value=GetImageArtifact(image,"compose:clamp");
+ if (value != (const char *) NULL)
+ clamp=IsStringTrue(value);
source_view=AcquireVirtualCacheView(source_image,exception);
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
/*
Set alpha channel.
*/
- q[i]=ClampToQuantum(QuantumRange*(Sa+Da-Sa*Da));
+ q[i]=clamp != MagickFalse ?
+ ClampPixel(QuantumRange*(Sa+Da-Sa*Da)) :
+ ClampToQuantum(QuantumRange*(Sa+Da-Sa*Da));
continue;
}
/*
Dc=(MagickRealType) q[i];
Sca=QuantumScale*Sa*Sc;
Dca=QuantumScale*Da*Dc;
- q[i]=ClampToQuantum(QuantumRange*(Sca+Dca*(1.0-Sa)));
+ q[i]=clamp != MagickFalse ?
+ ClampPixel(QuantumRange*(Sca+Dca*(1.0-Sa))) :
+ ClampToQuantum(QuantumRange*(Sca+Dca*(1.0-Sa)));
}
p+=GetPixelChannels(source_image);
channels=GetPixelChannels(source_image);
*source_view,
*image_view;
+ const char
+ *value;
+
GeometryInfo
geometry_info;
*source_image;
MagickBooleanType
+ clamp,
status;
MagickOffsetType
if ((image->alpha_trait != UndefinedPixelTrait) &&
(source_image->alpha_trait == UndefinedPixelTrait))
(void) SetImageAlphaChannel(source_image,SetAlphaChannel,exception);
-if (0)
if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
{
status=CompositeOverImage(image,source_image,clip_to_self,x_offset,
source_image=DestroyImage(source_image);
return(status);
}
- canvas_image=(Image *) NULL;
amount=0.5;
+ canvas_image=(Image *) NULL;
canvas_dissolve=1.0;
+ clamp=MagickTrue;
+ value=GetImageArtifact(image,"compose:clamp");
+ if (value != (const char *) NULL)
+ clamp=IsStringTrue(value);
percent_luma=100.0;
percent_chroma=100.0;
source_dissolve=1.0;
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
- 1,exception);
+ p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,1,
+ exception);
q=GetCacheViewAuthenticPixels(image_view,x_offset,y+y_offset,
source_image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
- 1,exception);
+ p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,1,
+ exception);
q=GetCacheViewAuthenticPixels(image_view,x_offset,y+y_offset,
source_image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
q+=GetPixelChannels(image);
continue;
}
- SetPixelAlpha(image,ClampToQuantum(GetPixelIntensity(source_image,
- p)),q);
+ SetPixelAlpha(image,clamp != MagickFalse ?
+ ClampPixel(GetPixelIntensity(source_image,p)) :
+ ClampToQuantum(GetPixelIntensity(source_image,p)),q);
p+=GetPixelChannels(source_image);
q+=GetPixelChannels(image);
}
if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
continue;
- p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
- 1,exception);
- q=QueueCacheViewAuthenticPixels(canvas_view,0,y,
- canvas_image->columns,1,exception);
+ p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,1,
+ exception);
+ q=QueueCacheViewAuthenticPixels(canvas_view,0,y,canvas_image->columns,1,
+ exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) source_image->columns; x++)
const char
*value;
- PixelInfo
- pixel;
-
MagickRealType
horizontal_scale,
vertical_scale;
+ PixelInfo
+ pixel;
+
PointInfo
center,
offset;
value=GetImageArtifact(image,"compose:args");
if (value != (char *) NULL)
flags=ParseGeometry(value,&geometry_info);
- if ((flags & (WidthValue|HeightValue)) == 0 )
+ if ((flags & (WidthValue | HeightValue)) == 0 )
{
if ((flags & AspectValue) == 0)
{
if (compose == DistortCompositeOp)
{
if ((flags & XValue) == 0)
- if ((flags & AspectValue) == 0)
+ if ((flags & AspectValue) != 0)
+ center.x=(MagickRealType) ((image->columns-1)/2.0);
+ else
center.x=(MagickRealType) (x_offset+(source_image->columns-1)/
2.0);
- else
- center.x=(MagickRealType) ((image->columns-1)/2.0);
else
- if ((flags & AspectValue) == 0)
- center.x=(MagickRealType) x_offset+geometry_info.xi;
- else
+ if ((flags & AspectValue) != 0)
center.x=geometry_info.xi;
- if ((flags & YValue) == 0)
- if ((flags & AspectValue) == 0)
- center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0);
else
+ center.x=(MagickRealType) (x_offset+geometry_info.xi);
+ if ((flags & YValue) == 0)
+ if ((flags & AspectValue) != 0)
center.y=(MagickRealType) ((image->rows-1)/2.0);
- else
- if ((flags & AspectValue) == 0)
- center.y=(MagickRealType) y_offset+geometry_info.psi;
else
+ center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0);
+ else
+ if ((flags & AspectValue) != 0)
center.y=geometry_info.psi;
+ else
+ center.y=(MagickRealType) (y_offset+geometry_info.psi);
}
/*
Shift the pixel offset point as defined by the provided,
(((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ?
y : 0);
- (void) InterpolatePixelInfo(image,image_view,BlendInterpolatePixel,
- (double) offset.x,(double) offset.y,&pixel,exception);
+ (void) InterpolatePixelInfo(image,image_view,
+ UndefinedInterpolatePixel,(double) offset.x,(double) offset.y,
+ &pixel,exception);
/*
Mask with the 'invalid pixel mask' in alpha channel.
*/
- pixel.alpha=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
- pixel.alpha)*(1.0-QuantumScale*GetPixelAlpha(source_image,p)));
+ pixel.alpha=(MagickRealType) QuantumRange*(QuantumScale*pixel.alpha)*
+ (QuantumScale*GetPixelAlpha(source_image,p));
SetPixelViaPixelInfo(canvas_image,&pixel,q);
p+=GetPixelChannels(source_image);
q+=GetPixelChannels(canvas_image);
MagickRealType
blue,
- luma,
+ chroma,
green,
hue,
- red,
- chroma;
+ luma,
+ red;
PixelInfo
canvas_pixel,
Sc: source color.
Dc: canvas color.
*/
- (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset,
- source,exception);
+ (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset,source,
+ exception);
if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
case DissolveCompositeOp:
{
if (channel == AlphaPixelChannel)
- pixel=canvas_dissolve*GetPixelAlpha(source_image,
- source);
+ pixel=canvas_dissolve*GetPixelAlpha(source_image,source);
else
pixel=(MagickRealType) source[channel];
break;
break;
}
}
- q[i]=ClampToQuantum(pixel);
+ q[i]=clamp != MagickFalse ? ClampPixel(pixel) :
+ ClampToQuantum(pixel);
}
q+=GetPixelChannels(image);
continue;
}
case DissolveCompositeOp:
{
- alpha=source_dissolve*Sa*(-canvas_dissolve*Da)+source_dissolve*
- Sa+canvas_dissolve*Da;
+ alpha=source_dissolve*Sa*(-canvas_dissolve*Da)+source_dissolve*Sa+
+ canvas_dissolve*Da;
break;
}
case DstOverCompositeOp:
PixelChannel channel=GetPixelChannelChannel(image,i);
PixelTrait traits=GetPixelChannelTraits(image,channel);
- PixelTrait source_traits=GetPixelChannelTraits(source_image,
- channel);
+ PixelTrait source_traits=GetPixelChannelTraits(source_image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((source_traits == UndefinedPixelTrait) &&
/*
Copy channel.
*/
- q[i]=ClampToQuantum(Sc);
+ q[i]=Sc;
continue;
}
if (channel == AlphaPixelChannel)
}
case CopyAlphaCompositeOp:
{
- if (source_traits == UndefinedPixelTrait)
+ if ((source_traits & BlendPixelTrait) == 0)
pixel=GetPixelIntensity(source_image,p);
else
pixel=QuantumRange*Sa;
break;
}
}
- q[i]=ClampToQuantum(pixel);
+ q[i]=clamp != MagickFalse ? ClampPixel(pixel) :
+ ClampToQuantum(pixel);
continue;
}
/*
case LightenCompositeOp:
case ModulusSubtractCompositeOp:
{
- gamma=1.0-alpha;
+ gamma=PerceptibleReciprocal(1.0-alpha);
break;
}
default:
+ {
+ gamma=PerceptibleReciprocal(alpha);
break;
+ }
}
- gamma=PerceptibleReciprocal(alpha);
pixel=Dc;
switch (compose)
{
break;
}
case BlurCompositeOp:
- case DisplaceCompositeOp:
- case DistortCompositeOp:
case CopyCompositeOp:
case ReplaceCompositeOp:
case SrcCompositeOp:
pixel=QuantumRange*Sca;
break;
}
+ case DisplaceCompositeOp:
+ case DistortCompositeOp:
+ {
+ pixel=Sc;
+ break;
+ }
case BumpmapCompositeOp:
{
if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon)
pixel=Sc;
break;
}
- CompositeHCL(canvas_pixel.red,canvas_pixel.green,
- canvas_pixel.blue,&sans,&sans,&luma);
+ CompositeHCL(canvas_pixel.red,canvas_pixel.green,canvas_pixel.blue,
+ &sans,&sans,&luma);
CompositeHCL(source_pixel.red,source_pixel.green,source_pixel.blue,
&hue,&chroma,&sans);
HCLComposite(hue,chroma,luma,&red,&green,&blue);
pixel=Sc;
break;
}
- CompositeHCL(canvas_pixel.red,canvas_pixel.green,
- canvas_pixel.blue,&hue,&chroma,&luma);
+ CompositeHCL(canvas_pixel.red,canvas_pixel.green,canvas_pixel.blue,
+ &hue,&chroma,&luma);
CompositeHCL(source_pixel.red,source_pixel.green,source_pixel.blue,
&hue,&sans,&sans);
HCLComposite(hue,chroma,luma,&red,&green,&blue);
pixel=Sc;
break;
}
- CompositeHCL(canvas_pixel.red,canvas_pixel.green,
- canvas_pixel.blue,&hue,&chroma,&luma);
+ CompositeHCL(canvas_pixel.red,canvas_pixel.green,canvas_pixel.blue,
+ &hue,&chroma,&luma);
CompositeHCL(source_pixel.red,source_pixel.green,source_pixel.blue,
&sans,&sans,&luma);
HCLComposite(hue,chroma,luma,&red,&green,&blue);
Dca' = A*Sca*Dca + B*Sca*Da + C*Dca*Sa + D*Sa*Da + Sca*(1.0-Da) +
Dca*(1.0-Sa)
*/
- pixel=gamma*geometry_info.rho*Sa*Sc*Da*Dc+geometry_info.sigma*
- Sa*Sc*Da+geometry_info.xi*Da*Dc*Sa+geometry_info.psi*Sa*Da+
- Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa);
+ pixel=gamma*QuantumRange*(geometry_info.rho*Sca*Dca+
+ geometry_info.sigma*Sca*Da+geometry_info.xi*Dca*Sa+
+ geometry_info.psi*Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
break;
}
case MinusDstCompositeOp:
pixel=Dc;
break;
}
- CompositeHCL(canvas_pixel.red,canvas_pixel.green,
- canvas_pixel.blue,&hue,&chroma,&luma);
+ CompositeHCL(canvas_pixel.red,canvas_pixel.green,canvas_pixel.blue,
+ &hue,&chroma,&luma);
luma+=(0.01*percent_luma*offset)/midpoint;
chroma*=0.01*percent_chroma;
HCLComposite(hue,chroma,luma,&red,&green,&blue);
pixel=Sc;
break;
}
- CompositeHCL(canvas_pixel.red,canvas_pixel.green,
- canvas_pixel.blue,&hue,&chroma,&luma);
+ CompositeHCL(canvas_pixel.red,canvas_pixel.green,canvas_pixel.blue,
+ &hue,&chroma,&luma);
CompositeHCL(source_pixel.red,source_pixel.green,source_pixel.blue,
&sans,&chroma,&sans);
HCLComposite(hue,chroma,luma,&red,&green,&blue);
break;
}
}
- q[i]=ClampPixel(pixel);
+ q[i]=clamp != MagickFalse ? ClampPixel(pixel) : ClampToQuantum(pixel);
}
p+=GetPixelChannels(source_image);
channels=GetPixelChannels(source_image);
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType)
- y,image->rows);
+ proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y,
+ image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}