From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 3 Apr 2012 19:30:58 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5903
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=542a95bf123eda9ec6613f2ebb80627c0853a4bd;p=imagemagick

---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 9b6c7ac5b..af648f7b7 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7408,6 +7408,9 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
           }
         if (LocaleCompare("composite",option+1) == 0)
           {
+            const char
+              *value;
+
             Image
               *mask_image,
               *composite_image,
@@ -7420,8 +7423,12 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
               geometry;
 
             (void) SyncImagesSettings(mogrify_info,*images,exception);
-            clip_to_self=IsStringTrue(GetImageOption(mogrify_info,
-              "compose:clip-to-self")); /* if this is true */
+            value=GetImageOption(mogrify_info,"compose:clip-to-self");
+            if (value == (const char *) NULL)
+              clip_to_self=MagickTrue;
+            else
+              clip_to_self=IsStringTrue(GetImageOption(mogrify_info,
+                "compose:clip-to-self")); /* if this is true */
             if (IsMagickFalse(clip_to_self)) /* or */
               clip_to_self=IfMagickFalse(IsStringNotFalse(GetImageOption(
                 mogrify_info,"compose:outside-overlay"))); /* this false */
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 2c59fa617..3db8566ac 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3856,15 +3856,19 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
 
           /* Compose value from "-compose" option only */
           value=GetImageOption(_image_info,"compose");
-          if (value != (const char *) NULL)
-            compose=(CompositeOperator) ParseCommandOption(
-                 MagickComposeOptions,MagickFalse,value);
-          else
+          if (value == (const char *) NULL)
             compose=OverCompositeOp;  /* use Over not source_image->compose */
+          else
+            compose=(CompositeOperator) ParseCommandOption(MagickComposeOptions,
+              MagickFalse,value);
 
           /* Get "clip-to-self" expert setting (false is normal) */
-          clip_to_self=IsStringTrue(GetImageOption(_image_info,
-                "compose:clip-to-self"));       /* if this is true */
+          value=GetImageOption(_image_info,"compose:clip-to-self");
+          if (value == (const char *) NULL)
+            clip_to_self=MagickTrue;
+          else
+            clip_to_self=IsStringTrue(GetImageOption(_image_info,
+              "compose:clip-to-self"));       /* if this is true */
           value=GetImageOption(_image_info,"compose:outside-overlay");
           if (value != (const char *) NULL) {   /* or this false */
             /* FUTURE: depreciate warning for "compose:outside-overlay"*/