X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=MagickCore%2Fcomposite.c;h=d4dd47e5a65ea88412b9b46566cc4c69fce5d5b0;hb=b3f97ae45019a91b30792a6fa42d81a2689a7025;hp=9c8a5ed62479916861ed58505d87cc294b50f244;hpb=450bd716ed3b9186dd10f9e60f630a3d9eeea2a4;p=imagemagick diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 9c8a5ed62..d4dd47e5a 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -96,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 @@ -137,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) @@ -285,16 +285,20 @@ static void CompositeHCL(const MagickRealType red,const MagickRealType green, } 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 @@ -308,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) \ - magick_threads(composite_image,image,image->rows,1) + magick_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -337,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; } /* @@ -345,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; @@ -356,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) @@ -384,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]; @@ -396,23 +404,23 @@ static MagickBooleanType CompositeOverImage(Image *image, /* Virtual composite: Sc: source color. - Dc: destination color. + Dc: canvas color. */ 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=GetPixelChannelChannel(image,i); PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait composite_traits=GetPixelChannelTraits(composite_image, + PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; q[i]=source[channel]; } @@ -422,34 +430,34 @@ static MagickBooleanType CompositeOverImage(Image *image, /* Authentic composite: Sa: normalized source alpha. - Da: normalized destination alpha. + Da: normalized canvas alpha. */ - if (GetPixelReadMask(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); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel channel=GetPixelChannelChannel(image,i); PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait composite_traits=GetPixelChannelTraits(composite_image, + PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; if ((traits & CopyPixelTrait) != 0) { /* Copy channel. */ - q[i]=GetPixelChannel(composite_image,channel,p); + q[i]=GetPixelChannel(source_image,channel,p); continue; } if (channel == AlphaPixelChannel) @@ -457,22 +465,26 @@ static MagickBooleanType CompositeOverImage(Image *image, /* 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; } /* Sc: source color. - Dc: destination color. + Dc: canvas color. */ - Sc=(MagickRealType) GetPixelChannel(composite_image,channel,p); + Sc=(MagickRealType) GetPixelChannel(source_image,channel,p); 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(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); } @@ -492,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); } @@ -505,17 +517,21 @@ 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 @@ -523,7 +539,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickRealType amount, - destination_dissolve, + canvas_dissolve, midpoint, percent_luma, percent_chroma, @@ -544,26 +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); if (IsGrayColorspace(image->colorspace) != MagickFalse) (void) SetImageColorspace(image,sRGBColorspace,exception); - (void) SetImageColorspace(composite_image,image->colorspace,exception); + (void) SetImageColorspace(source_image,image->colorspace,exception); if ((image->alpha_trait != UndefinedPixelTrait) && - (composite_image->alpha_trait == UndefinedPixelTrait)) - (void) SetImageAlphaChannel(composite_image,SetAlphaChannel,exception); -if (0) + (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; @@ -574,18 +593,18 @@ if (0) { 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) \ - magick_threads(composite_image,image,composite_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; @@ -601,38 +620,38 @@ if (0) 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 (GetPixelReadMask(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=GetPixelChannelChannel(composite_image,i); - PixelTrait composite_traits=GetPixelChannelTraits(composite_image, + 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); @@ -652,27 +671,27 @@ if (0) 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 IntensityCompositeOp: { 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) \ - magick_threads(composite_image,image,composite_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; @@ -688,26 +707,27 @@ if (0) 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++) { - if (GetPixelReadMask(composite_image,p) == 0) + if (GetPixelReadMask(source_image,p) == 0) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); continue; } - SetPixelAlpha(image,ClampToQuantum(GetPixelIntensity(composite_image, - p)),q); - p+=GetPixelChannels(composite_image); + 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); @@ -727,16 +747,16 @@ if (0) 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: { /* - 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->alpha_trait == UndefinedPixelTrait) @@ -746,8 +766,8 @@ if (0) case BlurCompositeOp: { CacheView - *composite_view, - *destination_view; + *canvas_view, + *source_view; const char *value; @@ -773,11 +793,11 @@ if (0) 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); } /* @@ -792,8 +812,8 @@ if (0) { (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, "InvalidSetting","'%s' '%s'","compose:args",value); - composite_image=DestroyImage(composite_image); - destination_image=DestroyImage(destination_image); + source_image=DestroyImage(source_image); + canvas_image=DestroyImage(canvas_image); return(MagickFalse); } /* @@ -847,9 +867,9 @@ if (0) /* 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; @@ -865,17 +885,17 @@ if (0) 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((double) angle_range) > MagickEpsilon) @@ -884,7 +904,7 @@ if (0) 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)); @@ -898,45 +918,45 @@ if (0) 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); - SetPixelViaPixelInfo(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; - MagickRealType horizontal_scale, vertical_scale; + PixelInfo + pixel; + PointInfo center, offset; @@ -946,11 +966,11 @@ if (0) 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); @@ -958,18 +978,17 @@ if (0) 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=(MagickRealType) (composite_image->columns-1.0)/ - 2.0; - vertical_scale=(MagickRealType) (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=(MagickRealType) (image->columns-1.0)/2.0; - vertical_scale=(MagickRealType) (image->rows-1.0)/2.0; + horizontal_scale=(MagickRealType) (image->columns-1)/2.0; + vertical_scale=(MagickRealType) (image->rows-1)/2.0; } } else @@ -980,13 +999,13 @@ if (0) { 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) @@ -1005,27 +1024,26 @@ if (0) if (compose == DistortCompositeOp) { if ((flags & XValue) == 0) - if ((flags & AspectValue) == 0) - center.x=(MagickRealType) (x_offset+(composite_image->columns-1)/ - 2.0); + if ((flags & AspectValue) != 0) + center.x=(MagickRealType) ((image->columns-1)/2.0); else - center.x=(MagickRealType) ((image->columns-1)/2); + center.x=(MagickRealType) (x_offset+(source_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; + else + center.x=(MagickRealType) (x_offset+geometry_info.xi); if ((flags & YValue) == 0) - if ((flags & AspectValue) == 0) - center.y=(MagickRealType) (y_offset+(composite_image->rows-1)/ - 2.0); + if ((flags & AspectValue) != 0) + center.y=(MagickRealType) ((image->rows-1)/2.0); else - center.y=(MagickRealType) ((image->rows-1)/2); + center.y=(MagickRealType) (y_offset+(source_image->rows-1)/2.0); else - if ((flags & AspectValue) == 0) - center.y=(MagickRealType) 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, @@ -1033,9 +1051,9 @@ if (0) */ 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; @@ -1051,27 +1069,27 @@ if (0) 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=(double) (horizontal_scale*(GetPixelRed(composite_image,p)- + 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=(double) (vertical_scale*(GetPixelGreen(composite_image,p)- + 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); @@ -1081,21 +1099,21 @@ if (0) /* Mask with the 'invalid pixel mask' in alpha channel. */ - pixel.alpha=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale* - pixel.alpha)*(1.0-QuantumScale*GetPixelAlpha(composite_image,p))); - SetPixelViaPixelInfo(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: @@ -1111,18 +1129,18 @@ if (0) { 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; + canvas_dissolve=geometry_info.sigma/100.0; + if ((canvas_dissolve-MagickEpsilon) < 0.0) + canvas_dissolve=0.0; } break; } @@ -1136,9 +1154,9 @@ if (0) { 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; } @@ -1208,11 +1226,11 @@ if (0) status=MagickTrue; progress=0; midpoint=((MagickRealType) QuantumRange+1.0)/2; - 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(progress,status) \ - magick_threads(composite_image,image,image->rows,1) + magick_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1221,14 +1239,14 @@ if (0) MagickRealType blue, - luma, + chroma, green, hue, - red, - chroma; + luma, + red; PixelInfo - destination_pixel, + canvas_pixel, source_pixel; register const Quantum @@ -1246,7 +1264,7 @@ if (0) { if (y < y_offset) continue; - if ((y-y_offset) >= (ssize_t) composite_image->rows) + if ((y-y_offset) >= (ssize_t) source_image->rows) continue; } /* @@ -1254,10 +1272,10 @@ if (0) */ 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; @@ -1265,7 +1283,7 @@ if (0) } 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) @@ -1276,8 +1294,8 @@ if (0) 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 @@ -1305,11 +1323,11 @@ if (0) 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]; @@ -1317,10 +1335,10 @@ if (0) /* Virtual composite: Sc: source color. - Dc: destination color. + Dc: canvas color. */ - (void) GetOneVirtualPixel(composite_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); @@ -1333,10 +1351,10 @@ if (0) PixelChannel channel=GetPixelChannelChannel(image,i); PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait composite_traits=GetPixelChannelTraits(composite_image, + PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) || - (composite_traits == UndefinedPixelTrait)) + (source_traits == UndefinedPixelTrait)) continue; switch (compose) { @@ -1371,8 +1389,7 @@ if (0) case DissolveCompositeOp: { if (channel == AlphaPixelChannel) - pixel=destination_dissolve*GetPixelAlpha(composite_image, - source); + pixel=canvas_dissolve*GetPixelAlpha(source_image,source); else pixel=(MagickRealType) source[channel]; break; @@ -1383,7 +1400,8 @@ if (0) break; } } - q[i]=ClampToQuantum(pixel); + q[i]=clamp != MagickFalse ? ClampPixel(pixel) : + ClampToQuantum(pixel); } q+=GetPixelChannels(image); continue; @@ -1391,15 +1409,15 @@ if (0) /* 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: @@ -1441,8 +1459,8 @@ if (0) } 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: @@ -1486,7 +1504,7 @@ if (0) } if (GetPixelReadMask(image,q) == 0) { - p+=GetPixelChannels(composite_image); + p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); continue; } @@ -1498,8 +1516,8 @@ if (0) 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: @@ -1513,27 +1531,26 @@ if (0) PixelChannel channel=GetPixelChannelChannel(image,i); PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait composite_traits=GetPixelChannelTraits(composite_image, - channel); + PixelTrait source_traits=GetPixelChannelTraits(source_image,channel); if (traits == UndefinedPixelTrait) continue; - if ((composite_traits == UndefinedPixelTrait) && + if ((source_traits == UndefinedPixelTrait) && (((compose != CopyAlphaCompositeOp) && (compose != ChangeMaskCompositeOp)) || (channel != AlphaPixelChannel))) continue; /* Sc: source color. - Dc: destination color. + Dc: canvas color. */ - Sc=(MagickRealType) GetPixelChannel(composite_image,channel,p); + Sc=(MagickRealType) GetPixelChannel(source_image,channel,p); Dc=(MagickRealType) q[i]; if ((traits & CopyPixelTrait) != 0) { /* Copy channel. */ - q[i]=ClampToQuantum(Sc); + q[i]=Sc; continue; } if (channel == AlphaPixelChannel) @@ -1573,7 +1590,7 @@ if (0) pixel=(MagickRealType) TransparentAlpha; break; } - equivalent=IsFuzzyEquivalencePixel(composite_image,p,image,q); + equivalent=IsFuzzyEquivalencePixel(source_image,p,image,q); if (equivalent != MagickFalse) pixel=(MagickRealType) TransparentAlpha; else @@ -1610,8 +1627,8 @@ if (0) } case CopyAlphaCompositeOp: { - if (composite_traits == UndefinedPixelTrait) - pixel=GetPixelIntensity(composite_image,p); + if ((source_traits & BlendPixelTrait) == 0) + pixel=GetPixelIntensity(source_image,p); else pixel=QuantumRange*Sa; break; @@ -1628,13 +1645,13 @@ if (0) } case DarkenIntensityCompositeOp: { - pixel=Sa*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; } @@ -1654,13 +1671,14 @@ if (0) 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; @@ -1670,13 +1688,15 @@ if (0) 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) { @@ -1693,12 +1713,10 @@ if (0) } 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: @@ -1706,6 +1724,12 @@ if (0) pixel=QuantumRange*Sca; break; } + case DisplaceCompositeOp: + case DistortCompositeOp: + { + pixel=Sc; + break; + } case BumpmapCompositeOp: { if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon) @@ -1713,7 +1737,7 @@ if (0) pixel=Dc; break; } - pixel=QuantumScale*GetPixelIntensity(composite_image,p)*Dc; + pixel=QuantumScale*GetPixelIntensity(source_image,p)*Dc; break; } case ChangeMaskCompositeOp: @@ -1769,8 +1793,8 @@ if (0) 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); @@ -1792,28 +1816,28 @@ if (0) { if (channel == BlackPixelChannel) pixel=(MagickRealType) (QuantumRange- - GetPixelBlack(composite_image,p)); + GetPixelBlack(source_image,p)); break; } case CopyBlueCompositeOp: case CopyYellowCompositeOp: { if (channel == BluePixelChannel) - pixel=(MagickRealType) GetPixelBlue(composite_image,p); + pixel=(MagickRealType) GetPixelBlue(source_image,p); break; } case CopyGreenCompositeOp: case CopyMagentaCompositeOp: { if (channel == GreenPixelChannel) - pixel=(MagickRealType) GetPixelGreen(composite_image,p); + pixel=(MagickRealType) GetPixelGreen(source_image,p); break; } case CopyRedCompositeOp: case CopyCyanCompositeOp: { if (channel == RedPixelChannel) - pixel=(MagickRealType) GetPixelRed(composite_image,p); + pixel=(MagickRealType) GetPixelRed(source_image,p); break; } case DarkenCompositeOp: @@ -1833,7 +1857,7 @@ if (0) } case DarkenIntensityCompositeOp: { - pixel=Sa*GetPixelIntensity(composite_image,p) < + pixel=Sa*GetPixelIntensity(source_image,p) < Da*GetPixelIntensity(image,q) ? Sc : Dc; break; } @@ -1845,7 +1869,7 @@ if (0) 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: @@ -1947,8 +1971,8 @@ if (0) 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); @@ -2011,7 +2035,7 @@ if (0) 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; } @@ -2027,8 +2051,8 @@ if (0) 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); @@ -2062,9 +2086,9 @@ if (0) 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: @@ -2075,7 +2099,7 @@ if (0) case MinusSrcCompositeOp: { /* - Minus source from destination. + Minus source from canvas. f(Sc,Dc) = Sc - Dc */ @@ -2092,14 +2116,14 @@ if (0) 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); @@ -2213,8 +2237,8 @@ if (0) 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); @@ -2305,11 +2329,11 @@ if (0) break; } } - q[i]=ClampPixel(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); } @@ -2329,12 +2353,12 @@ if (0) 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); + source_image=DestroyImage(source_image); return(status); } @@ -2431,8 +2455,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, MagickBooleanType proceed; - proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) - y,image->rows); + proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y, + image->rows); if (proceed == MagickFalse) status=MagickFalse; }