X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=MagickCore%2Fcomposite.c;h=d4dd47e5a65ea88412b9b46566cc4c69fce5d5b0;hb=b3f97ae45019a91b30792a6fa42d81a2689a7025;hp=47ef967ce73c176c65463760ee05c30116f209ca;hpb=7133e649ea494c1286ff16bcb02342d660097219;p=imagemagick diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 47ef967ce..d4dd47e5a 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -13,11 +13,11 @@ % MagickCore Image Composite Methods % % % % Software Design % -% John Cristy % +% Cristy % % July 1992 % % % % % -% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2015 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 % @@ -45,6 +45,7 @@ #include "MagickCore/cache.h" #include "MagickCore/cache-private.h" #include "MagickCore/cache-view.h" +#include "MagickCore/channel.h" #include "MagickCore/client.h" #include "MagickCore/color.h" #include "MagickCore/color-private.h" @@ -95,15 +96,15 @@ % The format of the CompositeImage method is: % % MagickBooleanType CompositeImage(Image *image, -% const Image *composite_image,const CompositeOperator compose, +% const Image *source_image,const CompositeOperator compose, % const MagickBooleanType clip_to_self,const ssize_t x_offset, % const ssize_t y_offset,ExceptionInfo *exception) % % A description of each parameter follows: % -% o image: the destination image, modified by he composition +% o image: the canvas image, modified by he composition % -% o composite_image: the composite (source) image. +% o source_image: the source image. % % o compose: This operator affects how the composite is applied to % the image. The operators and how they are utilized are listed here @@ -115,7 +116,7 @@ % % o y_offset: the row offset of the composited image. % -% Extra Controls from Image meta-data in 'composite_image' (artifacts) +% Extra Controls from Image meta-data in 'image' (artifacts) % % o "compose:args" % A string containing extra numerical arguments for specific compose @@ -136,7 +137,7 @@ Color Function : f(Sc,Dc) where Sc and Dc are the normizalized colors Blending areas : X = 1 for area of overlap, ie: f(Sc,Dc) Y = 1 for source preserved - Z = 1 for destination preserved + Z = 1 for canvas preserved Conversion to transparency (then optimized) Dca' = f(Sc, Dc)*Sa*Da + Y*Sca*(1-Da) + Z*Dca*(1-Sa) @@ -177,40 +178,11 @@ operations. */ -static inline double MagickMin(const double x,const double y) +static void HCLComposite(const MagickRealType hue,const MagickRealType chroma, + const MagickRealType luma,MagickRealType *red,MagickRealType *green, + MagickRealType *blue) { - if (x < y) - return(x); - return(y); -} - -static inline double MagickMax(const double x,const double y) -{ - if (x > y) - return(x); - return(y); -} - -static inline double ConvertHueToRGB(double m1, - double m2,double hue) -{ - if (hue < 0.0) - hue+=1.0; - if (hue > 1.0) - hue-=1.0; - if ((6.0*hue) < 1.0) - return(m1+6.0*(m2-m1)*hue); - if ((2.0*hue) < 1.0) - return(m2); - if ((3.0*hue) < 2.0) - return(m1+6.0*(m2-m1)*(2.0/3.0-hue)); - return(m1); -} - -static void HCLComposite(const double hue,const double chroma,const double luma, - double *red,double *green,double *blue) -{ - double + MagickRealType b, c, g, @@ -222,9 +194,9 @@ static void HCLComposite(const double hue,const double chroma,const double luma, /* Convert HCL to RGB colorspace. */ - assert(red != (double *) NULL); - assert(green != (double *) NULL); - assert(blue != (double *) NULL); + assert(red != (MagickRealType *) NULL); + assert(green != (MagickRealType *) NULL); + assert(blue != (MagickRealType *) NULL); h=6.0*hue; c=chroma; x=c*(1.0-fabs(fmod(h,2.0)-1.0)); @@ -233,49 +205,50 @@ static void HCLComposite(const double hue,const double chroma,const double luma, b=0.0; if ((0.0 <= h) && (h < 1.0)) { - r=c; - g=x; + r=c; + g=x; } else if ((1.0 <= h) && (h < 2.0)) { - r=x; - g=c; + r=x; + g=c; } else if ((2.0 <= h) && (h < 3.0)) { - g=c; - b=x; + g=c; + b=x; } else if ((3.0 <= h) && (h < 4.0)) { - g=x; - b=c; + g=x; + b=c; } else if ((4.0 <= h) && (h < 5.0)) { - r=x; - b=c; + r=x; + b=c; } else if ((5.0 <= h) && (h < 6.0)) { - r=c; - b=x; + r=c; + b=x; } - m=luma-0.298839*r+0.586811*g+0.114350*b; + m=luma-(0.298839*r+0.586811*g+0.114350*b); *red=QuantumRange*(r+m); *green=QuantumRange*(g+m); *blue=QuantumRange*(b+m); } -static void CompositeHCL(const double red,const double green,const double blue, - double *hue,double *chroma,double *luma) +static void CompositeHCL(const MagickRealType red,const MagickRealType green, + const MagickRealType blue,MagickRealType *hue,MagickRealType *chroma, + MagickRealType *luma) { - double + MagickRealType b, c, g, @@ -286,20 +259,20 @@ static void CompositeHCL(const double red,const double green,const double blue, /* Convert RGB to HCL colorspace. */ - assert(hue != (double *) NULL); - assert(chroma != (double *) NULL); - assert(luma != (double *) NULL); + assert(hue != (MagickRealType *) NULL); + assert(chroma != (MagickRealType *) NULL); + assert(luma != (MagickRealType *) NULL); r=red; g=green; b=blue; max=MagickMax(r,MagickMax(g,b)); - c=max-(double) MagickMin(r,MagickMin(g,b)); + c=max-(MagickRealType) MagickMin(r,MagickMin(g,b)); h=0.0; if (c == 0) h=0.0; else if (red == max) - h=fmod((g-b)/c,6.0); + h=fmod((g-b)/c+6.0,6.0); else if (green == max) h=((b-r)/c)+2.0; @@ -312,16 +285,20 @@ static void CompositeHCL(const double red,const double green,const double blue, } static MagickBooleanType CompositeOverImage(Image *image, - const Image *composite_image,const MagickBooleanType clip_to_self, + const Image *source_image,const MagickBooleanType clip_to_self, const ssize_t x_offset,const ssize_t y_offset,ExceptionInfo *exception) { #define CompositeImageTag "Composite/Image" CacheView - *composite_view, + *source_view, *image_view; + const char + *value; + MagickBooleanType + clamp, status; MagickOffsetType @@ -335,11 +312,15 @@ static MagickBooleanType CompositeOverImage(Image *image, */ status=MagickTrue; progress=0; - composite_view=AcquireVirtualCacheView(composite_image,exception); + 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) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_number_threads(image,image->columns,image->rows,1) + magick_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -364,7 +345,7 @@ static MagickBooleanType CompositeOverImage(Image *image, { if (y < y_offset) continue; - if ((y-y_offset) >= (ssize_t) composite_image->rows) + if ((y-y_offset) >= (ssize_t) source_image->rows) continue; } /* @@ -372,10 +353,10 @@ static MagickBooleanType CompositeOverImage(Image *image, */ pixels=(Quantum *) NULL; p=(Quantum *) NULL; - if ((y >= y_offset) && ((y-y_offset) < (ssize_t) composite_image->rows)) + if ((y >= y_offset) && ((y-y_offset) < (ssize_t) source_image->rows)) { - p=GetCacheViewVirtualPixels(composite_view,0,y-y_offset, - composite_image->columns,1,exception); + p=GetCacheViewVirtualPixels(source_view,0,y-y_offset, + source_image->columns,1,exception); if (p == (const Quantum *) NULL) { status=MagickFalse; @@ -383,7 +364,7 @@ static MagickBooleanType CompositeOverImage(Image *image, } pixels=p; if (x_offset < 0) - p-=x_offset*GetPixelChannels(composite_image); + p-=x_offset*GetPixelChannels(source_image); } q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) @@ -393,13 +374,13 @@ static MagickBooleanType CompositeOverImage(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - double - alpha, + MagickRealType Da, Dc, - gamma, + Dca, Sa, - Sc; + Sc, + Sca; register ssize_t i; @@ -411,11 +392,11 @@ static MagickBooleanType CompositeOverImage(Image *image, q+=GetPixelChannels(image); continue; } - if ((x-x_offset) >= (ssize_t) composite_image->columns) + if ((x-x_offset) >= (ssize_t) source_image->columns) break; } if ((pixels == (Quantum *) NULL) || (x < x_offset) || - ((x-x_offset) >= (ssize_t) composite_image->columns)) + ((x-x_offset) >= (ssize_t) source_image->columns)) { Quantum source[MaxPixelChannels]; @@ -423,29 +404,23 @@ static MagickBooleanType CompositeOverImage(Image *image, /* Virtual composite: Sc: source color. - Dc: destination color. + Dc: canvas color. */ - if (GetPixelMask(image,q) != 0) + if (GetPixelReadMask(image,q) == 0) { q+=GetPixelChannels(image); continue; } - (void) GetOneVirtualPixel(composite_image,x-x_offset,y-y_offset, + (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset, source,exception); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel - channel; - - PixelTrait - composite_traits, - traits; - - channel=GetPixelChannelMapChannel(image,i); - traits=GetPixelChannelMapTraits(image,channel); - composite_traits=GetPixelChannelMapTraits(composite_image,channel); + PixelChannel channel=GetPixelChannelChannel(image,i); + PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait source_traits=GetPixelChannelTraits(source_image, + channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; q[i]=source[channel]; } @@ -455,63 +430,61 @@ static MagickBooleanType CompositeOverImage(Image *image, /* Authentic composite: Sa: normalized source alpha. - Da: normalized destination alpha. + Da: normalized canvas alpha. */ - if (GetPixelMask(composite_image,p) != 0) + if (GetPixelReadMask(source_image,p) == 0) { - p+=GetPixelChannels(composite_image); - channels=GetPixelChannels(composite_image); - if (p >= (pixels+channels*composite_image->columns)) + p+=GetPixelChannels(source_image); + channels=GetPixelChannels(source_image); + if (p >= (pixels+channels*source_image->columns)) p=pixels; q+=GetPixelChannels(image); continue; } - Sa=QuantumScale*GetPixelAlpha(composite_image,p); + Sa=QuantumScale*GetPixelAlpha(source_image,p); Da=QuantumScale*GetPixelAlpha(image,q); - alpha=Sa*(-Da)+Sa+Da; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel - channel; - - PixelTrait - composite_traits, - traits; - - channel=GetPixelChannelMapChannel(image,i); - traits=GetPixelChannelMapTraits(image,channel); - composite_traits=GetPixelChannelMapTraits(composite_image,channel); + PixelChannel channel=GetPixelChannelChannel(image,i); + PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait source_traits=GetPixelChannelTraits(source_image, + channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; if ((traits & CopyPixelTrait) != 0) { - if (channel != AlphaPixelChannel) - { - /* - Copy channel. - */ - q[i]=GetPixelChannel(composite_image,channel,p); - continue; - } + /* + Copy channel. + */ + q[i]=GetPixelChannel(source_image,channel,p); + continue; + } + if (channel == AlphaPixelChannel) + { /* Set alpha channel. */ - q[i]=ClampToQuantum(QuantumRange*alpha); + q[i]=clamp != MagickFalse ? + ClampPixel(QuantumRange*(Sa+Da-Sa*Da)) : + ClampToQuantum(QuantumRange*(Sa+Da-Sa*Da)); continue; } /* Sc: source color. - Dc: destination color. + Dc: canvas color. */ - Sc=(double) GetPixelChannel(composite_image,channel,p); - Dc=(double) q[i]; - gamma=MagickEpsilonReciprocal(alpha); - q[i]=ClampToQuantum(gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc)); + Sc=(MagickRealType) GetPixelChannel(source_image,channel,p); + Dc=(MagickRealType) q[i]; + Sca=QuantumScale*Sa*Sc; + Dca=QuantumScale*Da*Dc; + q[i]=clamp != MagickFalse ? + ClampPixel(QuantumRange*(Sca+Dca*(1.0-Sa))) : + ClampToQuantum(QuantumRange*(Sca+Dca*(1.0-Sa))); } - p+=GetPixelChannels(composite_image); - channels=GetPixelChannels(composite_image); - if (p >= (pixels+channels*composite_image->columns)) + p+=GetPixelChannels(source_image); + channels=GetPixelChannels(source_image); + if (p >= (pixels+channels*source_image->columns)) p=pixels; q+=GetPixelChannels(image); } @@ -531,7 +504,7 @@ static MagickBooleanType CompositeOverImage(Image *image, status=MagickFalse; } } - composite_view=DestroyCacheView(composite_view); + source_view=DestroyCacheView(source_view); image_view=DestroyCacheView(image_view); return(status); } @@ -544,25 +517,29 @@ MagickExport MagickBooleanType CompositeImage(Image *image, #define CompositeImageTag "Composite/Image" CacheView - *composite_view, + *source_view, *image_view; + const char + *value; + GeometryInfo geometry_info; Image - *composite_image, - *destination_image; + *canvas_image, + *source_image; MagickBooleanType + clamp, status; MagickOffsetType progress; - double + MagickRealType amount, - destination_dissolve, + canvas_dissolve, midpoint, percent_luma, percent_chroma, @@ -583,20 +560,29 @@ MagickExport MagickBooleanType CompositeImage(Image *image, assert(composite->signature == MagickSignature); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - composite_image=CloneImage(composite,0,0,MagickTrue,exception); - if (composite_image == (const Image *) NULL) + source_image=CloneImage(composite,0,0,MagickTrue,exception); + if (source_image == (const Image *) NULL) return(MagickFalse); - (void) SetImageColorspace(composite_image,image->colorspace,exception); + if (IsGrayColorspace(image->colorspace) != MagickFalse) + (void) SetImageColorspace(image,sRGBColorspace,exception); + (void) SetImageColorspace(source_image,image->colorspace,exception); + if ((image->alpha_trait != UndefinedPixelTrait) && + (source_image->alpha_trait == UndefinedPixelTrait)) + (void) SetImageAlphaChannel(source_image,SetAlphaChannel,exception); if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp)) { - status=CompositeOverImage(image,composite_image,clip_to_self,x_offset, + status=CompositeOverImage(image,source_image,clip_to_self,x_offset, y_offset,exception); - composite_image=DestroyImage(composite_image); + source_image=DestroyImage(source_image); return(status); } - destination_image=(Image *) NULL; amount=0.5; - destination_dissolve=1.0; + 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; @@ -607,18 +593,18 @@ MagickExport MagickBooleanType CompositeImage(Image *image, { if ((x_offset < 0) || (y_offset < 0)) break; - if ((x_offset+(ssize_t) composite_image->columns) >= (ssize_t) image->columns) + if ((x_offset+(ssize_t) source_image->columns) > (ssize_t) image->columns) break; - if ((y_offset+(ssize_t) composite_image->rows) >= (ssize_t) image->rows) + if ((y_offset+(ssize_t) source_image->rows) > (ssize_t) image->rows) break; status=MagickTrue; - composite_view=AcquireVirtualCacheView(composite_image,exception); + source_view=AcquireVirtualCacheView(source_image,exception); image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_number_threads(image,image->columns,image->rows,1) + magick_threads(source_image,image,source_image->rows,1) #endif - for (y=0; y < (ssize_t) composite_image->rows; y++) + for (y=0; y < (ssize_t) source_image->rows; y++) { MagickBooleanType sync; @@ -634,44 +620,114 @@ MagickExport MagickBooleanType CompositeImage(Image *image, if (status == MagickFalse) continue; - p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns, - 1,exception); + p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,1, + exception); q=GetCacheViewAuthenticPixels(image_view,x_offset,y+y_offset, - composite_image->columns,1,exception); + source_image->columns,1,exception); if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) { status=MagickFalse; continue; } - for (x=0; x < (ssize_t) composite_image->columns; x++) + for (x=0; x < (ssize_t) source_image->columns; x++) { register ssize_t i; - if (GetPixelMask(composite_image,p) != 0) + if (GetPixelReadMask(source_image,p) == 0) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); continue; } - for (i=0; i < (ssize_t) GetPixelChannels(composite_image); i++) + for (i=0; i < (ssize_t) GetPixelChannels(source_image); i++) { - PixelChannel - channel; - - PixelTrait - composite_traits, - traits; - - channel=GetPixelChannelMapChannel(composite_image,i); - composite_traits=GetPixelChannelMapTraits(composite_image,channel); - traits=GetPixelChannelMapTraits(image,channel); + PixelChannel channel=GetPixelChannelChannel(source_image,i); + PixelTrait source_traits=GetPixelChannelTraits(source_image, + channel); + PixelTrait traits=GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; SetPixelChannel(image,channel,p[i],q); } - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); + q+=GetPixelChannels(image); + } + sync=SyncCacheViewAuthenticPixels(image_view,exception); + if (sync == MagickFalse) + status=MagickFalse; + if (image->progress_monitor != (MagickProgressMonitor) NULL) + { + MagickBooleanType + proceed; + +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp critical (MagickCore_CompositeImage) +#endif + proceed=SetImageProgress(image,CompositeImageTag, + (MagickOffsetType) y,image->rows); + if (proceed == MagickFalse) + status=MagickFalse; + } + } + source_view=DestroyCacheView(source_view); + image_view=DestroyCacheView(image_view); + source_image=DestroyImage(source_image); + return(status); + } + case IntensityCompositeOp: + { + if ((x_offset < 0) || (y_offset < 0)) + break; + if ((x_offset+(ssize_t) source_image->columns) > (ssize_t) image->columns) + break; + if ((y_offset+(ssize_t) source_image->rows) > (ssize_t) image->rows) + break; + status=MagickTrue; + source_view=AcquireVirtualCacheView(source_image,exception); + image_view=AcquireAuthenticCacheView(image,exception); +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(static,4) shared(status) \ + magick_threads(source_image,image,source_image->rows,1) +#endif + for (y=0; y < (ssize_t) source_image->rows; y++) + { + MagickBooleanType + sync; + + register const Quantum + *p; + + register Quantum + *q; + + register ssize_t + x; + + if (status == MagickFalse) + continue; + 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)) + { + status=MagickFalse; + continue; + } + for (x=0; x < (ssize_t) source_image->columns; x++) + { + if (GetPixelReadMask(source_image,p) == 0) + { + p+=GetPixelChannels(source_image); + q+=GetPixelChannels(image); + continue; + } + SetPixelAlpha(image,clamp != MagickFalse ? + ClampPixel(GetPixelIntensity(source_image,p)) : + ClampToQuantum(GetPixelIntensity(source_image,p)),q); + p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); @@ -691,41 +747,40 @@ MagickExport MagickBooleanType CompositeImage(Image *image, status=MagickFalse; } } - composite_view=DestroyCacheView(composite_view); + source_view=DestroyCacheView(source_view); image_view=DestroyCacheView(image_view); - composite_image=DestroyImage(composite_image); + source_image=DestroyImage(source_image); return(status); } case CopyAlphaCompositeOp: case ChangeMaskCompositeOp: - case IntensityCompositeOp: { /* - Modify destination outside the overlaid region and require an alpha + Modify canvas outside the overlaid region and require an alpha channel to exist, to add transparency. */ - if (image->matte == MagickFalse) + if (image->alpha_trait == UndefinedPixelTrait) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); break; } case BlurCompositeOp: { CacheView - *composite_view, - *destination_view; + *canvas_view, + *source_view; const char *value; - PixelInfo - pixel; - - double + MagickRealType angle_range, angle_start, height, width; + PixelInfo + pixel; + ResampleFilter *resample_filter; @@ -738,11 +793,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image, Blur Image dictated by an overlay gradient map: X = red_channel; Y = green_channel; compose:args = x_scale[,y_scale[,angle]]. */ - destination_image=CloneImage(image,image->columns,image->rows,MagickTrue, + canvas_image=CloneImage(image,image->columns,image->rows,MagickTrue, exception); - if (destination_image == (Image *) NULL) + if (canvas_image == (Image *) NULL) { - composite_image=DestroyImage(composite_image); + source_image=DestroyImage(source_image); return(MagickFalse); } /* @@ -750,15 +805,15 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ SetGeometryInfo(&geometry_info); flags=NoValue; - value=GetImageArtifact(composite_image,"compose:args"); - if (value != (char *) NULL) + value=GetImageArtifact(image,"compose:args"); + if (value != (const char *) NULL) flags=ParseGeometry(value,&geometry_info); - if ((flags & WidthValue) == 0 ) { - (void) ThrowMagickException(exception,GetMagickModule(), - OptionWarning,"InvalidSetting","'%s' '%s'", - "compose:args",value); - composite_image=DestroyImage(composite_image); - destination_image=DestroyImage(destination_image); + if ((flags & WidthValue) == 0) + { + (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, + "InvalidSetting","'%s' '%s'","compose:args",value); + source_image=DestroyImage(source_image); + canvas_image=DestroyImage(canvas_image); return(MagickFalse); } /* @@ -769,8 +824,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, width=height=geometry_info.rho*2.0; if ((flags & HeightValue) != 0 ) height=geometry_info.sigma*2.0; - - /* default the unrotated ellipse width and height axis vectors */ + /* + Default the unrotated ellipse width and height axis vectors. + */ blur.x1=width; blur.x2=0.0; blur.y1=0.0; @@ -778,7 +834,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* rotate vectors if a rotation angle is given */ if ((flags & XValue) != 0 ) { - double + MagickRealType angle; angle=DegreesToRadians(geometry_info.xi); @@ -811,9 +867,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* do the variable blurring of each pixel in image */ GetPixelInfo(image,&pixel); - composite_view=AcquireVirtualCacheView(composite_image,exception); - destination_view=AcquireAuthenticCacheView(destination_image,exception); - for (y=0; y < (ssize_t) composite_image->rows; y++) + source_view=AcquireVirtualCacheView(source_image,exception); + canvas_view=AcquireAuthenticCacheView(canvas_image,exception); + for (y=0; y < (ssize_t) source_image->rows; y++) { MagickBooleanType sync; @@ -829,26 +885,26 @@ MagickExport MagickBooleanType CompositeImage(Image *image, if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows)) continue; - p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns, - 1,exception); - q=QueueCacheViewAuthenticPixels(destination_view,0,y, - destination_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) composite_image->columns; x++) + for (x=0; x < (ssize_t) source_image->columns; x++) { if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns)) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); continue; } - if (fabs(angle_range) > MagickEpsilon) + if (fabs((double) angle_range) > MagickEpsilon) { - double + MagickRealType angle; angle=angle_start+angle_range*QuantumScale* - GetPixelBlue(composite_image,p); + GetPixelBlue(source_image,p); blur.x1=width*cos(angle); blur.x2=width*sin(angle); blur.y1=(-height*sin(angle)); @@ -856,51 +912,51 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } #if 0 if ( x == 10 && y == 60 ) { - fprintf(stderr, "blur.x=%lf,%lf, blur.y=%lf,%lf\n", - blur.x1, blur.x2, blur.y1, blur.y2); - fprintf(stderr, "scaled by=%lf,%lf\n", - QuantumScale*GetPixelRed(p), QuantumScale*GetPixelGreen(p)); + (void) fprintf(stderr, "blur.x=%lf,%lf, blur.y=%lf,%lf\n",blur.x1, + blur.x2,blur.y1, blur.y2); + (void) fprintf(stderr, "scaled by=%lf,%lf\n",QuantumScale* + GetPixelRed(p),QuantumScale*GetPixelGreen(p)); #endif ScaleResampleFilter(resample_filter, - blur.x1*QuantumScale*GetPixelRed(composite_image,p), - blur.y1*QuantumScale*GetPixelGreen(composite_image,p), - blur.x2*QuantumScale*GetPixelRed(composite_image,p), - blur.y2*QuantumScale*GetPixelGreen(composite_image,p) ); + blur.x1*QuantumScale*GetPixelRed(source_image,p), + blur.y1*QuantumScale*GetPixelGreen(source_image,p), + blur.x2*QuantumScale*GetPixelRed(source_image,p), + blur.y2*QuantumScale*GetPixelGreen(source_image,p) ); (void) ResamplePixelColor(resample_filter,(double) x_offset+x, (double) y_offset+y,&pixel,exception); - SetPixelInfoPixel(destination_image,&pixel,q); - p+=GetPixelChannels(composite_image); - q+=GetPixelChannels(destination_image); + SetPixelViaPixelInfo(canvas_image,&pixel,q); + p+=GetPixelChannels(source_image); + q+=GetPixelChannels(canvas_image); } - sync=SyncCacheViewAuthenticPixels(destination_view,exception); + sync=SyncCacheViewAuthenticPixels(canvas_view,exception); if (sync == MagickFalse) break; } resample_filter=DestroyResampleFilter(resample_filter); - composite_view=DestroyCacheView(composite_view); - destination_view=DestroyCacheView(destination_view); - composite_image=DestroyImage(composite_image); - composite_image=destination_image; + source_view=DestroyCacheView(source_view); + canvas_view=DestroyCacheView(canvas_view); + source_image=DestroyImage(source_image); + source_image=canvas_image; break; } case DisplaceCompositeOp: case DistortCompositeOp: { CacheView - *composite_view, - *destination_view, + *source_view, + *canvas_view, *image_view; const char *value; - PixelInfo - pixel; - - double + MagickRealType horizontal_scale, vertical_scale; + PixelInfo + pixel; + PointInfo center, offset; @@ -910,30 +966,29 @@ MagickExport MagickBooleanType CompositeImage(Image *image, X = red_channel; Y = green_channel; compose:args = x_scale[,y_scale[,center.x,center.y]] */ - destination_image=CloneImage(image,image->columns,image->rows,MagickTrue, + canvas_image=CloneImage(image,image->columns,image->rows,MagickTrue, exception); - if (destination_image == (Image *) NULL) + if (canvas_image == (Image *) NULL) { - composite_image=DestroyImage(composite_image); + source_image=DestroyImage(source_image); return(MagickFalse); } SetGeometryInfo(&geometry_info); flags=NoValue; - value=GetImageArtifact(composite_image,"compose:args"); + 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) { - horizontal_scale=(double) (composite_image->columns-1.0)/ - 2.0; - vertical_scale=(double) (composite_image->rows-1.0)/2.0; + horizontal_scale=(MagickRealType) (source_image->columns-1)/2.0; + vertical_scale=(MagickRealType) (source_image->rows-1)/2.0; } else { - horizontal_scale=(double) (image->columns-1.0)/2.0; - vertical_scale=(double) (image->rows-1.0)/2.0; + horizontal_scale=(MagickRealType) (image->columns-1)/2.0; + vertical_scale=(MagickRealType) (image->rows-1)/2.0; } } else @@ -944,13 +999,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, { if ((flags & AspectValue) == 0) { - horizontal_scale*=(composite_image->columns-1.0)/200.0; - vertical_scale*=(composite_image->rows-1.0)/200.0; + horizontal_scale*=(source_image->columns-1)/200.0; + vertical_scale*=(source_image->rows-1)/200.0; } else { - horizontal_scale*=(image->columns-1.0)/200.0; - vertical_scale*=(image->rows-1.0)/200.0; + horizontal_scale*=(image->columns-1)/200.0; + vertical_scale*=(image->rows-1)/200.0; } } if ((flags & HeightValue) == 0) @@ -964,31 +1019,31 @@ MagickExport MagickBooleanType CompositeImage(Image *image, default = center of overlay image arg flag '!' = locations/percentage relative to background image */ - center.x=(double) x_offset; - center.y=(double) y_offset; + center.x=(MagickRealType) x_offset; + center.y=(MagickRealType) y_offset; if (compose == DistortCompositeOp) { if ((flags & XValue) == 0) - if ((flags & AspectValue) == 0) - center.x=(double) x_offset+(composite_image->columns-1)/ - 2.0; + if ((flags & AspectValue) != 0) + center.x=(MagickRealType) ((image->columns-1)/2.0); else - center.x=((double) image->columns-1)/2.0; + center.x=(MagickRealType) (x_offset+(source_image->columns-1)/ + 2.0); else - if ((flags & AspectValue) == 0) - center.x=(double) x_offset+geometry_info.xi; - else + if ((flags & AspectValue) != 0) center.x=geometry_info.xi; + else + center.x=(MagickRealType) (x_offset+geometry_info.xi); if ((flags & YValue) == 0) - if ((flags & AspectValue) == 0) - center.y=(double) y_offset+(composite_image->rows-1)/2.0; + if ((flags & AspectValue) != 0) + center.y=(MagickRealType) ((image->rows-1)/2.0); else - center.y=((double) image->rows-1)/2.0; + center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0); else - if ((flags & AspectValue) == 0) - center.y=(double) y_offset+geometry_info.psi; - 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, @@ -996,9 +1051,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ GetPixelInfo(image,&pixel); image_view=AcquireVirtualCacheView(image,exception); - composite_view=AcquireVirtualCacheView(composite_image,exception); - destination_view=AcquireAuthenticCacheView(destination_image,exception); - for (y=0; y < (ssize_t) composite_image->rows; y++) + source_view=AcquireVirtualCacheView(source_image,exception); + canvas_view=AcquireAuthenticCacheView(canvas_image,exception); + for (y=0; y < (ssize_t) source_image->rows; y++) { MagickBooleanType sync; @@ -1014,28 +1069,28 @@ MagickExport MagickBooleanType CompositeImage(Image *image, if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows)) continue; - p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns, - 1,exception); - q=QueueCacheViewAuthenticPixels(destination_view,0,y, - destination_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) composite_image->columns; x++) + for (x=0; x < (ssize_t) source_image->columns; x++) { if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns)) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); continue; } /* Displace the offset. */ - offset.x=(horizontal_scale*(GetPixelRed(composite_image,p)- - (((double) QuantumRange+1.0)/2.0)))/(((double) + offset.x=(double) (horizontal_scale*(GetPixelRed(source_image,p)- + (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType) QuantumRange+1.0)/2.0)+center.x+((compose == DisplaceCompositeOp) ? x : 0); - offset.y=(vertical_scale*(GetPixelGreen(composite_image,p)- - (((double) QuantumRange+1.0)/2.0)))/(((double) + offset.y=(double) (vertical_scale*(GetPixelGreen(source_image,p)- + (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType) QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ? y : 0); (void) InterpolatePixelInfo(image,image_view, @@ -1044,21 +1099,21 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Mask with the 'invalid pixel mask' in alpha channel. */ - pixel.alpha=(double) QuantumRange*(1.0-(1.0-QuantumScale* - pixel.alpha)*(1.0-QuantumScale*GetPixelAlpha(composite_image,p))); - SetPixelInfoPixel(destination_image,&pixel,q); - p+=GetPixelChannels(composite_image); - q+=GetPixelChannels(destination_image); + 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); } - sync=SyncCacheViewAuthenticPixels(destination_view,exception); + sync=SyncCacheViewAuthenticPixels(canvas_view,exception); if (sync == MagickFalse) break; } - destination_view=DestroyCacheView(destination_view); - composite_view=DestroyCacheView(composite_view); + canvas_view=DestroyCacheView(canvas_view); + source_view=DestroyCacheView(source_view); image_view=DestroyCacheView(image_view); - composite_image=DestroyImage(composite_image); - composite_image=destination_image; + source_image=DestroyImage(source_image); + source_image=canvas_image; break; } case DissolveCompositeOp: @@ -1069,31 +1124,23 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Geometry arguments to dissolve factors. */ - value=GetImageArtifact(composite_image,"compose:args"); + value=GetImageArtifact(image,"compose:args"); if (value != (char *) NULL) { flags=ParseGeometry(value,&geometry_info); source_dissolve=geometry_info.rho/100.0; - destination_dissolve=1.0; + canvas_dissolve=1.0; if ((source_dissolve-MagickEpsilon) < 0.0) source_dissolve=0.0; if ((source_dissolve+MagickEpsilon) > 1.0) { - destination_dissolve=2.0-source_dissolve; + canvas_dissolve=2.0-source_dissolve; source_dissolve=1.0; } if ((flags & SigmaValue) != 0) - destination_dissolve=geometry_info.sigma/100.0; - if ((destination_dissolve-MagickEpsilon) < 0.0) - destination_dissolve=0.0; - /* posible speed up? -- from IMv6 update - clip_to_self=MagickFalse; - if ((destination_dissolve+MagickEpsilon) > 1.0 ) - { - destination_dissolve=1.0; - clip_to_self=MagickTrue; - } - */ + canvas_dissolve=geometry_info.sigma/100.0; + if ((canvas_dissolve-MagickEpsilon) < 0.0) + canvas_dissolve=0.0; } break; } @@ -1102,14 +1149,14 @@ MagickExport MagickBooleanType CompositeImage(Image *image, const char *value; - value=GetImageArtifact(composite_image,"compose:args"); + value=GetImageArtifact(image,"compose:args"); if (value != (char *) NULL) { flags=ParseGeometry(value,&geometry_info); source_dissolve=geometry_info.rho/100.0; - destination_dissolve=1.0-source_dissolve; + canvas_dissolve=1.0-source_dissolve; if ((flags & SigmaValue) != 0) - destination_dissolve=geometry_info.sigma/100.0; + canvas_dissolve=geometry_info.sigma/100.0; } break; } @@ -1127,7 +1174,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, number of values) */ SetGeometryInfo(&geometry_info); - value=GetImageArtifact(composite_image,"compose:args"); + value=GetImageArtifact(image,"compose:args"); if (value != (char *) NULL) (void) ParseGeometry(value,&geometry_info); break; @@ -1140,7 +1187,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Determine the luma and chroma scale. */ - value=GetImageArtifact(composite_image,"compose:args"); + value=GetImageArtifact(image,"compose:args"); if (value != (char *) NULL) { flags=ParseGeometry(value,&geometry_info); @@ -1158,7 +1205,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Determine the amount and threshold. */ - value=GetImageArtifact(composite_image,"compose:args"); + value=GetImageArtifact(image,"compose:args"); if (value != (char *) NULL) { flags=ParseGeometry(value,&geometry_info); @@ -1178,28 +1225,28 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ status=MagickTrue; progress=0; - midpoint=((double) QuantumRange+1.0)/2; - composite_view=AcquireVirtualCacheView(composite_image,exception); + midpoint=((MagickRealType) QuantumRange+1.0)/2; + source_view=AcquireVirtualCacheView(source_image,exception); image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_number_threads(image,image->columns,image->rows,1) + magick_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { const Quantum *pixels; - double + MagickRealType blue, - luma, + chroma, green, hue, - red, - chroma; + luma, + red; PixelInfo - destination_pixel, + canvas_pixel, source_pixel; register const Quantum @@ -1217,7 +1264,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, { if (y < y_offset) continue; - if ((y-y_offset) >= (ssize_t) composite_image->rows) + if ((y-y_offset) >= (ssize_t) source_image->rows) continue; } /* @@ -1225,10 +1272,10 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ pixels=(Quantum *) NULL; p=(Quantum *) NULL; - if ((y >= y_offset) && ((y-y_offset) < (ssize_t) composite_image->rows)) + if ((y >= y_offset) && ((y-y_offset) < (ssize_t) source_image->rows)) { - p=GetCacheViewVirtualPixels(composite_view,0,y-y_offset, - composite_image->columns,1,exception); + p=GetCacheViewVirtualPixels(source_view,0,y-y_offset, + source_image->columns,1,exception); if (p == (const Quantum *) NULL) { status=MagickFalse; @@ -1236,7 +1283,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } pixels=p; if (x_offset < 0) - p-=x_offset*GetPixelChannels(composite_image); + p-=x_offset*GetPixelChannels(source_image); } q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) @@ -1247,16 +1294,18 @@ MagickExport MagickBooleanType CompositeImage(Image *image, hue=0.0; chroma=0.0; luma=0.0; - GetPixelInfo(image,&destination_pixel); - GetPixelInfo(composite_image,&source_pixel); + GetPixelInfo(image,&canvas_pixel); + GetPixelInfo(source_image,&source_pixel); for (x=0; x < (ssize_t) image->columns; x++) { double + gamma; + + MagickRealType alpha, Da, Dc, Dca, - gamma, Sa, Sc, Sca; @@ -1274,11 +1323,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image, q+=GetPixelChannels(image); continue; } - if ((x-x_offset) >= (ssize_t) composite_image->columns) + if ((x-x_offset) >= (ssize_t) source_image->columns) break; } if ((pixels == (Quantum *) NULL) || (x < x_offset) || - ((x-x_offset) >= (ssize_t) composite_image->columns)) + ((x-x_offset) >= (ssize_t) source_image->columns)) { Quantum source[MaxPixelChannels]; @@ -1286,32 +1335,26 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Virtual composite: Sc: source color. - Dc: destination color. + Dc: canvas color. */ - (void) GetOneVirtualPixel(composite_image,x-x_offset,y-y_offset, - source,exception); - if (GetPixelMask(image,q) != 0) + (void) GetOneVirtualPixel(source_image,x-x_offset,y-y_offset,source, + exception); + if (GetPixelReadMask(image,q) == 0) { q+=GetPixelChannels(image); continue; } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - double + MagickRealType pixel; - PixelChannel - channel; - - PixelTrait - composite_traits, - traits; - - channel=GetPixelChannelMapChannel(image,i); - traits=GetPixelChannelMapTraits(image,channel); - composite_traits=GetPixelChannelMapTraits(composite_image,channel); + PixelChannel channel=GetPixelChannelChannel(image,i); + PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait source_traits=GetPixelChannelTraits(source_image, + channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; switch (compose) { @@ -1321,14 +1364,14 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case DstAtopCompositeOp: case DstInCompositeOp: case InCompositeOp: - case IntensityCompositeOp: case OutCompositeOp: case SrcInCompositeOp: case SrcOutCompositeOp: { - pixel=(double) q[i]; if (channel == AlphaPixelChannel) - pixel=(double) TransparentAlpha; + pixel=(MagickRealType) TransparentAlpha; + else + pixel=(MagickRealType) q[i]; break; } case ClearCompositeOp: @@ -1337,32 +1380,28 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case SrcCompositeOp: { if (channel == AlphaPixelChannel) - { - pixel=(double) TransparentAlpha; - break; - } - pixel=0.0; + pixel=(MagickRealType) TransparentAlpha; + else + pixel=0.0; break; } case BlendCompositeOp: case DissolveCompositeOp: { if (channel == AlphaPixelChannel) - { - pixel=destination_dissolve*GetPixelAlpha(composite_image, - source); - break; - } - pixel=(double) source[channel]; + pixel=canvas_dissolve*GetPixelAlpha(source_image,source); + else + pixel=(MagickRealType) source[channel]; break; } default: { - pixel=(double) source[channel]; + pixel=(MagickRealType) source[channel]; break; } } - q[i]=ClampToQuantum(pixel); + q[i]=clamp != MagickFalse ? ClampPixel(pixel) : + ClampToQuantum(pixel); } q+=GetPixelChannels(image); continue; @@ -1370,27 +1409,30 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* Authentic composite: Sa: normalized source alpha. - Da: normalized destination alpha. + Da: normalized canvas alpha. */ - Sa=QuantumScale*GetPixelAlpha(composite_image,p); + Sa=QuantumScale*GetPixelAlpha(source_image,p); Da=QuantumScale*GetPixelAlpha(image,q); switch (compose) { case BumpmapCompositeOp: { - alpha=GetPixelIntensity(composite_image,p)*Sa; + alpha=GetPixelIntensity(source_image,p)*Sa; break; } case ColorBurnCompositeOp: case ColorDodgeCompositeOp: + case DarkenCompositeOp: case DifferenceCompositeOp: case DivideDstCompositeOp: case DivideSrcCompositeOp: case ExclusionCompositeOp: case HardLightCompositeOp: + case HardMixCompositeOp: case LinearBurnCompositeOp: case LinearDodgeCompositeOp: case LinearLightCompositeOp: + case LightenCompositeOp: case MathematicsCompositeOp: case MinusDstCompositeOp: case MinusSrcCompositeOp: @@ -1407,11 +1449,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, alpha=RoundToUnity(Sa+Da-Sa*Da); break; } - case DarkenCompositeOp: case DstAtopCompositeOp: case DstInCompositeOp: case InCompositeOp: - case LightenCompositeOp: case SrcInCompositeOp: { alpha=Sa*Da; @@ -1419,13 +1459,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } case DissolveCompositeOp: { - alpha=source_dissolve*Sa*(-destination_dissolve*Da)+source_dissolve* - Sa+destination_dissolve*Da; + alpha=source_dissolve*Sa*(-canvas_dissolve*Da)+source_dissolve*Sa+ + canvas_dissolve*Da; break; } case DstOverCompositeOp: { - alpha=Da*(-Sa)+Da+Sa; + alpha=Sa+Da-Sa*Da; break; } case DstOutCompositeOp: @@ -1442,7 +1482,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case OverCompositeOp: case SrcOverCompositeOp: { - alpha=Sa*(-Da)+Sa+Da; + alpha=Sa+Da-Sa*Da; break; } case BlendCompositeOp: @@ -1462,9 +1502,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, break; } } - if (GetPixelMask(image,p) != 0) + if (GetPixelReadMask(image,q) == 0) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); continue; } @@ -1476,8 +1516,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case ModulateCompositeOp: case SaturateCompositeOp: { - GetPixelInfoPixel(composite_image,p,&source_pixel); - GetPixelInfoPixel(image,q,&destination_pixel); + GetPixelInfoPixel(source_image,p,&source_pixel); + GetPixelInfoPixel(image,q,&canvas_pixel); break; } default: @@ -1485,43 +1525,36 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - double + MagickRealType + pixel, sans; - double - pixel; - - PixelChannel - channel; - - PixelTrait - composite_traits, - traits; - - channel=GetPixelChannelMapChannel(image,i); - traits=GetPixelChannelMapTraits(image,channel); - composite_traits=GetPixelChannelMapTraits(composite_image,channel); + PixelChannel channel=GetPixelChannelChannel(image,i); + PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait source_traits=GetPixelChannelTraits(source_image,channel); if (traits == UndefinedPixelTrait) continue; - if ((compose != IntensityCompositeOp) && - (composite_traits == UndefinedPixelTrait)) - continue; + if ((source_traits == UndefinedPixelTrait) && + (((compose != CopyAlphaCompositeOp) && + (compose != ChangeMaskCompositeOp)) || + (channel != AlphaPixelChannel))) + continue; /* Sc: source color. - Dc: destination color. + Dc: canvas color. */ - Sc=(double) GetPixelChannel(composite_image,channel,p); - Dc=(double) q[i]; + Sc=(MagickRealType) GetPixelChannel(source_image,channel,p); + Dc=(MagickRealType) q[i]; if ((traits & CopyPixelTrait) != 0) { - if (channel != AlphaPixelChannel) - { - /* - Copy channel. - */ - q[i]=ClampToQuantum(Sc); - continue; - } + /* + Copy channel. + */ + q[i]=Sc; + continue; + } + if (channel == AlphaPixelChannel) + { /* Set alpha channel. */ @@ -1552,23 +1585,21 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType equivalent; - if (Da > ((double) QuantumRange/2.0)) + if (Da > ((MagickRealType) QuantumRange/2.0)) { - pixel=(double) TransparentAlpha; + pixel=(MagickRealType) TransparentAlpha; break; } - equivalent=IsFuzzyEquivalencePixel(composite_image,p,image,q); + equivalent=IsFuzzyEquivalencePixel(source_image,p,image,q); if (equivalent != MagickFalse) - { - pixel=(double) TransparentAlpha; - break; - } - pixel=(double) OpaqueAlpha; + pixel=(MagickRealType) TransparentAlpha; + else + pixel=(MagickRealType) OpaqueAlpha; break; } case ClearCompositeOp: { - pixel=(double) TransparentAlpha; + pixel=(MagickRealType) TransparentAlpha; break; } case ColorizeCompositeOp: @@ -1576,12 +1607,12 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case LuminizeCompositeOp: case SaturateCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=QuantumRange*Da; break; } - if (fabs(QuantumRange*Da-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Da-TransparentAlpha)) < MagickEpsilon) { pixel=QuantumRange*Sa; break; @@ -1596,9 +1627,10 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } case CopyAlphaCompositeOp: { - pixel=QuantumRange*Sa; - if (composite_image->matte == MagickFalse) - pixel=GetPixelIntensity(composite_image,p); + if ((source_traits & BlendPixelTrait) == 0) + pixel=GetPixelIntensity(source_image,p); + else + pixel=QuantumRange*Sa; break; } case CopyCompositeOp: @@ -1613,24 +1645,19 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } case DarkenIntensityCompositeOp: { - pixel=(1.0-Sa)*GetPixelIntensity(composite_image,p) < - (1.0-Da)*GetPixelIntensity(image,q) ? Sa : Da; - break; - } - case IntensityCompositeOp: - { - pixel=GetPixelIntensity(composite_image,p); + pixel=Sa*GetPixelIntensity(source_image,p) < + Da*GetPixelIntensity(image,q) ? Sa : Da; break; } case LightenIntensityCompositeOp: { - pixel=Sa*GetPixelIntensity(composite_image,p) > + pixel=Sa*GetPixelIntensity(source_image,p) > Da*GetPixelIntensity(image,q) ? Sa : Da; break; } case ModulateCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=QuantumRange*Da; break; @@ -1644,13 +1671,14 @@ MagickExport MagickBooleanType CompositeImage(Image *image, break; } } - q[i]=ClampToQuantum(pixel); + q[i]=clamp != MagickFalse ? ClampPixel(pixel) : + ClampToQuantum(pixel); continue; } /* Porter-Duff compositions: Sca: source normalized color multiplied by alpha. - Dca: normalized destination color multiplied by alpha. + Dca: normalized canvas color multiplied by alpha. */ Sca=QuantumScale*Sa*Sc; Dca=QuantumScale*Da*Dc; @@ -1660,13 +1688,15 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case LightenCompositeOp: case ModulusSubtractCompositeOp: { - gamma=1.0-alpha; + gamma=PerceptibleReciprocal(1.0-alpha); break; } default: + { + gamma=PerceptibleReciprocal(alpha); break; + } } - gamma=MagickEpsilonReciprocal(alpha); pixel=Dc; switch (compose) { @@ -1678,32 +1708,36 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case AtopCompositeOp: case SrcAtopCompositeOp: { - pixel=Sc*Sa+Dc*(1.0-Sa); + pixel=QuantumRange*(Sca*Da+Dca*(1.0-Sa)); break; } case BlendCompositeOp: { - pixel=gamma*(source_dissolve*Sa*Sc+destination_dissolve*Da*Dc); + pixel=gamma*(source_dissolve*Sa*Sc+canvas_dissolve*Da*Dc); 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(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - pixel=QuantumScale*GetPixelIntensity(composite_image,p)*Dc; + pixel=QuantumScale*GetPixelIntensity(source_image,p)*Dc; break; } case ChangeMaskCompositeOp: @@ -1718,53 +1752,49 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } case ColorBurnCompositeOp: { - /* - Refer to the March 2009 SVG specification. - */ - if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca-Da) < MagickEpsilon)) + if ((Sca == 0.0) && (Dca == Da)) { - pixel=QuantumRange*gamma*(Sa*Da+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*Da+Dca*(1.0-Sa)); break; } - if (Sca < MagickEpsilon) + if (Sca == 0.0) { - pixel=QuantumRange*gamma*(Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Sa*Da-Sa*MagickMin(Da,(Da-Dca)*Sa/Sca)+ + pixel=QuantumRange*(Sa*Da-Sa*Da*MagickMin(1.0,(1.0-Dca/Da)*Sa/Sca)+ Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } case ColorDodgeCompositeOp: { - if ((fabs(Sca-Sa) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon)) + if ((Sca == Sa) && (Dca == 0.0)) { - pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*(1.0-Da)); break; } - if (fabs(Sca-Sa) < MagickEpsilon) + if (Sca == Sa) { - pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Dca*Sa*Sa/(Sa-Sca)+Sca*(1.0-Da)+Dca* - (1.0-Sa)); + pixel=QuantumRange*(Sa*Da*MagickMin(1.0,Dca/Da*Sa/(Sa-Sca))); break; } case ColorizeCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - if (fabs(QuantumRange*Da-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Da-TransparentAlpha)) < MagickEpsilon) { pixel=Sc; break; } - CompositeHCL(destination_pixel.red,destination_pixel.green, - destination_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); @@ -1778,7 +1808,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image, break; } case CopyAlphaCompositeOp: - case IntensityCompositeOp: { pixel=Dc; break; @@ -1786,28 +1815,29 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case CopyBlackCompositeOp: { if (channel == BlackPixelChannel) - pixel=(double) GetPixelBlack(composite_image,p); + pixel=(MagickRealType) (QuantumRange- + GetPixelBlack(source_image,p)); break; } case CopyBlueCompositeOp: case CopyYellowCompositeOp: { if (channel == BluePixelChannel) - pixel=(double) GetPixelBlue(composite_image,p); + pixel=(MagickRealType) GetPixelBlue(source_image,p); break; } case CopyGreenCompositeOp: case CopyMagentaCompositeOp: { if (channel == GreenPixelChannel) - pixel=(double) GetPixelGreen(composite_image,p); + pixel=(MagickRealType) GetPixelGreen(source_image,p); break; } case CopyRedCompositeOp: case CopyCyanCompositeOp: { if (channel == RedPixelChannel) - pixel=(double) GetPixelRed(composite_image,p); + pixel=(MagickRealType) GetPixelRed(source_image,p); break; } case DarkenCompositeOp: @@ -1817,119 +1847,132 @@ MagickExport MagickBooleanType CompositeImage(Image *image, OR a greyscale version of a binary 'Or' OR the 'Intersection' of pixel sets. */ - if (Sc < Dc) + if ((Sca*Da) < (Dca*Sa)) { - pixel=gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc); + pixel=QuantumRange*(Sca+Dca*(1.0-Sa)); break; } - pixel=gamma*(Da*Dc-Da*Sa*Sc+Sa*Sc); + pixel=QuantumRange*(Dca+Sca*(1.0-Da)); break; } case DarkenIntensityCompositeOp: { - pixel=(1.0-Sa)*GetPixelIntensity(composite_image,p) < - (1.0-Da)*GetPixelIntensity(image,q) ? Sc : Dc; + pixel=Sa*GetPixelIntensity(source_image,p) < + Da*GetPixelIntensity(image,q) ? Sc : Dc; break; } case DifferenceCompositeOp: { - pixel=gamma*(Sa*Sc+Da*Dc-Sa*Da*2.0*MagickMin(Sc,Dc)); + pixel=QuantumRange*(Sca+Dca-2.0*MagickMin(Sca*Da,Dca*Sa)); break; } case DissolveCompositeOp: { pixel=gamma*(source_dissolve*Sa*Sc-source_dissolve*Sa* - destination_dissolve*Da*Dc+destination_dissolve*Da*Dc); + canvas_dissolve*Da*Dc+canvas_dissolve*Da*Dc); break; } case DivideDstCompositeOp: { - if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon)) + if ((fabs((double) Sca) < MagickEpsilon) && + (fabs((double) Dca) < MagickEpsilon)) { - pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } - if (fabs(Dca) < MagickEpsilon) + if (fabs((double) Dca) < MagickEpsilon) { - pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } case DivideSrcCompositeOp: { - if ((fabs(Dca) < MagickEpsilon) && (fabs(Sca) < MagickEpsilon)) + if ((fabs((double) Dca) < MagickEpsilon) && + (fabs((double) Sca) < MagickEpsilon)) { - pixel=QuantumRange*gamma*(Dca*(1.0-Sa)+Sca*(1.0-Da)); + pixel=QuantumRange*(Dca*(1.0-Sa)+Sca*(1.0-Da)); break; } - if (fabs(Sca) < MagickEpsilon) + if (fabs((double) Sca) < MagickEpsilon) { - pixel=QuantumRange*gamma*(Da*Sa+Dca*(1.0-Sa)+Sca*(1.0-Da)); + pixel=QuantumRange*(Da*Sa+Dca*(1.0-Sa)+Sca*(1.0-Da)); break; } - pixel=QuantumRange*gamma*(Dca*Sa*Sa/Sca+Dca*(1.0-Sa)+Sca*(1.0-Da)); + pixel=QuantumRange*(Dca*Sa*Sa/Sca+Dca*(1.0-Sa)+Sca*(1.0-Da)); break; } case DstAtopCompositeOp: { - pixel=Dc*Da+Sc*(1.0-Da); + pixel=QuantumRange*(Dca*Sa+Sca*(1.0-Da)); break; } case DstCompositeOp: case NoCompositeOp: { - pixel=Dc; + pixel=QuantumRange*Dca; break; } case DstInCompositeOp: { - pixel=gamma*(Sa*Dc*Sa); + pixel=QuantumRange*(Dca*Sa); break; } case DstOutCompositeOp: { - pixel=gamma*(Da*Dc*(1.0-Sa)); + pixel=QuantumRange*(Dca*(1.0-Sa)); break; } case DstOverCompositeOp: { - pixel=gamma*(Da*Dc-Da*Sa*Sc+Sa*Sc); + pixel=QuantumRange*(Dca+Sca*(1.0-Da)); break; } case ExclusionCompositeOp: { - pixel=QuantumRange*gamma*(Sca*Da+Dca*Sa-2.0*Sca*Dca+Sca*(1.0-Da)+ - Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*Da+Dca*Sa-2.0*Sca*Dca+Sca*(1.0-Da)+Dca* + (1.0-Sa)); break; } case HardLightCompositeOp: { if ((2.0*Sca) < Sa) { - pixel=QuantumRange*gamma*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca* - (1.0-Sa)); + pixel=QuantumRange*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+ - Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+Dca* + (1.0-Sa)); + break; + } + case HardMixCompositeOp: + { + double + gamma; + + if ((Sa+Da) < 1.0) + gamma=0.0; + else + gamma=1.0; + pixel=(gamma*(1.0-Sca)*(1.0-Dca))+Sa*(1.0-Sca)*Dca+Da*(1.0-Dca)*Sca; break; } case HueCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - if (fabs(QuantumRange*Da-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Da-TransparentAlpha)) < MagickEpsilon) { pixel=Sc; break; } - CompositeHCL(destination_pixel.red,destination_pixel.green, - destination_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); @@ -1945,7 +1988,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case InCompositeOp: case SrcInCompositeOp: { - pixel=gamma*(Da*Sc*Da); + pixel=QuantumRange*(Sca*Da); break; } case LinearBurnCompositeOp: @@ -1956,12 +1999,12 @@ MagickExport MagickBooleanType CompositeImage(Image *image, f(Sc,Dc) = Sc + Dc - 1 */ - pixel=QuantumRange*gamma*(Sca+Dca-Sa*Da); + pixel=QuantumRange*(Sca+Dca-Sa*Da); break; } case LinearDodgeCompositeOp: { - pixel=QuantumRange*gamma*(Sa*Sc+Da*Dc); + pixel=(Sa*Sc+Da*Dc); break; } case LinearLightCompositeOp: @@ -1972,17 +2015,17 @@ MagickExport MagickBooleanType CompositeImage(Image *image, f(Sc,Dc) = Dc + 2*Sc - 1 */ - pixel=QuantumRange*gamma*((Sca-Sa)*Da+Sca+Dca); + pixel=QuantumRange*((Sca-Sa)*Da+Sca+Dca); break; } case LightenCompositeOp: { - if (Sc > Dc) + if ((Sca*Da) > (Dca*Sa)) { - pixel=gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc); + pixel=QuantumRange*(Sca+Dca*(1.0-Sa)); break; } - pixel=gamma*(Da*Dc-Da*Sa*Sc+Sa*Sc); + pixel=QuantumRange*(Dca+Sca*(1.0-Da)); break; } case LightenIntensityCompositeOp: @@ -1992,24 +2035,24 @@ MagickExport MagickBooleanType CompositeImage(Image *image, OR a greyscale version of a binary 'And' OR the 'Union' of pixel sets. */ - pixel=Sa*GetPixelIntensity(composite_image,p) > + pixel=Sa*GetPixelIntensity(source_image,p) > Da*GetPixelIntensity(image,q) ? Sc : Dc; break; } case LuminizeCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - if (fabs(QuantumRange*Da-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Da-TransparentAlpha)) < MagickEpsilon) { pixel=Sc; break; } - CompositeHCL(destination_pixel.red,destination_pixel.green, - destination_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); @@ -2043,9 +2086,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, 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: @@ -2056,11 +2099,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image, case MinusSrcCompositeOp: { /* - Minus source from destination. + Minus source from canvas. f(Sc,Dc) = Sc - Dc */ - pixel=QuantumRange*gamma*(Da*Dc+Sa*Sc-2.0*Sa*Sc*Da); + pixel=QuantumRange*(Da*Dc+Sa*Sc-2.0*Sa*Sc*Da); break; } case ModulateCompositeOp: @@ -2068,19 +2111,19 @@ MagickExport MagickBooleanType CompositeImage(Image *image, ssize_t offset; - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - offset=(ssize_t) (GetPixelIntensity(composite_image,p)-midpoint); + offset=(ssize_t) (GetPixelIntensity(source_image,p)-midpoint); if (offset == 0) { pixel=Dc; break; } - CompositeHCL(destination_pixel.red,destination_pixel.green, - destination_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); @@ -2097,45 +2140,44 @@ MagickExport MagickBooleanType CompositeImage(Image *image, { pixel=Sc+Dc; if (pixel > QuantumRange) - pixel-=(QuantumRange+1.0); - pixel=gamma*(pixel*Sa*Da+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa)); + pixel-=QuantumRange; + pixel=gamma*(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa)); break; } case ModulusSubtractCompositeOp: { pixel=Sc-Dc; if (pixel < 0.0) - pixel+=(QuantumRange+1.0); - pixel=gamma*(pixel*Sa*Da+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa)); + pixel+=QuantumRange; + pixel=gamma*(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa)); break; } case MultiplyCompositeOp: { - pixel=QuantumRange*gamma*(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } case OutCompositeOp: case SrcOutCompositeOp: { - pixel=gamma*(Sa*Sc*(1.0-Da)); + pixel=QuantumRange*(Sca*(1.0-Da)); break; } case OverCompositeOp: case SrcOverCompositeOp: { - pixel=QuantumRange*gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc); + pixel=QuantumRange*(Sca+Dca*(1.0-Sa)); break; } case OverlayCompositeOp: { - if ((2.0*Dca) < Da) + if ((2.0*Dca) <= Da) { - pixel=QuantumRange*gamma*(2.0*Dca*Sca+Dca*(1.0-Sa)+Sca* - (1.0-Da)); + pixel=QuantumRange*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Da*Sa-2.0*(Sa-Sca)*(Da-Dca)+Dca*(1.0-Sa)+ - Sca*(1.0-Da)); + pixel=QuantumRange*(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+Dca* + (1.0-Sa)); break; } case PegtopLightCompositeOp: @@ -2148,13 +2190,13 @@ MagickExport MagickBooleanType CompositeImage(Image *image, http://www.pegtop.net/delphi/articles/blendmodes/softlight.htm. */ - if (fabs(Da) < MagickEpsilon) + if (fabs((double) Da) < MagickEpsilon) { - pixel=QuantumRange*gamma*(Sca); + pixel=QuantumRange*(Sca); break; } - pixel=QuantumRange*gamma*(Dca*Dca*(Sa-2.0*Sca)/Da+Sca*(2.0*Dca+1.0- - Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*Dca*(Sa-2.0*Sca)/Da+Sca*(2.0*Dca+1.0-Da)+ + Dca*(1.0-Sa)); break; } case PinLightCompositeOp: @@ -2167,36 +2209,36 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ if ((Dca*Sa) < (Da*(2.0*Sca-Sa))) { - pixel=QuantumRange*gamma*(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa)); break; } if ((Dca*Sa) > (2.0*Sca*Da)) { - pixel=QuantumRange*gamma*(Sca*Da+Sca+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sca*Da+Sca+Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca); + pixel=QuantumRange*(Sca*(1.0-Da)+Dca); break; } case PlusCompositeOp: { - pixel=gamma*(Sa*Sc+Da*Dc); + pixel=QuantumRange*(Sca+Dca); break; } case SaturateCompositeOp: { - if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) { pixel=Dc; break; } - if (fabs(QuantumRange*Da-TransparentAlpha) < MagickEpsilon) + if (fabs((double) (QuantumRange*Da-TransparentAlpha)) < MagickEpsilon) { pixel=Sc; break; } - CompositeHCL(destination_pixel.red,destination_pixel.green, - destination_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); @@ -2216,38 +2258,35 @@ MagickExport MagickBooleanType CompositeImage(Image *image, f(Sc,Dc) = 1.0-(1.0-Sc)*(1.0-Dc) */ - pixel=QuantumRange*gamma*(Sca+Dca-Sca*Dca); + pixel=QuantumRange*(Sca+Dca-Sca*Dca); break; } case SoftLightCompositeOp: { - /* - Refer to the March 2009 SVG specification. - */ if ((2.0*Sca) < Sa) { - pixel=QuantumRange*gamma*(Dca*(Sa+(2.0*Sca-Sa)*(1.0-(Dca/Da)))+ - Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*(Sa+(2.0*Sca-Sa)*(1.0-(Dca/Da)))+Sca* + (1.0-Da)+Dca*(1.0-Sa)); break; } if (((2.0*Sca) > Sa) && ((4.0*Dca) <= Da)) { - pixel=QuantumRange*gamma*(Dca*Sa+Da*(2.0*Sca-Sa)*(4.0*(Dca/Da)* - (4.0*(Dca/Da)+1.0)*((Dca/Da)-1.0)+7.0*(Dca/Da))+Sca*(1.0-Da)+ - Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*Sa+Da*(2.0*Sca-Sa)*(4.0*(Dca/Da)*(4.0* + (Dca/Da)+1.0)*((Dca/Da)-1.0)+7.0*(Dca/Da))+Sca*(1.0-Da)+Dca* + (1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Dca*Sa+Da*(2.0*Sca-Sa)*(pow((Dca/Da),0.5)- - (Dca/Da))+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*Sa+Da*(2.0*Sca-Sa)*(pow((Dca/Da),0.5)-(Dca/ + Da))+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } case ThresholdCompositeOp: { - double + MagickRealType delta; delta=Sc-Dc; - if ((double) fabs((double) (2.0*delta)) < threshold) + if ((MagickRealType) fabs((double) (2.0*delta)) < threshold) { pixel=gamma*Dc; break; @@ -2263,24 +2302,25 @@ MagickExport MagickBooleanType CompositeImage(Image *image, f(Sc,Dc) = (2*Sc < 1) ? 1-(1-Dc)/(2*Sc) : Dc/(2*(1-Sc)) */ - if ((fabs(Sa) < MagickEpsilon) || (fabs(Sca-Sa) < MagickEpsilon)) + if ((fabs((double) Sa) < MagickEpsilon) || + (fabs((double) (Sca-Sa)) < MagickEpsilon)) { - pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } if ((2.0*Sca) <= Sa) { - pixel=QuantumRange*gamma*(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca* - (1.0-Da)+Dca*(1.0-Sa)); + pixel=QuantumRange*(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca*(1.0-Da)+ + Dca*(1.0-Sa)); break; } - pixel=QuantumRange*gamma*(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+ - Dca*(1.0-Sa)); + pixel=QuantumRange*(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+Dca* + (1.0-Sa)); break; } case XorCompositeOp: { - pixel=QuantumRange*gamma*(Sc*Sa*(1.0-Da)+Dc*Da*(1.0-Sa)); + pixel=QuantumRange*(Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } default: @@ -2289,11 +2329,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image, break; } } - q[i]=ClampToQuantum(pixel); + q[i]=clamp != MagickFalse ? ClampPixel(pixel) : ClampToQuantum(pixel); } - p+=GetPixelChannels(composite_image); - channels=GetPixelChannels(composite_image); - if (p >= (pixels+channels*composite_image->columns)) + p+=GetPixelChannels(source_image); + channels=GetPixelChannels(source_image); + if (p >= (pixels+channels*source_image->columns)) p=pixels; q+=GetPixelChannels(image); } @@ -2313,14 +2353,12 @@ MagickExport MagickBooleanType CompositeImage(Image *image, status=MagickFalse; } } - composite_view=DestroyCacheView(composite_view); + source_view=DestroyCacheView(source_view); image_view=DestroyCacheView(image_view); - if (destination_image != (Image * ) NULL) - destination_image=DestroyImage(destination_image); + if (canvas_image != (Image * ) NULL) + canvas_image=DestroyImage(canvas_image); else - composite_image=DestroyImage(composite_image); - if (status != MagickFalse) - (void) ClampImage(image,exception); + source_image=DestroyImage(source_image); return(status); } @@ -2384,16 +2422,13 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, exception); status=MagickTrue; if ((image->compose != CopyCompositeOp) && - ((image->compose != OverCompositeOp) || (image->matte != MagickFalse) || - (texture_image->matte != MagickFalse))) + ((image->compose != OverCompositeOp) || + (image->alpha_trait != UndefinedPixelTrait) || + (texture_image->alpha_trait != UndefinedPixelTrait))) { /* Tile texture onto the image background. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(status) \ - dynamic_number_threads(image,image->columns,image->rows,1) -#endif for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows) { register ssize_t @@ -2420,11 +2455,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TextureImage) -#endif - proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) - y,image->rows); + proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y, + image->rows); if (proceed == MagickFalse) status=MagickFalse; } @@ -2441,8 +2473,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, texture_view=AcquireVirtualCacheView(texture_image,exception); image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(status) \ - dynamic_number_threads(image,image->columns,image->rows,1) + #pragma omp parallel for schedule(static,4) shared(status) \ + magick_threads(texture_image,image,1,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2487,7 +2519,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelReadMask(image,q) == 0) { p+=GetPixelChannels(texture_image); q+=GetPixelChannels(image); @@ -2495,16 +2527,10 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, } for (i=0; i < (ssize_t) GetPixelChannels(texture_image); i++) { - PixelChannel - channel; - - PixelTrait - texture_traits, - traits; - - channel=GetPixelChannelMapChannel(texture_image,i); - texture_traits=GetPixelChannelMapTraits(texture_image,channel); - traits=GetPixelChannelMapTraits(image,channel); + PixelChannel channel=GetPixelChannelChannel(texture_image,i); + PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait texture_traits=GetPixelChannelTraits(texture_image, + channel); if ((traits == UndefinedPixelTrait) || (texture_traits == UndefinedPixelTrait)) continue; @@ -2522,9 +2548,6 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TextureImage) -#endif proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y, image->rows); if (proceed == MagickFalse)