#include "MagickCore/cache-view.h"
#include "MagickCore/color.h"
#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
#include "MagickCore/composite.h"
#include "MagickCore/decorate.h"
#include "MagickCore/distort.h"
*noise_image;
MagickBooleanType
+ concurrent,
status;
MagickOffsetType
status=MagickTrue;
progress=0;
random_info=AcquireRandomInfoThreadSet();
+ concurrent=GetRandomSecretKey(random_info[0]) == ~0UL ? MagickTrue :
+ MagickFalse;
image_view=AcquireCacheView(image);
noise_view=AcquireCacheView(noise_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(progress,status)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) omp_concurrent(concurrent)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(noise_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
% The format of the CharcoalImage method is:
%
% Image *CharcoalImage(const Image *image,const double radius,
-% const double sigma,const double bias,ExceptionInfo *exception)
+% const double sigma,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o sigma: the standard deviation of the Gaussian, in pixels.
%
-% o bias: the bias.
-%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport Image *CharcoalImage(const Image *image,const double radius,
- const double sigma,const double bias,ExceptionInfo *exception)
+ const double sigma,ExceptionInfo *exception)
{
Image
*charcoal_image,
clone_image=DestroyImage(clone_image);
if (edge_image == (Image *) NULL)
return((Image *) NULL);
- charcoal_image=BlurImage(edge_image,radius,sigma,bias,exception);
+ charcoal_image=BlurImage(edge_image,radius,sigma,exception);
edge_image=DestroyImage(edge_image);
if (charcoal_image == (Image *) NULL)
return((Image *) NULL);
const PixelInfo *colorize,ExceptionInfo *exception)
{
#define ColorizeImageTag "Colorize/Image"
+#define Colorize(pixel,blend_percentage,colorize) \
+ (pixel)=((pixel)*(100.0-(blend_percentage))+(colorize)*(blend_percentage))/100.0;
CacheView
*colorize_view,
flags;
PixelInfo
- pixel;
+ blend_percentage;
ssize_t
y;
colorize_image=DestroyImage(colorize_image);
return((Image *) NULL);
}
+ if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
+ (IsPixelInfoGray(colorize) != MagickFalse))
+ (void) SetImageColorspace(colorize_image,sRGBColorspace,exception);
+ if ((colorize_image->matte == MagickFalse) &&
+ (colorize->matte != MagickFalse))
+ (void) SetImageAlpha(colorize_image,OpaqueAlpha,exception);
if (blend == (const char *) NULL)
return(colorize_image);
- /*
- Determine RGB values of the fill color for pixel
- */
- GetPixelInfo(image,&pixel);
+ GetPixelInfo(image,&blend_percentage);
flags=ParseGeometry(blend,&geometry_info);
- pixel.red=geometry_info.rho;
- pixel.green=geometry_info.rho;
- pixel.blue=geometry_info.rho;
- pixel.alpha=100.0;
+ blend_percentage.red=geometry_info.rho;
+ blend_percentage.green=geometry_info.rho;
+ blend_percentage.blue=geometry_info.rho;
+ blend_percentage.black=geometry_info.rho;
+ blend_percentage.alpha=geometry_info.rho;
if ((flags & SigmaValue) != 0)
- pixel.green=geometry_info.sigma;
+ blend_percentage.green=geometry_info.sigma;
if ((flags & XiValue) != 0)
- pixel.blue=geometry_info.xi;
+ blend_percentage.blue=geometry_info.xi;
if ((flags & PsiValue) != 0)
- pixel.alpha=geometry_info.psi;
- if (pixel.colorspace == CMYKColorspace)
+ blend_percentage.alpha=geometry_info.psi;
+ if (blend_percentage.colorspace == CMYKColorspace)
{
- pixel.black=geometry_info.rho;
if ((flags & PsiValue) != 0)
- pixel.black=geometry_info.psi;
+ blend_percentage.black=geometry_info.psi;
if ((flags & ChiValue) != 0)
- pixel.alpha=geometry_info.chi;
+ blend_percentage.alpha=geometry_info.chi;
}
/*
Colorize DirectClass image.
MagickBooleanType
sync;
+ PixelInfo
+ pixel;
+
register const Quantum
*restrict p;
status=MagickFalse;
continue;
}
+ GetPixelInfo(colorize_image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
- i;
-
- for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
- {
- PixelChannel
- channel;
-
- PixelTrait
- colorize_traits,
- traits;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- colorize_traits=GetPixelChannelMapTraits(colorize_image,channel);
- if ((traits == UndefinedPixelTrait) ||
- (colorize_traits == UndefinedPixelTrait))
- continue;
- if ((colorize_traits & CopyPixelTrait) != 0)
- {
- SetPixelChannel(colorize_image,channel,p[i],q);
- continue;
- }
- switch (channel)
+ if (GetPixelMask(colorize_image,q) != 0)
{
- case RedPixelChannel:
- {
- SetPixelChannel(colorize_image,channel,ClampToQuantum((p[i]*
- (100.0-pixel.red)+colorize->red*pixel.red)/100.0),q);
- break;
- }
- case GreenPixelChannel:
- {
- SetPixelChannel(colorize_image,channel,ClampToQuantum((p[i]*
- (100.0-pixel.green)+colorize->green*pixel.green)/100.0),q);
- break;
- }
- case BluePixelChannel:
- {
- SetPixelChannel(colorize_image,channel,ClampToQuantum((p[i]*
- (100.0-pixel.blue)+colorize->blue*pixel.blue)/100.0),q);
- break;
- }
- case BlackPixelChannel:
- {
- SetPixelChannel(colorize_image,channel,ClampToQuantum((p[i]*
- (100.0-pixel.black)+colorize->black*pixel.black)/100.0),q);
- break;
- }
- case AlphaPixelChannel:
- {
- SetPixelChannel(colorize_image,channel,ClampToQuantum((p[i]*
- (100.0-pixel.alpha)+colorize->alpha*pixel.alpha)/100.0),q);
- break;
- }
- default:
- {
- SetPixelChannel(colorize_image,channel,p[i],q);
- break;
- }
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(colorize_image);
+ continue;
}
- }
+ GetPixelInfoPixel(image,p,&pixel);
+ Colorize(pixel.red,blend_percentage.red,colorize->red);
+ Colorize(pixel.green,blend_percentage.green,colorize->green);
+ Colorize(pixel.blue,blend_percentage.blue,colorize->blue);
+ Colorize(pixel.black,blend_percentage.black,colorize->black);
+ Colorize(pixel.alpha,blend_percentage.alpha,colorize->alpha);
+ SetPixelInfoPixel(colorize_image,&pixel,q);
p+=GetPixelChannels(image);
q+=GetPixelChannels(colorize_image);
}
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickRealType
+ PixelInfo
pixel;
register const Quantum
status=MagickFalse;
continue;
}
+ GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
size_t
height;
+ GetPixelInfoPixel(image,p,&pixel);
height=color_matrix->height > 6 ? 6UL : color_matrix->height;
for (v=0; v < (ssize_t) height; v++)
{
- pixel=ColorMatrix[v][0]*GetPixelRed(image,p)+ColorMatrix[v][1]*
+ MagickRealType
+ sum;
+
+ sum=ColorMatrix[v][0]*GetPixelRed(image,p)+ColorMatrix[v][1]*
GetPixelGreen(image,p)+ColorMatrix[v][2]*GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
- pixel+=ColorMatrix[v][3]*GetPixelBlack(image,p);
+ sum+=ColorMatrix[v][3]*GetPixelBlack(image,p);
if (image->matte != MagickFalse)
- pixel+=ColorMatrix[v][4]*GetPixelAlpha(image,p);
- pixel+=QuantumRange*ColorMatrix[v][5];
+ sum+=ColorMatrix[v][4]*GetPixelAlpha(image,p);
+ sum+=QuantumRange*ColorMatrix[v][5];
switch (v)
{
- case 0: SetPixelRed(color_image,ClampToQuantum(pixel),q); break;
- case 1: SetPixelGreen(color_image,ClampToQuantum(pixel),q); break;
- case 2: SetPixelBlue(color_image,ClampToQuantum(pixel),q); break;
- case 3:
- {
- if (image->colorspace == CMYKColorspace)
- SetPixelBlack(color_image,ClampToQuantum(pixel),q);
- break;
- }
- case 4:
- {
- if (image->matte != MagickFalse)
- SetPixelAlpha(color_image,ClampToQuantum(pixel),q);
- break;
- }
+ case 0: pixel.red=sum; break;
+ case 1: pixel.green=sum; break;
+ case 2: pixel.blue=sum; break;
+ case 3: pixel.black=sum; break;
+ case 4: pixel.alpha=sum; break;
+ default: break;
}
}
+ SetPixelInfoPixel(color_image,&pixel,q);
p+=GetPixelChannels(image);
q+=GetPixelChannels(color_image);
}
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(fx_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
/*
Determine if the pixel is within an ellipse.
*/
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(implode_image);
+ continue;
+ }
delta.x=scale.x*(double) (x-center.x);
distance=delta.x*delta.x+delta.y*delta.y;
if (distance >= (radius*radius))
beta=(MagickRealType) (i+1.0)/(MagickRealType) (number_frames+1.0);
alpha=1.0-beta;
morph_image=ResizeImage(next,(size_t) (alpha*next->columns+beta*
- GetNextImageInList(next)->columns+0.5),(size_t) (alpha*
- next->rows+beta*GetNextImageInList(next)->rows+0.5),
- next->filter,next->blur,exception);
+ GetNextImageInList(next)->columns+0.5),(size_t) (alpha*next->rows+beta*
+ GetNextImageInList(next)->rows+0.5),next->filter,exception);
if (morph_image == (Image *) NULL)
{
morph_images=DestroyImageList(morph_images);
AppendImageToList(&morph_images,morph_image);
morph_images=GetLastImageInList(morph_images);
morph_image=ResizeImage(GetNextImageInList(next),morph_images->columns,
- morph_images->rows,GetNextImageInList(next)->filter,
- GetNextImageInList(next)->blur,exception);
+ morph_images->rows,GetNextImageInList(next)->filter,exception);
if (morph_image == (Image *) NULL)
{
morph_images=DestroyImageList(morph_images);
register ssize_t
i;
- for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(morph_image);
+ continue;
+ }
+ for (i=0; i < (ssize_t) GetPixelChannels(morph_image); i++)
{
PixelChannel
channel;
}
picture_image->background_color=image->border_color;
(void) SetImageBackgroundColor(picture_image,exception);
- (void) CompositeImage(picture_image,OverCompositeOp,image,quantum,quantum,
- exception);
+ (void) CompositeImage(picture_image,image,OverCompositeOp,MagickTrue,quantum,
+ quantum,exception);
if (caption_image != (Image *) NULL)
{
- (void) CompositeImage(picture_image,OverCompositeOp,caption_image,quantum,
- (ssize_t) (image->rows+3*quantum/2),exception);
+ (void) CompositeImage(picture_image,caption_image,OverCompositeOp,
+ MagickTrue,quantum,(ssize_t) (image->rows+3*quantum/2),exception);
caption_image=DestroyImage(caption_image);
}
(void) QueryColorCompliance("none",AllCompliance,
return((Image *) NULL);
picture_image=rotate_image;
picture_image->background_color=image->background_color;
- polaroid_image=ShadowImage(picture_image,80.0,2.0,0.0,quantum/3,quantum/3,
+ polaroid_image=ShadowImage(picture_image,80.0,2.0,quantum/3,quantum/3,
exception);
if (polaroid_image == (Image *) NULL)
{
return(picture_image);
}
polaroid_image=flop_image;
- (void) CompositeImage(polaroid_image,OverCompositeOp,picture_image,(ssize_t)
- (-0.01*picture_image->columns/2.0),0L,exception);
+ (void) CompositeImage(polaroid_image,picture_image,OverCompositeOp,
+ MagickTrue,(ssize_t) (-0.01*picture_image->columns/2.0),0L,exception);
picture_image=DestroyImage(picture_image);
(void) QueryColorCompliance("none",AllCompliance,
&polaroid_image->background_color,exception);
% The format of the ShadowImage method is:
%
% Image *ShadowImage(const Image *image,const double alpha,
-% const double sigma,const double bias,const ssize_t x_offset,
-% const ssize_t y_offset,ExceptionInfo *exception)
+% const double sigma,const ssize_t x_offset,const ssize_t y_offset,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o sigma: the standard deviation of the Gaussian, in pixels.
%
-% o bias: the bias.
-%
% o x_offset: the shadow x-offset.
%
% o y_offset: the shadow y-offset.
%
*/
MagickExport Image *ShadowImage(const Image *image,const double alpha,
- const double sigma,const double bias,const ssize_t x_offset,
- const ssize_t y_offset,ExceptionInfo *exception)
+ const double sigma,const ssize_t x_offset,const ssize_t y_offset,
+ ExceptionInfo *exception)
{
#define ShadowImageTag "Shadow/Image"
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
- (void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod);
+ if (IsGrayColorspace(image->colorspace) != MagickFalse)
+ (void) TransformImageColorspace(clone_image,sRGBColorspace,exception);
+ (void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod,
+ exception);
border_info.width=(size_t) floor(2.0*sigma+0.5);
border_info.height=(size_t) floor(2.0*sigma+0.5);
border_info.x=0;
return((Image *) NULL);
}
channel_mask=SetPixelChannelMask(border_image,AlphaChannel);
- shadow_image=BlurImage(border_image,0.0,sigma,bias,exception);
+ shadow_image=BlurImage(border_image,0.0,sigma,exception);
border_image=DestroyImage(border_image);
if (shadow_image == (Image *) NULL)
return((Image *) NULL);
% The format of the SketchImage method is:
%
% Image *SketchImage(const Image *image,const double radius,
-% const double sigma,const double angle,const double bias,
-% ExceptionInfo *exception)
+% const double sigma,const double angle,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o angle: apply the effect along this angle.
%
-% o bias: the bias.
-%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport Image *SketchImage(const Image *image,const double radius,
- const double sigma,const double angle,const double bias,
- ExceptionInfo *exception)
+ const double sigma,const double angle,ExceptionInfo *exception)
{
CacheView
*random_view;
*sketch_image;
MagickBooleanType
+ concurrent,
status;
RandomInfo
return((Image *) NULL);
status=MagickTrue;
random_info=AcquireRandomInfoThreadSet();
+ concurrent=GetRandomSecretKey(random_info[0]) == ~0UL ? MagickTrue :
+ MagickFalse;
random_view=AcquireCacheView(random_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status)
+ #pragma omp parallel for schedule(static,4) shared(status) omp_concurrent(concurrent)
#endif
for (y=0; y < (ssize_t) random_image->rows; y++)
{
register ssize_t
i;
+ if (GetPixelMask(random_image,q) != 0)
+ {
+ q+=GetPixelChannels(random_image);
+ continue;
+ }
value=GetPseudoRandomValue(random_info[id]);
for (i=0; i < (ssize_t) GetPixelChannels(random_image); i++)
{
random_image=DestroyImage(random_image);
return(random_image);
}
- blur_image=MotionBlurImage(random_image,radius,sigma,angle,bias,exception);
+ blur_image=MotionBlurImage(random_image,radius,sigma,angle,exception);
random_image=DestroyImage(random_image);
if (blur_image == (Image *) NULL)
return((Image *) NULL);
dodge_image=DestroyImage(dodge_image);
return((Image *) NULL);
}
- (void) CompositeImage(sketch_image,ColorDodgeCompositeOp,dodge_image,0,0,
- exception);
+ (void) CompositeImage(sketch_image,dodge_image,ColorDodgeCompositeOp,
+ MagickTrue,0,0,exception);
dodge_image=DestroyImage(dodge_image);
blend_image=CloneImage(image,0,0,MagickTrue,exception);
if (blend_image == (Image *) NULL)
return((Image *) NULL);
}
(void) SetImageArtifact(blend_image,"compose:args","20x80");
- (void) CompositeImage(sketch_image,BlendCompositeOp,blend_image,0,0,
- exception);
+ (void) CompositeImage(sketch_image,blend_image,BlendCompositeOp,MagickTrue,
+ 0,0,exception);
blend_image=DestroyImage(blend_image);
return(sketch_image);
}
register ssize_t
i;
+ if (GetPixelMask(image,q) != 0)
+ {
+ q+=GetPixelChannels(image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
stegano_image=CloneImage(image,0,0,MagickTrue,exception);
if (stegano_image == (Image *) NULL)
return((Image *) NULL);
+ stegano_image->depth=MAGICKCORE_QUANTUM_DEPTH;
if (SetImageStorageClass(stegano_image,DirectClass,exception) == MagickFalse)
{
stegano_image=DestroyImage(stegano_image);
return((Image *) NULL);
}
- stegano_image->depth=MAGICKCORE_QUANTUM_DEPTH;
/*
Hide watermark in low-order bits of image.
*/
i=0;
j=0;
depth=stegano_image->depth;
- k=image->offset;
+ k=stegano_image->offset;
status=MagickTrue;
watermark_view=AcquireCacheView(watermark);
stegano_view=AcquireCacheView(stegano_image);
{
for (x=0; (x < (ssize_t) watermark->columns) && (j < (ssize_t) depth); x++)
{
- Quantum
- virtual_pixel[CompositePixelChannel];
-
ssize_t
offset;
- (void) GetOneCacheViewVirtualPixel(watermark_view,x,y,virtual_pixel,
+ (void) GetOneCacheViewVirtualPixelInfo(watermark_view,x,y,&pixel,
exception);
- pixel.red=(double) virtual_pixel[RedPixelChannel];
- pixel.green=(double) virtual_pixel[GreenPixelChannel];
- pixel.blue=(double) virtual_pixel[BluePixelChannel];
- pixel.alpha=(double) virtual_pixel[AlphaPixelChannel];
offset=k/(ssize_t) stegano_image->columns;
if (offset >= (ssize_t) stegano_image->rows)
break;
{
case 0:
{
- SetPixelRed(image,SetBit(GetPixelRed(image,q),j,GetBit(
- GetPixelInfoIntensity(&pixel),i)),q);
+ SetPixelRed(stegano_image,SetBit(GetPixelRed(stegano_image,q),j,
+ GetBit(GetPixelInfoIntensity(&pixel),i)),q);
break;
}
case 1:
{
- SetPixelGreen(image,SetBit(GetPixelGreen(image,q),j,GetBit(
- GetPixelInfoIntensity(&pixel),i)),q);
+ SetPixelGreen(stegano_image,SetBit(GetPixelGreen(stegano_image,q),j,
+ GetBit(GetPixelInfoIntensity(&pixel),i)),q);
break;
}
case 2:
{
- SetPixelBlue(image,SetBit(GetPixelBlue(image,q),j,GetBit(
- GetPixelInfoIntensity(&pixel),i)),q);
+ SetPixelBlue(stegano_image,SetBit(GetPixelBlue(stegano_image,q),j,
+ GetBit(GetPixelInfoIntensity(&pixel),i)),q);
break;
}
}
k++;
if (k == (ssize_t) (stegano_image->columns*stegano_image->columns))
k=0;
- if (k == image->offset)
+ if (k == stegano_image->offset)
j++;
}
}
}
stegano_view=DestroyCacheView(stegano_view);
watermark_view=DestroyCacheView(watermark_view);
- if (stegano_image->storage_class == PseudoClass)
- (void) SyncImage(stegano_image,exception);
if (status == MagickFalse)
{
stegano_image=DestroyImage(stegano_image);
/*
Determine if the pixel is within an ellipse.
*/
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(swirl_image);
+ continue;
+ }
delta.x=scale.x*(double) (x-center.x);
distance=delta.x*delta.x+delta.y*delta.y;
if (distance >= (radius*radius))
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(tint_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
% The format of the VignetteImage method is:
%
% Image *VignetteImage(const Image *image,const double radius,
-% const double sigma,const double bias,const ssize_t x,const ssize_t y,
+% const double sigma,const ssize_t x,const ssize_t y,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o sigma: the standard deviation of the Gaussian, in pixels.
%
-% o bias: the bias.
-%
% o x, y: Define the x and y ellipse offset.
%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport Image *VignetteImage(const Image *image,const double radius,
- const double sigma,const double bias,const ssize_t x,const ssize_t y,
- ExceptionInfo *exception)
+ const double sigma,const ssize_t x,const ssize_t y,ExceptionInfo *exception)
{
char
ellipse[MaxTextExtent];
draw_info->primitive=AcquireString(ellipse);
(void) DrawImage(oval_image,draw_info,exception);
draw_info=DestroyDrawInfo(draw_info);
- blur_image=BlurImage(oval_image,radius,sigma,bias,exception);
+ blur_image=BlurImage(oval_image,radius,sigma,exception);
oval_image=DestroyImage(oval_image);
if (blur_image == (Image *) NULL)
{
return((Image *) NULL);
}
blur_image->matte=MagickFalse;
- (void) CompositeImage(canvas_image,IntensityCompositeOp,blur_image,0,0,
- exception);
+ (void) CompositeImage(canvas_image,blur_image,IntensityCompositeOp,MagickTrue,
+ 0,0,exception);
blur_image=DestroyImage(blur_image);
vignette_image=MergeImageLayers(canvas_image,FlattenLayer,exception);
canvas_image=DestroyImage(canvas_image);