From 55b837aa959920b929256d31ce61c2bd1b375f58 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 29 Mar 2012 11:55:25 +0000
Subject: [PATCH]

---
 MagickCore/composite.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index a0486932b..9771485c6 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -283,7 +283,7 @@ static MagickBooleanType CompositeOverImage(Image *image,
     *value;
 
   MagickBooleanType
-    bounded,
+    clip_to_self,
     status;
 
   MagickOffsetType
@@ -295,10 +295,10 @@ static MagickBooleanType CompositeOverImage(Image *image,
   /*
     Prepare composite image.
   */
-  bounded=MagickTrue;
+  clip_to_self=MagickTrue;
   value=GetImageArtifact(composite_image,"compose:outside-overlay");
   if (value != (const char *) NULL)
-    bounded=IsMagickTrue(value) == MagickFalse ? MagickTrue : MagickFalse;
+    clip_to_self=IsMagickTrue(value) == MagickFalse ? MagickTrue : MagickFalse;
   /*
     Composite image.
   */
@@ -328,7 +328,7 @@ static MagickBooleanType CompositeOverImage(Image *image,
 
     if (status == MagickFalse)
       continue;
-    if (bounded == MagickTrue)
+    if (clip_to_self == MagickTrue)
       {
         if (y < y_offset)
           continue;
@@ -372,7 +372,7 @@ static MagickBooleanType CompositeOverImage(Image *image,
       register ssize_t
         i;
 
-      if (bounded == MagickTrue)
+      if (clip_to_self == MagickTrue)
         {
           if (x < x_offset)
             {
@@ -524,7 +524,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     *destination_image;
 
   MagickBooleanType
-    bounded,
+    clip_to_self,
     status;
 
   MagickOffsetType
@@ -609,7 +609,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   destination_image=(Image *) NULL;
   amount=0.5;
   destination_dissolve=1.0;
-  bounded=MagickFalse;
+  clip_to_self=MagickFalse;
   percent_brightness=100.0;
   percent_saturation=100.0;
   source_dissolve=1.0;
@@ -628,7 +628,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       /*
         Modify destination outside the overlaid region.
       */
-      bounded=MagickTrue;
+      clip_to_self=MagickTrue;
       break;
     }
     case CopyCompositeOp:
@@ -732,7 +732,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       */
       if (image->matte == MagickFalse)
         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
-      bounded=MagickTrue;
+      clip_to_self=MagickTrue;
       break;
     }
     case BlurCompositeOp:
@@ -1068,11 +1068,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             destination_dissolve=geometry_info.sigma/100.0;
           if ((destination_dissolve-MagickEpsilon) < 0.0)
             destination_dissolve=0.0;
-          bounded=MagickTrue;
+          clip_to_self=MagickTrue;
           if ((destination_dissolve+MagickEpsilon) > 1.0 )
             {
               destination_dissolve=1.0;
-              bounded=MagickFalse;
+              clip_to_self=MagickFalse;
             }
         }
       break;
@@ -1087,9 +1087,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           destination_dissolve=1.0-source_dissolve;
           if ((flags & SigmaValue) != 0)
             destination_dissolve=geometry_info.sigma/100.0;
-          bounded=MagickTrue;
+          clip_to_self=MagickTrue;
           if ((destination_dissolve+MagickEpsilon) > 1.0)
-            bounded=MagickFalse;
+            clip_to_self=MagickFalse;
         }
       break;
     }
@@ -1146,7 +1146,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   }
   value=GetImageArtifact(composite_image,"compose:outside-overlay");
   if (value != (const char *) NULL)
-    bounded=IsMagickTrue(value);
+    clip_to_self=IsMagickTrue(value);
   /*
     Composite image.
   */
@@ -1182,7 +1182,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
 
     if (status == MagickFalse)
       continue;
-    if (bounded == MagickFalse)
+    if (clip_to_self == MagickFalse)
       {
         if (y < y_offset)
           continue;
@@ -1234,7 +1234,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       size_t
         channels;
 
-      if (bounded == MagickFalse)
+      if (clip_to_self == MagickFalse)
         {
           if (x < x_offset)
             {
-- 
2.40.0