(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 15f5b2717dcfc4ca3c375c518d9eb61fbbedd75d..18f9e412aa201ff3e5fa2042bf738af3bb59e251 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1844,7 +1844,7 @@ static MagickBooleanType RenderPostscript(Image *image,
           break;
       }
       annotate_view=DestroyCacheView(annotate_view);
-      (void) CompositeImage(image,annotate_image,OverCompositeOp,MagickFalse,
+      (void) CompositeImage(image,annotate_image,OverCompositeOp,MagickTrue,
         (ssize_t) ceil(offset->x-0.5),(ssize_t) ceil(offset->y-(metrics->ascent+
         metrics->descent)-0.5),exception);
     }

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 1f5b74c522068fcbc8aec1c3e7fbb7c773d4cc86..50a832b52b939149f2cb5d87738603082e2fa812 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -264,7 +264,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
   reconstruct_view=DestroyCacheView(reconstruct_view);
   image_view=DestroyCacheView(image_view);
   (void) CompositeImage(difference_image,highlight_image,image->compose,
-    MagickFalse,0,0,exception);
+    MagickTrue,0,0,exception);
   highlight_image=DestroyImage(highlight_image);
   if (status == MagickFalse)
     difference_image=DestroyImage(difference_image);

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index ceabced6f5479669835b964f78f9893769b08aba..6092acecf9ed0852cc8b5442f53f98070f2f98a2 100644 (file)
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -593,7 +593,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
         frame_info->inner_bevel);
       y=(ssize_t) (frame_info->outer_bevel+(frame_info->y-bevel_width)+
         frame_info->inner_bevel);
-      (void) CompositeImage(frame_image,image,compose,MagickFalse,x,y,
+      (void) CompositeImage(frame_image,image,compose,MagickTrue,x,y,
         exception);
     }
   return(frame_image);

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 12067cfc9141aba3ea8558a4c244ad55337361c0..e1cd6afab397db8dcb6e3bd348e77aa0729b7151 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -4355,7 +4355,7 @@ static MagickBooleanType XCompositeImage(Display *display,
   /*
     Composite image with X Image window.
   */
-  (void) CompositeImage(image,composite_image,compose,MagickFalse,
+  (void) CompositeImage(image,composite_image,compose,MagickTrue,
     composite_info.x,composite_info.y,exception);
   composite_image=DestroyImage(composite_image);
   XSetCursorState(display,windows,MagickFalse);
@@ -10928,7 +10928,7 @@ static MagickBooleanType XPasteImage(Display *display,
   /*
     Paste image with X Image window.
   */
-  (void) CompositeImage(image,paste_image,compose,MagickFalse,paste_info.x,
+  (void) CompositeImage(image,paste_image,compose,MagickTrue,paste_info.x,
     paste_info.y,exception);
   paste_image=DestroyImage(paste_image);
   XSetCursorState(display,windows,MagickFalse);
@@ -11663,7 +11663,7 @@ static MagickBooleanType XROIImage(Display *display,
                 SaveToUndoBufferCommand,image,exception);
               windows->image.orphan=MagickFalse;
               (void) CompositeImage(*image,roi_image,CopyCompositeOp,
-                MagickFalse,crop_info.x,crop_info.y,exception);
+                MagickTrue,crop_info.x,crop_info.y,exception);
               roi_image=DestroyImage(roi_image);
               (void) SetImageProgressMonitor(*image,progress_monitor,
                 (*image)->client_data);

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 410f4575e4b34454550eb95d53b6a2192c15c30d..c82e9b4f270aee349655c0d47c1427a2bc804cbf 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1557,7 +1557,7 @@ MagickExport Image *DistortResizeImage(const Image *image,
       (void) SetImageAlphaChannel(resize_alpha,DeactivateAlphaChannel,
         exception);
       (void) CompositeImage(resize_image,resize_alpha,CopyAlphaCompositeOp,
-        MagickFalse,0,0,exception);
+        MagickTrue,0,0,exception);
       resize_alpha=DestroyImage(resize_alpha);
     }
   (void) SetImageVirtualPixelMethod(resize_image,vp_save,exception);

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 5285fefb427f17e5ac18e4bc6ff02f71f7933fc2..ce1a91f5610325bd0d34e3f4488846b1d6b832e0 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4498,7 +4498,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
         (void) DrawAffineImage(image,composite_image,&affine,exception);
       else
         (void) CompositeImage(image,composite_image,draw_info->compose,
-          MagickFalse,geometry.x,geometry.y,exception);
+          MagickTrue,geometry.x,geometry.y,exception);
       composite_image=DestroyImage(composite_image);
       break;
     }

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 4fe4354707d7883f50c66dd83f881f5bca9505f5..26b4f603ab34425df834c4734e47a1c85fe2cc7d 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -4018,12 +4018,12 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
     }
   picture_image->background_color=image->border_color;
   (void) SetImageBackgroundColor(picture_image,exception);
