]> granicus.if.org Git - imagemagick/blobdiff - MagickCore/composite.c
projects / imagemagick / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update web pages
[imagemagick] / MagickCore / composite.c
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index f0c4756362491887eccfa5f5316224f749330637..b183da6e97943dcec13eda6fbb88bf35ef13e612 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -294,7 +294,11 @@ static MagickBooleanType CompositeOverImage(Image *image,
     *source_view,
     *image_view;
 
+  const char
+     *value;
+
   MagickBooleanType
+    clamp,
     status;
 
   MagickOffsetType
@@ -308,6 +312,10 @@ static MagickBooleanType CompositeOverImage(Image *image,
   */
   status=MagickTrue;
   progress=0;
+  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)
@@ -370,6 +378,7 @@ static MagickBooleanType CompositeOverImage(Image *image,
         Da,
         Dc,
         Dca,
+        gamma,
         Sa,
         Sc,
         Sca;
@@ -435,6 +444,8 @@ static MagickBooleanType CompositeOverImage(Image *image,
         }
       Sa=QuantumScale*GetPixelAlpha(source_image,p);
       Da=QuantumScale*GetPixelAlpha(image,q);
+      gamma=Sa+Da-Sa*Da;
+      gamma=PerceptibleReciprocal(gamma);
       for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelChannel channel=GetPixelChannelChannel(image,i);
@@ -457,7 +468,9 @@ 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;
           }
         /*
@@ -468,7 +481,9 @@ static MagickBooleanType CompositeOverImage(Image *image,
         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(gamma*QuantumRange*(Sca+Dca*(1.0-Sa))) :
+          ClampToQuantum(gamma*QuantumRange*(Sca+Dca*(1.0-Sa)));
       }
       p+=GetPixelChannels(source_image);
       channels=GetPixelChannels(source_image);
@@ -508,6 +523,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     *source_view,
     *image_view;
 
+  const char
+    *value;
+
   GeometryInfo
     geometry_info;
 
@@ -516,6 +534,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     *source_image;
 
   MagickBooleanType
+    clamp,
     status;
 
   MagickOffsetType
@@ -537,11 +556,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
     y;
 
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(composite!= (Image *) NULL);
-  assert(composite->signature == MagickSignature);
+  assert(composite->signature == MagickCoreSignature);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   source_image=CloneImage(composite,0,0,MagickTrue,exception);
@@ -553,7 +572,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   if ((image->alpha_trait != UndefinedPixelTrait) &&
       (source_image->alpha_trait == UndefinedPixelTrait))
     (void) SetImageAlphaChannel(source_image,SetAlphaChannel,exception);
-if (0)
   if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
     {
       status=CompositeOverImage(image,source_image,clip_to_self,x_offset,
@@ -561,9 +579,14 @@ if (0)
       source_image=DestroyImage(source_image);
       return(status);
     }
-  canvas_image=(Image *) NULL;
   amount=0.5;
+  canvas_image=(Image *) NULL;
   canvas_dissolve=1.0;
+  clamp=MagickTrue;
+  value=GetImageArtifact(image,"compose:clamp");
+  if (value != (const char *) NULL)
+    clamp=IsStringTrue(value);
+  SetGeometryInfo(&geometry_info);
   percent_luma=100.0;
   percent_chroma=100.0;
   source_dissolve=1.0;
@@ -601,8 +624,8 @@ if (0)
 
         if (status == MagickFalse)
           continue;
-        p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
-          1,exception);
+        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))
@@ -688,8 +711,8 @@ if (0)
 
         if (status == MagickFalse)
           continue;
-        p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
-          1,exception);
+        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))
@@ -705,8 +728,9 @@ if (0)
               q+=GetPixelChannels(image);
               continue;
             }
-          SetPixelAlpha(image,ClampToQuantum(GetPixelIntensity(source_image,
-            p)),q);
+          SetPixelAlpha(image,clamp != MagickFalse ?
+            ClampPixel(GetPixelIntensity(source_image,p)) :
+            ClampToQuantum(GetPixelIntensity(source_image,p)),q);
           p+=GetPixelChannels(source_image);
           q+=GetPixelChannels(image);
         }
@@ -783,7 +807,6 @@ if (0)
       /*
         Gather the maximum blur sigma values from user.
       */
-      SetGeometryInfo(&geometry_info);
       flags=NoValue;
       value=GetImageArtifact(image,"compose:args");
       if (value != (const char *) NULL)
@@ -865,10 +888,10 @@ if (0)
 
         if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
           continue;
-        p=GetCacheViewVirtualPixels(source_view,0,y,source_image->columns,
-          1,exception);
-        q=QueueCacheViewAuthenticPixels(canvas_view,0,y,
-          canvas_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) source_image->columns; x++)
@@ -1219,11 +1242,11 @@ if (0)
 
     MagickRealType
       blue,