-  (void) CompositeImage(picture_image,image,OverCompositeOp,MagickFalse,quantum,
+  (void) CompositeImage(picture_image,image,OverCompositeOp,MagickTrue,quantum,
     quantum,exception);
   if (caption_image != (Image *) NULL)
     {
       (void) CompositeImage(picture_image,caption_image,OverCompositeOp,
-        MagickFalse,quantum,(ssize_t) (image->rows+3*quantum/2),exception);
+        MagickTrue,quantum,(ssize_t) (image->rows+3*quantum/2),exception);
       caption_image=DestroyImage(caption_image);
     }
   (void) QueryColorCompliance("none",AllCompliance,
@@ -4062,7 +4062,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
     }
   polaroid_image=flop_image;
   (void) CompositeImage(polaroid_image,picture_image,OverCompositeOp,
-    MagickFalse,(ssize_t) (-0.01*picture_image->columns/2.0),0L,exception);
+    MagickTrue,(ssize_t) (-0.01*picture_image->columns/2.0),0L,exception);
   picture_image=DestroyImage(picture_image);
   (void) QueryColorCompliance("none",AllCompliance,
     &polaroid_image->background_color,exception);
@@ -4519,7 +4519,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       return((Image *) NULL);
     }
   (void) CompositeImage(sketch_image,dodge_image,ColorDodgeCompositeOp,
-    MagickFalse,0,0,exception);
+    MagickTrue,0,0,exception);
   dodge_image=DestroyImage(dodge_image);
   blend_image=CloneImage(image,0,0,MagickTrue,exception);
   if (blend_image == (Image *) NULL)
@@ -4528,7 +4528,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       return((Image *) NULL);
     }
   (void) SetImageArtifact(blend_image,"compose:args","20x80");
-  (void) CompositeImage(sketch_image,blend_image,BlendCompositeOp,MagickFalse,
+  (void) CompositeImage(sketch_image,blend_image,BlendCompositeOp,MagickTrue,
     0,0,exception);
   blend_image=DestroyImage(blend_image);
   return(sketch_image);
@@ -5522,8 +5522,8 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
       return((Image *) NULL);
     }
   blur_image->matte=MagickFalse;
-  (void) CompositeImage(canvas_image,blur_image,IntensityCompositeOp,
-    MagickFalse,0,0,exception);
+  (void) CompositeImage(canvas_image,blur_image,IntensityCompositeOp,MagickTrue,
+    0,0,exception);
   blur_image=DestroyImage(blur_image);
   vignette_image=MergeImageLayers(canvas_image,FlattenLayer,exception);
   canvas_image=DestroyImage(canvas_image);

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 8e92b599d39f0554084ebd30be63f407c8e05229..c36574f165a5fcee90befe86d0bbf4a01995f3bc 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2196,7 +2196,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       /*
         Copy pixel intensity to the alpha channel.
       */
-      status=CompositeImage(image,image,IntensityCompositeOp,MagickFalse,0,0,
+      status=CompositeImage(image,image,IntensityCompositeOp,MagickTrue,0,0,
         exception);
       if (alpha_type == ShapeAlphaChannel)
         (void) LevelImageColors(image,&image->background_color,
@@ -2210,7 +2210,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
     }
     case ExtractAlphaChannel:
     {
-      status=CompositeImage(image,image,AlphaCompositeOp,MagickFalse,0,0,
+      status=CompositeImage(image,image,AlphaCompositeOp,MagickTrue,0,0,
         exception);
       image->matte=MagickFalse;
       break;
@@ -3608,8 +3608,8 @@ MagickExport Image *SmushImages(const Image *images,
         x_offset-=SmushXGap(smush_image,image,offset,exception);
         y_offset-=geometry.y;
       }
-    status=CompositeImage(smush_image,image,OverCompositeOp,MagickFalse,
-      x_offset,y_offset,exception);
+    status=CompositeImage(smush_image,image,OverCompositeOp,MagickTrue,x_offset,
+      y_offset,exception);
     proceed=SetImageProgress(image,SmushImageTag,n,number_images);
     if (proceed == MagickFalse)
       break;

diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index defd88d855aa188e333f64c8172092bc3c7b3472..ce9df4008987e35a71e241ec3aea4b9c2fc8c216 100644 (file)
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -276,7 +276,7 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception)
     Coalesce rest of the images.
   */
   dispose_image=CloneImage(coalesce_image,0,0,MagickTrue,exception);
-  (void) CompositeImage(coalesce_image,next,CopyCompositeOp,MagickFalse,
+  (void) CompositeImage(coalesce_image,next,CopyCompositeOp,MagickTrue,
     next->page.x,next->page.y,exception);
   next=GetNextImageInList(next);
   for ( ; next != (Image *) NULL; next=GetNextImageInList(next))
@@ -328,7 +328,7 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception)
     previous=coalesce_image;
     coalesce_image=GetNextImageInList(coalesce_image);
     (void) CompositeImage(coalesce_image,next,next->matte != MagickFalse ?
-      OverCompositeOp : CopyCompositeOp,MagickFalse,next->page.x,next->page.y,
+      OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y,
       exception);
     (void) CloneImageProfiles(coalesce_image,next);
     (void) CloneImageProperties(coalesce_image,next);
@@ -423,7 +423,7 @@ MagickExport Image *DisposeImages(const Image *images,ExceptionInfo *exception)
         return((Image *) NULL);
       }
     (void) CompositeImage(current_image,next,next->matte != MagickFalse ?
-      OverCompositeOp : CopyCompositeOp,MagickFalse,next->page.x,next->page.y,
+      OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y,
       exception);
     /*
       Handle Background dispose: image is displayed for the delay period.
@@ -794,7 +794,7 @@ MagickExport Image *CompareImagesLayers(const Image *image,
   image_a->page=next->page;
   image_a->page.x=0;
   image_a->page.y=0;
-  (void) CompositeImage(image_a,next,CopyCompositeOp,MagickFalse,next->page.x,
+  (void) CompositeImage(image_a,next,CopyCompositeOp,MagickTrue,next->page.x,
     next->page.y,exception);
   /*
     Compute the bounding box of changes for the later images
@@ -810,7 +810,7 @@ MagickExport Image *CompareImagesLayers(const Image *image,
         bounds=(RectangleInfo *) RelinquishMagickMemory(bounds);
         return((Image *) NULL);
       }
-    (void) CompositeImage(image_a,next,CopyCompositeOp,MagickFalse,next->page.x,
+    (void) CompositeImage(image_a,next,CopyCompositeOp,MagickTrue,next->page.x,
       next->page.y,exception);
     bounds[i]=CompareImagesBounds(image_b,image_a,method,exception);
 
@@ -1499,7 +1499,7 @@ MagickExport void OptimizeImageTransparency(const Image *image,
         return;
       }
     (void) CompositeImage(current_image,next,next->matte != MagickFalse ?
-      OverCompositeOp : CopyCompositeOp,MagickFalse,next->page.x,next->page.y,
+      OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y,
       exception);
     /*
       At this point the image would be displayed, for the delay period
@@ -1543,7 +1543,7 @@ MagickExport void OptimizeImageTransparency(const Image *image,
     next=GetNextImageInList(next);
     if (next != (Image *) NULL) {
       (void) CompositeImage(next,dispose_image,ChangeMaskCompositeOp,
-        MagickFalse,-(next->page.x),-(next->page.y),exception);
+        MagickTrue,-(next->page.x),-(next->page.y),exception);
     }
   }
   dispose_image=DestroyImage(dispose_image);
@@ -1758,7 +1758,7 @@ static inline void CompositeCanvas(Image *destination,
 {
   x_offset+=source->page.x-destination->page.x;
   y_offset+=source->page.y-destination->page.y;
-  (void) CompositeImage(destination,source,compose,MagickFalse,x_offset,
+  (void) CompositeImage(destination,source,compose,MagickTrue,x_offset,
     y_offset,exception);
 }
 
@@ -2032,7 +2032,7 @@ MagickExport Image *MergeImageLayers(Image *image,const ImageLayerMethod method,
   number_images=GetImageListLength(image);
   for (scene=0; scene < (ssize_t) number_images; scene++)
   {
-    (void) CompositeImage(canvas,image,image->compose,MagickFalse,image->page.x-
+    (void) CompositeImage(canvas,image,image->compose,MagicTrue,image->page.x-
       canvas->page.x,image->page.y-canvas->page.y,exception);
     proceed=SetImageProgress(image,MergeLayersTag,(MagickOffsetType) scene,
       number_images);

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index cd622049592fe85da23beeddc8cf6571571ed206..900e300bf0144f11c44becb83f4e2a605178494f 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -824,12 +824,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
               if (shadow_image != (Image *) NULL)
                 {
                   (void) CompositeImage(shadow_image,image,OverCompositeOp,
-                    MagickFalse,0,0,exception);
+                    MagickTrue,0,0,exception);
                   image=DestroyImage(image);
                   image=shadow_image;
                 }
           }
-          (void) CompositeImage(montage,image,image->compose,MagickFalse,
+          (void) CompositeImage(montage,image,image->compose,MagickTrue,
             x_offset+x,y_offset+y,exception);
           value=GetImageProperty(image,"label",exception);
           if (value != (const char *) NULL)

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 55ba9b6b94a0efe3c63a412f9c5c9914877a1678..56efa029acbf5a2be0884cbaf451a6cdafed531e 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -3877,7 +3877,7 @@ MagickPrivate Image *MorphologyApply(const Image *image,
         (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel,
           exception);
         (void) CompositeImage(rslt_image,image,CopyAlphaCompositeOp,
-          MagickFalse,0,0,exception);
+          MagickTrue,0,0,exception);
         (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel,
           exception);
       }
@@ -4104,7 +4104,7 @@ MagickPrivate Image *MorphologyApply(const Image *image,
               "\n%s: Difference with original image",CommandOptionToMnemonic(
               MagickMorphologyOptions, method) );
           (void) CompositeImage(curr_image,image,DifferenceCompositeOp,
-            MagickFalse,0,0,exception);
+            MagickTrue,0,0,exception);
           break;
         case EdgeMorphology:
           if ( IfTrue(verbose) )
@@ -4112,7 +4112,7 @@ MagickPrivate Image *MorphologyApply(const Image *image,
               "\n%s: Difference of Dilate and Erode",CommandOptionToMnemonic(
               MagickMorphologyOptions, method) );
           (void) CompositeImage(curr_image,save_image,DifferenceCompositeOp,
-            MagickFalse,0,0,exception);
+            MagickTrue,0,0,exception);
           save_image = DestroyImage(save_image); /* finished with save image */
           break;
         default:
@@ -4148,7 +4148,7 @@ MagickPrivate Image *MorphologyApply(const Image *image,
           if ( IfTrue(verbose) )
             (void) FormatLocaleFile(stderr, " (compose \"%s\")",
               CommandOptionToMnemonic(MagickComposeOptions, rslt_compose) );
-          (void) CompositeImage(rslt_image,curr_image,rslt_compose,MagickFalse,
+          (void) CompositeImage(rslt_image,curr_image,rslt_compose,MagickTrue,
             0,0,exception);
           curr_image = DestroyImage(curr_image);
           curr_image = (Image *) image;  /* continue with original image */

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 0546abc5aa13791dbf8dd11d682eed929f303353..84ebbd94b9be38dbddb8db63591b37cfad8561c2 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -1083,7 +1083,7 @@ MagickExport Image *ExtentImage(const Image *image,
   if (extent_image->background_color.alpha != OpaqueAlpha)
     extent_image->matte=MagickTrue;
   (void) SetImageBackgroundColor(extent_image,exception);
-  (void) CompositeImage(extent_image,image,image->compose,MagickFalse,
+  (void) CompositeImage(extent_image,image,image->compose,MagickTrue,
     -geometry->x,-geometry->y,exception);
   return(extent_image);
 }

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 733469bd4c7ea27ea031e95a349ccfc1d5949322..fb55ead3f407240d997c6781f3c6fa1bee70d8d5 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -698,7 +698,7 @@ MagickPrivate MagickBooleanType XAnnotateImage(Display *display,
   matte=image->matte;
   (void) CompositeImage(image,annotate_image,
     annotate_image->matte != MagickFalse ? OverCompositeOp : CopyCompositeOp,
-    MagickFalse,(ssize_t) x,(ssize_t) y,exception);
+    MagickTrue,(ssize_t) x,(ssize_t) y,exception);
   image->matte=matte;
   annotate_image=DestroyImage(annotate_image);
   return(MagickTrue);
@@ -2635,12 +2635,12 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display,
   draw_view=DestroyCacheView(draw_view);
   (void) XParseGeometry(draw_info->geometry,&x,&y,&width,&height);
   if (draw_info->stencil == TransparentStencil)
-    (void) CompositeImage(image,draw_image,CopyAlphaCompositeOp,MagickFalse,
+    (void) CompositeImage(image,draw_image,CopyAlphaCompositeOp,MagickTrue,
       (ssize_t) x,(ssize_t) y,exception);
   else
     {
       matte=image->matte;
-      (void) CompositeImage(image,draw_image,OverCompositeOp,MagickFalse,
+      (void) CompositeImage(image,draw_image,OverCompositeOp,MagickTrue,
         (ssize_t) x,(ssize_t) y,exception);
       image->matte=matte;
     }
@@ -4523,7 +4523,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
         y_offset-=(int) crop_info.y;
         if (y_offset < 0)
           y_offset=0;
-        (void) CompositeImage(image,composite_image,CopyCompositeOp,MagickFalse,
+        (void) CompositeImage(image,composite_image,CopyCompositeOp,MagickTrue,
           (ssize_t) x_offset,(ssize_t) y_offset,exception);
         composite_image=DestroyImage(composite_image);
       }
@@ -5935,7 +5935,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info,
         {
           canvas=CloneImage(image,0,0,MagickTrue,exception);
           if (canvas != (Image *) NULL)
-            (void) CompositeImage(canvas,pattern,DstOverCompositeOp,MagickFalse,
+            (void) CompositeImage(canvas,pattern,DstOverCompositeOp,MagickTrue,
               0,0,exception);
           pattern=DestroyImage(pattern);
         }

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 4141bb09bf0c9fdbb868214afd7d97a5ec705083..6d4cefbfcb3d81dd3d939dc3d1dfdf31c4b59a9d 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -960,7 +960,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
         else
           {
             (void) CompositeImage(composite_image,reconstruct_image,
-              CopyCompositeOp,MagickFalse,offset.x,offset.y,exception);
+              CopyCompositeOp,MagickTrue,offset.x,offset.y,exception);
             difference_image=CompareImages(image,composite_image,metric,
               &distortion,exception);
             if (difference_image != (Image *) NULL)

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 4c7e77f015c0026a54a7627c5deb9caf8831cdeb..b22331fbef87503c2f27bd927fd26cd71e6d3e10 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -194,7 +194,7 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
               for (y=0; y < (ssize_t) (*image)->rows; y+=(ssize_t) composite_image->rows)
                 for (x=0; x < (ssize_t) (*image)->columns; x+=(ssize_t) columns)
                   status&=CompositeImage(*image,composite_image,
-                    composite_options->compose,MagickFalse,x,y,exception);
+                    composite_options->compose,MagickTrue,x,y,exception);
             }
           else
             {
@@ -216,7 +216,7 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
                 Digitally composite image.
               */
               status&=CompositeImage(*image,composite_image,
-                composite_options->compose,MagickFalse,geometry.x,geometry.y,
+                composite_options->compose,MagickTrue,geometry.x,geometry.y,
                 exception);
             }
     }
@@ -1639,7 +1639,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             Merge Y displacement into X displacement image.
           */
           (void) CompositeImage(composite_image,mask_image,CopyGreenCompositeOp,
-            MagickFalse,0,0,exception);
+            MagickTrue,0,0,exception);
           mask_image=DestroyImage(mask_image);
         }
       else

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 1ff0219aeedad867bc426ce8d3e5b6b357622ac0..74f00c2134c2ce37cdd6abac083cf99646dcd53f 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2449,7 +2449,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                   Composite region.
                 */
                 (void) CompositeImage(region_image,*image,region_image->matte !=
-                   MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickFalse,
+                   MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickTrue,
                    region_geometry.x,region_geometry.y,exception);
                 *image=DestroyImage(*image);
                 *image=region_image;
@@ -3195,7 +3195,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
       */
       (void) SyncImageSettings(mogrify_info,*image,exception);
       (void) CompositeImage(region_image,*image,region_image->matte !=
-         MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickFalse,
+         MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickTrue,
          region_geometry.x,region_geometry.y,exception);
       *image=DestroyImage(*image);
       *image=region_image;
@@ -7423,11 +7423,10 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
               geometry;
 
             clip_to_self=IsStringTrue(GetImageOption(mogrify_info,
-                   "compose:clip-to-self"));
+              "compose:clip-to-self"));
             value=GetImageOption(mogrify_info,"compose:outside-overlay");
             if (value != (const char *) NULL)
               clip_to_self=IsFalse(IsStringTrue(value));