-      luma,
+      chroma,
       green,
       hue,
-      red,
-      chroma;
+      luma,
+      red;
 
     PixelInfo
       canvas_pixel,
@@ -1317,8 +1340,8 @@ if (0)
               Sc: source color.
               Dc: canvas color.
           */
-          (void) GetOneVirtualPixel(source_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);
@@ -1369,8 +1392,7 @@ if (0)
               case DissolveCompositeOp:
               {
                 if (channel == AlphaPixelChannel)
-                  pixel=canvas_dissolve*GetPixelAlpha(source_image,
-                    source);
+                  pixel=canvas_dissolve*GetPixelAlpha(source_image,source);
                 else
                   pixel=(MagickRealType) source[channel];
                 break;
@@ -1381,7 +1403,8 @@ if (0)
                 break;
               }
             }
-            q[i]=ClampToQuantum(pixel);
+            q[i]=clamp != MagickFalse ? ClampPixel(pixel) :
+              ClampToQuantum(pixel);
           }
           q+=GetPixelChannels(image);
           continue;
@@ -1439,11 +1462,13 @@ if (0)
         }
         case DissolveCompositeOp:
         {
-          alpha=source_dissolve*Sa*(-canvas_dissolve*Da)+source_dissolve*
-            Sa+canvas_dissolve*Da;
+          alpha=source_dissolve*Sa*(-canvas_dissolve*Da)+source_dissolve*Sa+
+            canvas_dissolve*Da;
           break;
         }
         case DstOverCompositeOp:
+        case OverCompositeOp:
+        case SrcOverCompositeOp:
         {
           alpha=Sa+Da-Sa*Da;
           break;
@@ -1459,16 +1484,10 @@ if (0)
           alpha=Sa*(1.0-Da);
           break;
         }
-        case OverCompositeOp:
-        case SrcOverCompositeOp:
-        {
-          alpha=Sa+Da-Sa*Da;
-          break;
-        }
         case BlendCompositeOp:
         case PlusCompositeOp:
         {
-          alpha=RoundToUnity(Sa+Da);
+          alpha=RoundToUnity(source_dissolve*Sa+canvas_dissolve*Da);
           break;
         }
         case XorCompositeOp:
@@ -1511,8 +1530,7 @@ if (0)
 
         PixelChannel channel=GetPixelChannelChannel(image,i);
         PixelTrait traits=GetPixelChannelTraits(image,channel);
-        PixelTrait source_traits=GetPixelChannelTraits(source_image,
-          channel);
+        PixelTrait source_traits=GetPixelChannelTraits(source_image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
         if ((source_traits == UndefinedPixelTrait) &&
@@ -1531,7 +1549,7 @@ if (0)
             /*
               Copy channel.
             */
-            q[i]=ClampToQuantum(Sc);
+            q[i]=Sc;
             continue;
           }
         if (channel == AlphaPixelChannel)
@@ -1608,7 +1626,7 @@ if (0)
               }
               case CopyAlphaCompositeOp:
               {
-                if (source_traits == UndefinedPixelTrait)
+                if ((source_traits & BlendPixelTrait) == 0)
                   pixel=GetPixelIntensity(source_image,p);
                 else
                   pixel=QuantumRange*Sa;
@@ -1638,11 +1656,6 @@ if (0)
               }
               case ModulateCompositeOp:
               {
-                if (fabs((double) (QuantumRange*Sa-TransparentAlpha)) < MagickEpsilon)
-                  {
-                    pixel=QuantumRange*Da;
-                    break;
-                  }
                 pixel=QuantumRange*Da;
                 break;
               }