-
             (void) SyncImagesSettings(mogrify_info,*images,exception);
             image=RemoveFirstImageFromList(images);
             composite_image=RemoveFirstImageFromList(images);
@@ -7452,7 +7451,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                       Merge Y displacement into X displacement image.
                     */
                     (void) CompositeImage(composite_image,mask_image,
-                      CopyGreenCompositeOp,MagickFalse,0,0,exception);
+                      CopyGreenCompositeOp,MagickTrue,0,0,exception);
                     mask_image=DestroyImage(mask_image);
                   }
                 else
@@ -7466,7 +7465,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                   }
               }
             (void) CompositeImage(image,composite_image,image->compose,
-                  clip_to_self,geometry.x,geometry.y,exception);
+              clip_to_self,geometry.x,geometry.y,exception);
             (void) SetImageMask(image,(Image *) NULL,exception);
             composite_image=DestroyImage(composite_image);
             *images=DestroyImageList(*images);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index ce13607ed57a29ab7017f7dec70a536a9848d6a8..4a0a30f614e5f8e2242c13df6278ebc9b38a704f 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3891,7 +3891,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
                   (compose == DistortCompositeOp))
                 { /* Merge Y displacement into X displace/distort map. */
                   (void) CompositeImage(source_image,mask_image,
-                    CopyGreenCompositeOp,MagickFalse,0,0,_exception);
+                    CopyGreenCompositeOp,MagickTrue,0,0,_exception);
                   mask_image=DestroyImage(mask_image);
                 }
               else