@@ -1652,7 +1665,8 @@ if (0)
                 break;
               }
             }
-            q[i]=ClampToQuantum(pixel);
+            q[i]=clamp != MagickFalse ? ClampPixel(pixel) :
+              ClampToQuantum(pixel);
             continue;
           }
         /*
@@ -1668,13 +1682,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)
         {
@@ -1732,31 +1748,31 @@ if (0)
           {
             if ((Sca == 0.0) && (Dca == Da))
               {
-                pixel=QuantumRange*(Sa*Da+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*Da+Dca*(1.0-Sa));
                 break;
               }
             if (Sca == 0.0)
               {
-                pixel=QuantumRange*(Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Dca*(1.0-Sa));
                 break;
               }
-            pixel=QuantumRange*(Sa*Da-Sa*Da*MagickMin(1.0,(1.0-Dca/Da)*Sa/Sca)+
-              Sca*(1.0-Da)+Dca*(1.0-Sa));
+            pixel=QuantumRange*gamma*(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 ((Sca == Sa) && (Dca == 0.0))
               {
-                pixel=QuantumRange*(Sca*(1.0-Da));
+                pixel=QuantumRange*gamma*(Sca*(1.0-Da));
                 break;
               }
             if (Sca == Sa)
               {
-                pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
                 break;
               }
-            pixel=QuantumRange*(Sa*Da*MagickMin(1.0,Dca/Da*Sa/(Sa-Sca)));
+            pixel=QuantumRange*gamma*(Sa*Da*MagickMin(1.0,Dca/Da*Sa/(Sa-Sca)));
             break;
           }
           case ColorizeCompositeOp:
@@ -1771,8 +1787,8 @@ if (0)
                 pixel=Sc;
                 break;
               }
-            CompositeHCL(canvas_pixel.red,canvas_pixel.green,
-              canvas_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);
@@ -1841,7 +1857,7 @@ if (0)
           }
           case DifferenceCompositeOp:
           {
-            pixel=QuantumRange*(Sca+Dca-2.0*MagickMin(Sca*Da,Dca*Sa));
+            pixel=QuantumRange*gamma*(Sca+Dca-2.0*MagickMin(Sca*Da,Dca*Sa));
             break;
           }
           case DissolveCompositeOp:
@@ -1855,15 +1871,15 @@ if (0)
             if ((fabs((double) Sca) < MagickEpsilon) &&
                 (fabs((double) Dca) < MagickEpsilon))
               {
-                pixel=QuantumRange*(Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca*(1.0-Sa));
                 break;
               }
             if (fabs((double) Dca) < MagickEpsilon)
               {
-                pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
                 break;
               }
-            pixel=QuantumRange*(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+            pixel=QuantumRange*gamma*(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
             break;
           }
           case DivideSrcCompositeOp:
@@ -1871,15 +1887,15 @@ if (0)
             if ((fabs((double) Dca) < MagickEpsilon) &&
                 (fabs((double) Sca) < MagickEpsilon))
               {
-                pixel=QuantumRange*(Dca*(1.0-Sa)+Sca*(1.0-Da));
+                pixel=QuantumRange*gamma*(Dca*(1.0-Sa)+Sca*(1.0-Da));
                 break;
               }
             if (fabs((double) Sca) < MagickEpsilon)
               {
-                pixel=QuantumRange*(Da*Sa+Dca*(1.0-Sa)+Sca*(1.0-Da));
+                pixel=QuantumRange*gamma*(Da*Sa+Dca*(1.0-Sa)+Sca*(1.0-Da));
                 break;
               }
-            pixel=QuantumRange*(Dca*Sa*Sa/Sca+Dca*(1.0-Sa)+Sca*(1.0-Da));
+            pixel=QuantumRange*gamma*(Dca*Sa*Sa/Sca+Dca*(1.0-Sa)+Sca*(1.0-Da));
             break;
           }
           case DstAtopCompositeOp:
@@ -1905,36 +1921,30 @@ if (0)
           }
           case DstOverCompositeOp:
           {
-            pixel=QuantumRange*(Dca+Sca*(1.0-Da));
+            pixel=QuantumRange*gamma*(Dca+Sca*(1.0-Da));
             break;
           }
           case ExclusionCompositeOp:
           {
-            pixel=QuantumRange*(Sca*Da+Dca*Sa-2.0*Sca*Dca+Sca*(1.0-Da)+Dca*
-              (1.0-Sa));
+            pixel=QuantumRange*gamma*(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*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-
+                  Sa));
                 break;
               }
-            pixel=QuantumRange*(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+Dca*
-              (1.0-Sa));
+            pixel=QuantumRange*gamma*(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;
+            pixel=gamma*(((Sca+Dca) < 1.0) ? 0.0 : QuantumRange);
             break;
           }
           case HueCompositeOp:
@@ -1949,8 +1959,8 @@ if (0)
                 pixel=Sc;
                 break;
               }
-            CompositeHCL(canvas_pixel.red,canvas_pixel.green,
-              canvas_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);
@@ -1977,12 +1987,12 @@ if (0)
 
                 f(Sc,Dc) = Sc + Dc - 1
             */