diff --git a/coders/msl.c b/coders/msl.c
index 3c785d634ee9091503ab7f7c07d613260fa7df2f..e35aa378f6f2e352cf82cc167ed1aa457df13d9f 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1915,7 +1915,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                           SetImageType(composite_image,TrueColorMatteType,
                             &exception);
                           (void) CompositeImage(composite_image,
-                            msl_info->image[j],CopyAlphaCompositeOp,MagickFalse,
+                            msl_info->image[j],CopyAlphaCompositeOp,MagickTrue,
                             0,0,&exception);
                           break;
                         }
@@ -2018,10 +2018,10 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                          {
                            if (rotate_image != (Image *) NULL)
                              (void) CompositeImage(image,rotate_image,compose,
-                               MagickFalse,x,y,&exception);
+                               MagickTrue,x,y,&exception);
                            else
                              (void) CompositeImage(image,composite_image,
-                               compose,MagickFalse,x,y,&exception);
+                               compose,MagickTrue,x,y,&exception);
                          }
                       if (rotate_image != (Image *) NULL)
                         rotate_image=DestroyImage(rotate_image);
@@ -2072,7 +2072,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
             &exception);
           channel_mask=SetPixelChannelMask(image,channel);
           if (rotate_image == (Image *) NULL)
-            CompositeImage(image,composite_image,compose,MagickFalse,geometry.x,
+            CompositeImage(image,composite_image,compose,MagickTrue,geometry.x,
               geometry.y,&exception);
           else
             {
@@ -2083,7 +2083,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 composite_image->columns)/2;
               geometry.y-=(ssize_t) (rotate_image->rows-
                 composite_image->rows)/2;
-              CompositeImage(image,rotate_image,compose,MagickFalse,geometry.x,
+              CompositeImage(image,rotate_image,compose,MagickTrue,geometry.x,
                 geometry.y,&exception);
               rotate_image=DestroyImage(rotate_image);
             }

diff --git a/coders/pict.c b/coders/pict.c
index d0721e46b81c4d6e678086e13693f3ea8c217b02..e22864f6c69898829eb39e1ee0a638c0647ad449 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1242,7 +1242,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
               if ((code == 0x9a) || (code == 0x9b) ||
                   ((bytes_per_line & 0x8000) != 0))
                 (void) CompositeImage(image,tile_image,CopyCompositeOp,
-                  MagickFalse,destination.left,destination.top,exception);
+                  MagickTrue,destination.left,destination.top,exception);
             tile_image=DestroyImage(tile_image);
             break;
           }