-            pixel=QuantumRange*(Sca+Dca-Sa*Da);
+            pixel=QuantumRange*gamma*(Sca+Dca-Sa*Da);
             break;
           }
           case LinearDodgeCompositeOp:
           {
-            pixel=(Sa*Sc+Da*Dc);
+            pixel=gamma*(Sa*Sc+Da*Dc);
             break;
           }
           case LinearLightCompositeOp:
@@ -1993,7 +2003,7 @@ if (0)
 
                 f(Sc,Dc) = Dc + 2*Sc - 1
             */
-            pixel=QuantumRange*((Sca-Sa)*Da+Sca+Dca);
+            pixel=QuantumRange*gamma*((Sca-Sa)*Da+Sca+Dca);
             break;
           }
           case LightenCompositeOp:
@@ -2029,8 +2039,8 @@ if (0)
                 pixel=Sc;
                 break;
               }
-            CompositeHCL(canvas_pixel.red,canvas_pixel.green,
-              canvas_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);
@@ -2064,9 +2074,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=QuantumRange*gamma*(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:
@@ -2081,7 +2091,7 @@ if (0)
 
                 f(Sc,Dc) = Sc - Dc
             */
-            pixel=QuantumRange*(Da*Dc+Sa*Sc-2.0*Sa*Sc*Da);
+            pixel=gamma*(Da*Dc+Sa*Sc-2.0*Sa*Sc*Da);
             break;
           }
           case ModulateCompositeOp:
@@ -2100,8 +2110,8 @@ if (0)
                 pixel=Dc;
                 break;
               }
-            CompositeHCL(canvas_pixel.red,canvas_pixel.green,
-              canvas_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);
@@ -2117,22 +2127,26 @@ if (0)
           case ModulusAddCompositeOp:
           {
             pixel=Sc+Dc;
-            if (pixel > QuantumRange)
+            while (pixel > QuantumRange)
               pixel-=QuantumRange;
-            pixel=gamma*(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa));
+            while (pixel < 0.0)
+              pixel+=QuantumRange;
+            pixel=(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa));
             break;
           }
           case ModulusSubtractCompositeOp:
           {
             pixel=Sc-Dc;
-            if (pixel < 0.0)
+            while (pixel > QuantumRange)
+              pixel-=QuantumRange;
+            while (pixel < 0.0)
               pixel+=QuantumRange;
-            pixel=gamma*(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa));
+            pixel=(Sa*Da*pixel+Sa*Sc*(1.0-Da)+Da*Dc*(1.0-Sa));
             break;
           }
           case MultiplyCompositeOp:
           {
-            pixel=QuantumRange*(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+            pixel=QuantumRange*gamma*(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
             break;
           }
           case OutCompositeOp:
@@ -2144,7 +2158,7 @@ if (0)
           case OverCompositeOp:
           case SrcOverCompositeOp:
           {
-            pixel=QuantumRange*(Sca+Dca*(1.0-Sa));
+            pixel=QuantumRange*gamma*(Sca+Dca*(1.0-Sa));
             break;
           }
           case OverlayCompositeOp:
@@ -2170,11 +2184,11 @@ if (0)
             */
             if (fabs((double) Da) < MagickEpsilon)
               {
-                pixel=QuantumRange*(Sca);
+                pixel=QuantumRange*gamma*(Sca);
                 break;
               }
-            pixel=QuantumRange*(Dca*Dca*(Sa-2.0*Sca)/Da+Sca*(2.0*Dca+1.0-Da)+
-              Dca*(1.0-Sa));
+            pixel=QuantumRange*gamma*(Dca*Dca*(Sa-2.0*Sca)/Da+Sca*(2.0*Dca+1.0-
+              Da)+Dca*(1.0-Sa));
             break;
           }
           case PinLightCompositeOp:
@@ -2187,15 +2201,15 @@ if (0)
             */
             if ((Dca*Sa) < (Da*(2.0*Sca-Sa)))
               {
-                pixel=QuantumRange*(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa));
                 break;
               }
             if ((Dca*Sa) > (2.0*Sca*Da))
               {
-                pixel=QuantumRange*(Sca*Da+Sca+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sca*Da+Sca+Dca*(1.0-Sa));
                 break;
               }