@@ -1388,7 +1388,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
         if (IsRGBColorspace(image->colorspace) == MagickFalse)
           (void) TransformImageColorspace(image,tile_image->colorspace,
             exception);
-        (void) CompositeImage(image,tile_image,CopyCompositeOp,MagickFalse,
+        (void) CompositeImage(image,tile_image,CopyCompositeOp,MagickTrue,
           frame.left,frame.right,exception);
         image->compression=tile_image->compression;
         tile_image=DestroyImage(tile_image);

diff --git a/coders/xcf.c b/coders/xcf.c
index c62bd71e6dbba1a062dd098f76b0cb95a5d9b96c..746f0daad4e48536dad9a06dfc2cb169a7f9e373 100644 (file)
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -683,7 +683,7 @@ static MagickBooleanType load_level(Image *image,XCFDocInfo *inDocInfo,
 
       /* composite the tile onto the layer's image, and then destroy it */
       (void) CompositeImage(inLayerInfo->image,tile_image,CopyCompositeOp,
-        MagickFalse,destLeft*TILE_WIDTH,destTop*TILE_HEIGHT,exception);
+        MagickTrue,destLeft*TILE_WIDTH,destTop*TILE_HEIGHT,exception);
       tile_image=DestroyImage(tile_image);
 
       /* adjust tile position */
@@ -1311,7 +1311,7 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
           Composite the layer data onto the main image, dispose the layer.
         */
         (void) CompositeImage(image,layer_info[0].image,OverCompositeOp,
-          MagickFalse,layer_info[0].offset_x,layer_info[0].offset_y,exception);
+          MagickTrue,layer_info[0].offset_x,layer_info[0].offset_y,exception);
         layer_info[0].image =DestroyImage( layer_info[0].image);
       }
     else
@@ -1324,11 +1324,11 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
           /* BOGUS: need to consider layer blending modes!! */
 
           if ( layer_info[j].visible ) { /* only visible ones, please! */
-            CompositeImage(image, OverCompositeOp, layer_info[j].image,
-                     layer_info[j].offset_x, layer_info[j].offset_y );
+            CompositeImage(image, layer_info[j].image, OverCompositeOp,
+               MagickTrue, layer_info[j].offset_x, layer_info[j].offset_y );
              layer_info[j].image =DestroyImage( layer_info[j].image );
 
-            /* Bob says that if we do this, we'll get REAL gray images! */
+            /*  If we do this, we'll get REAL gray images! */
             if ( image_type == GIMP_GRAY ) {
               QuantizeInfo  qi;
               GetQuantizeInfo(&qi);
@@ -1345,7 +1345,7 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
         /* first we copy the last layer on top of the main image */
         (void) CompositeImage(image,layer_info[number_layers-1].image,
-          CopyCompositeOp,MagickFalse,layer_info[number_layers-1].offset_x,
+          CopyCompositeOp,MagickTrue,layer_info[number_layers-1].offset_x,
           layer_info[number_layers-1].offset_y,exception);
         layer_info[number_layers-1].image=DestroyImage(
           layer_info[number_layers-1].image);