-            pixel=QuantumRange*(Sca*(1.0-Da)+Dca);
+            pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca);
             break;
           }
           case PlusCompositeOp:
@@ -2215,8 +2229,8 @@ if (0)
                 pixel=Sc;
                 break;
               }
-            CompositeHCL(canvas_pixel.red,canvas_pixel.green,
-              canvas_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);
@@ -2236,26 +2250,26 @@ if (0)
 
                 f(Sc,Dc) = 1.0-(1.0-Sc)*(1.0-Dc)
             */
-            pixel=QuantumRange*(Sca+Dca-Sca*Dca);
+            pixel=QuantumRange*gamma*(Sca+Dca-Sca*Dca);
             break;
           }
           case SoftLightCompositeOp:
           {
             if ((2.0*Sca) < Sa)
               {
-                pixel=QuantumRange*(Dca*(Sa+(2.0*Sca-Sa)*(1.0-(Dca/Da)))+Sca*
-                  (1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(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*(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*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));
                 break;
               }
-            pixel=QuantumRange*(Dca*Sa+Da*(2.0*Sca-Sa)*(pow((Dca/Da),0.5)-(Dca/
-              Da))+Sca*(1.0-Da)+Dca*(1.0-Sa));
+            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));
             break;
           }
           case ThresholdCompositeOp:
@@ -2283,16 +2297,16 @@ if (0)
             if ((fabs((double) Sa) < MagickEpsilon) ||
                 (fabs((double) (Sca-Sa)) < MagickEpsilon))
               {
-                pixel=QuantumRange*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
                 break;
               }
             if ((2.0*Sca) <= Sa)
               {
-                pixel=QuantumRange*(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca*(1.0-Da)+
-                  Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca*
+                  (1.0-Da)+Dca*(1.0-Sa));
                 break;
               }
-            pixel=QuantumRange*(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+Dca*
+            pixel=QuantumRange*gamma*(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+Dca*
               (1.0-Sa));
             break;
           }
@@ -2307,7 +2321,7 @@ if (0)
             break;
           }
         }
-        q[i]=ClampPixel(pixel);
+        q[i]=clamp != MagickFalse ? ClampPixel(pixel) : ClampToQuantum(pixel);
       }
       p+=GetPixelChannels(source_image);
       channels=GetPixelChannels(source_image);
@@ -2387,7 +2401,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture,
   assert(image != (Image *) NULL);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (texture == (const Image *) NULL)
     return(MagickFalse);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -2420,7 +2434,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture,
             thread_status;
 
           thread_status=CompositeImage(image,texture_image,image->compose,
-            MagickFalse,x+texture_image->tile_offset.x,y+
+            MagickTrue,x+texture_image->tile_offset.x,y+
             texture_image->tile_offset.y,exception);
           if (thread_status == MagickFalse)
             {
@@ -2433,8 +2447,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;
           }
Unnamed repository; edit this file 'description' to name the repository.