Remove unrequired blend function.

JimBobSquarePants · JimBobSquarePants · commit 7766dea28028 · 2019-10-22T22:57:07.000+11:00
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
@@ -71,7 +71,7 @@ public static Vector4 NormalSrcIn(Vector4 backdrop, Vector4 source, float opacit
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Normal(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -144,7 +144,7 @@ public static Vector4 NormalDestIn(Vector4 backdrop, Vector4 source, float opaci
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Normal(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -477,7 +477,7 @@ public static Vector4 MultiplySrcIn(Vector4 backdrop, Vector4 source, float opac
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Multiply(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -550,7 +550,7 @@ public static Vector4 MultiplyDestIn(Vector4 backdrop, Vector4 source, float opa
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Multiply(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -883,7 +883,7 @@ public static Vector4 AddSrcIn(Vector4 backdrop, Vector4 source, float opacity)
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Add(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -956,7 +956,7 @@ public static Vector4 AddDestIn(Vector4 backdrop, Vector4 source, float opacity)
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Add(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -1289,7 +1289,7 @@ public static Vector4 SubtractSrcIn(Vector4 backdrop, Vector4 source, float opac
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Subtract(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -1362,7 +1362,7 @@ public static Vector4 SubtractDestIn(Vector4 backdrop, Vector4 source, float opa
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Subtract(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -1695,7 +1695,7 @@ public static Vector4 ScreenSrcIn(Vector4 backdrop, Vector4 source, float opacit
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Screen(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -1768,7 +1768,7 @@ public static Vector4 ScreenDestIn(Vector4 backdrop, Vector4 source, float opaci
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Screen(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -2101,7 +2101,7 @@ public static Vector4 DarkenSrcIn(Vector4 backdrop, Vector4 source, float opacit
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Darken(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -2174,7 +2174,7 @@ public static Vector4 DarkenDestIn(Vector4 backdrop, Vector4 source, float opaci
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Darken(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -2507,7 +2507,7 @@ public static Vector4 LightenSrcIn(Vector4 backdrop, Vector4 source, float opaci
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Lighten(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -2580,7 +2580,7 @@ public static Vector4 LightenDestIn(Vector4 backdrop, Vector4 source, float opac
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Lighten(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -2913,7 +2913,7 @@ public static Vector4 OverlaySrcIn(Vector4 backdrop, Vector4 source, float opaci
         {
             source.W *= opacity;
 
-            return In(backdrop, source, Overlay(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -2986,7 +2986,7 @@ public static Vector4 OverlayDestIn(Vector4 backdrop, Vector4 source, float opac
         {
             source.W *= opacity;
 
-            return In(source, backdrop, Overlay(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
@@ -3319,7 +3319,7 @@ public static Vector4 HardLightSrcIn(Vector4 backdrop, Vector4 source, float opa
         {
             source.W *= opacity;
 
-            return In(backdrop, source, HardLight(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -3392,7 +3392,7 @@ public static Vector4 HardLightDestIn(Vector4 backdrop, Vector4 source, float op
         {
             source.W *= opacity;
 
-            return In(source, backdrop, HardLight(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
@@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         {
             source.W *= opacity;
 
-            return In(backdrop, source, <#=blender#>(backdrop, source));
+            return In(backdrop, source);
         }
 
         /// <summary>
@@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         {
             source.W *= opacity;
 
-            return In(source, backdrop, <#=blender#>(source, backdrop));
+            return In(source, backdrop);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs b/src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs
@@ -208,12 +208,10 @@ public static Vector4 Atop(Vector4 destination, Vector4 source, Vector4 blend)
         /// </summary>
         /// <param name="destination">The destination vector.</param>
         /// <param name="source">The source vector.</param>
-        /// <param name="blend">The amount to blend. Range 0..1</param>
         /// <returns>The <see cref="Vector4"/>.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Vector4 In(Vector4 destination, Vector4 source, Vector4 blend)
+        public static Vector4 In(Vector4 destination, Vector4 source)
         {
-            // TODO: blend is not used?
             float alpha = destination.W * source.W;
 
             Vector4 color = source * alpha;                    // premultiply

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static Vector4 NormalSrcIn(Vector4 backdrop, Vector4 source, float opacit`
`71`	`71`	`{`
`72`	`72`	`source.W *= opacity;`
`73`	`73`
`74`		`- return In(backdrop, source, Normal(backdrop, source));`
	`74`	`+ return In(backdrop, source);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// <summary>`
`@@ -144,7 +144,7 @@ public static Vector4 NormalDestIn(Vector4 backdrop, Vector4 source, float opaci`
`144`	`144`	`{`
`145`	`145`	`source.W *= opacity;`
`146`	`146`
`147`		`- return In(source, backdrop, Normal(source, backdrop));`
	`147`	`+ return In(source, backdrop);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/// <summary>`
`@@ -477,7 +477,7 @@ public static Vector4 MultiplySrcIn(Vector4 backdrop, Vector4 source, float opac`
`477`	`477`	`{`
`478`	`478`	`source.W *= opacity;`
`479`	`479`
`480`		`- return In(backdrop, source, Multiply(backdrop, source));`
	`480`	`+ return In(backdrop, source);`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`/// <summary>`
`@@ -550,7 +550,7 @@ public static Vector4 MultiplyDestIn(Vector4 backdrop, Vector4 source, float opa`
`550`	`550`	`{`
`551`	`551`	`source.W *= opacity;`
`552`	`552`
`553`		`- return In(source, backdrop, Multiply(source, backdrop));`
	`553`	`+ return In(source, backdrop);`
`554`	`554`	`}`
`555`	`555`
`556`	`556`	`/// <summary>`
`@@ -883,7 +883,7 @@ public static Vector4 AddSrcIn(Vector4 backdrop, Vector4 source, float opacity)`
`883`	`883`	`{`
`884`	`884`	`source.W *= opacity;`
`885`	`885`
`886`		`- return In(backdrop, source, Add(backdrop, source));`
	`886`	`+ return In(backdrop, source);`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`/// <summary>`
`@@ -956,7 +956,7 @@ public static Vector4 AddDestIn(Vector4 backdrop, Vector4 source, float opacity)`
`956`	`956`	`{`
`957`	`957`	`source.W *= opacity;`
`958`	`958`
`959`		`- return In(source, backdrop, Add(source, backdrop));`
	`959`	`+ return In(source, backdrop);`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`/// <summary>`
`@@ -1289,7 +1289,7 @@ public static Vector4 SubtractSrcIn(Vector4 backdrop, Vector4 source, float opac`
`1289`	`1289`	`{`
`1290`	`1290`	`source.W *= opacity;`
`1291`	`1291`
`1292`		`- return In(backdrop, source, Subtract(backdrop, source));`
	`1292`	`+ return In(backdrop, source);`
`1293`	`1293`	`}`
`1294`	`1294`
`1295`	`1295`	`/// <summary>`
`@@ -1362,7 +1362,7 @@ public static Vector4 SubtractDestIn(Vector4 backdrop, Vector4 source, float opa`
`1362`	`1362`	`{`
`1363`	`1363`	`source.W *= opacity;`
`1364`	`1364`
`1365`		`- return In(source, backdrop, Subtract(source, backdrop));`
	`1365`	`+ return In(source, backdrop);`
`1366`	`1366`	`}`
`1367`	`1367`
`1368`	`1368`	`/// <summary>`
`@@ -1695,7 +1695,7 @@ public static Vector4 ScreenSrcIn(Vector4 backdrop, Vector4 source, float opacit`
`1695`	`1695`	`{`
`1696`	`1696`	`source.W *= opacity;`
`1697`	`1697`
`1698`		`- return In(backdrop, source, Screen(backdrop, source));`
	`1698`	`+ return In(backdrop, source);`
`1699`	`1699`	`}`
`1700`	`1700`
`1701`	`1701`	`/// <summary>`
`@@ -1768,7 +1768,7 @@ public static Vector4 ScreenDestIn(Vector4 backdrop, Vector4 source, float opaci`
`1768`	`1768`	`{`
`1769`	`1769`	`source.W *= opacity;`
`1770`	`1770`
`1771`		`- return In(source, backdrop, Screen(source, backdrop));`
	`1771`	`+ return In(source, backdrop);`
`1772`	`1772`	`}`
`1773`	`1773`
`1774`	`1774`	`/// <summary>`
`@@ -2101,7 +2101,7 @@ public static Vector4 DarkenSrcIn(Vector4 backdrop, Vector4 source, float opacit`
`2101`	`2101`	`{`
`2102`	`2102`	`source.W *= opacity;`
`2103`	`2103`
`2104`		`- return In(backdrop, source, Darken(backdrop, source));`
	`2104`	`+ return In(backdrop, source);`
`2105`	`2105`	`}`
`2106`	`2106`
`2107`	`2107`	`/// <summary>`
`@@ -2174,7 +2174,7 @@ public static Vector4 DarkenDestIn(Vector4 backdrop, Vector4 source, float opaci`
`2174`	`2174`	`{`
`2175`	`2175`	`source.W *= opacity;`
`2176`	`2176`
`2177`		`- return In(source, backdrop, Darken(source, backdrop));`
	`2177`	`+ return In(source, backdrop);`
`2178`	`2178`	`}`
`2179`	`2179`
`2180`	`2180`	`/// <summary>`
`@@ -2507,7 +2507,7 @@ public static Vector4 LightenSrcIn(Vector4 backdrop, Vector4 source, float opaci`
`2507`	`2507`	`{`
`2508`	`2508`	`source.W *= opacity;`
`2509`	`2509`
`2510`		`- return In(backdrop, source, Lighten(backdrop, source));`
	`2510`	`+ return In(backdrop, source);`
`2511`	`2511`	`}`
`2512`	`2512`
`2513`	`2513`	`/// <summary>`
`@@ -2580,7 +2580,7 @@ public static Vector4 LightenDestIn(Vector4 backdrop, Vector4 source, float opac`
`2580`	`2580`	`{`
`2581`	`2581`	`source.W *= opacity;`
`2582`	`2582`
`2583`		`- return In(source, backdrop, Lighten(source, backdrop));`
	`2583`	`+ return In(source, backdrop);`
`2584`	`2584`	`}`
`2585`	`2585`
`2586`	`2586`	`/// <summary>`
`@@ -2913,7 +2913,7 @@ public static Vector4 OverlaySrcIn(Vector4 backdrop, Vector4 source, float opaci`
`2913`	`2913`	`{`
`2914`	`2914`	`source.W *= opacity;`
`2915`	`2915`
`2916`		`- return In(backdrop, source, Overlay(backdrop, source));`
	`2916`	`+ return In(backdrop, source);`
`2917`	`2917`	`}`
`2918`	`2918`
`2919`	`2919`	`/// <summary>`
`@@ -2986,7 +2986,7 @@ public static Vector4 OverlayDestIn(Vector4 backdrop, Vector4 source, float opac`
`2986`	`2986`	`{`
`2987`	`2987`	`source.W *= opacity;`
`2988`	`2988`
`2989`		`- return In(source, backdrop, Overlay(source, backdrop));`
	`2989`	`+ return In(source, backdrop);`
`2990`	`2990`	`}`
`2991`	`2991`
`2992`	`2992`	`/// <summary>`
`@@ -3319,7 +3319,7 @@ public static Vector4 HardLightSrcIn(Vector4 backdrop, Vector4 source, float opa`
`3319`	`3319`	`{`
`3320`	`3320`	`source.W *= opacity;`
`3321`	`3321`
`3322`		`- return In(backdrop, source, HardLight(backdrop, source));`
	`3322`	`+ return In(backdrop, source);`
`3323`	`3323`	`}`
`3324`	`3324`
`3325`	`3325`	`/// <summary>`
`@@ -3392,7 +3392,7 @@ public static Vector4 HardLightDestIn(Vector4 backdrop, Vector4 source, float op`
`3392`	`3392`	`{`
`3393`	`3393`	`source.W *= opacity;`
`3394`	`3394`
`3395`		`- return In(source, backdrop, HardLight(source, backdrop));`
	`3395`	`+ return In(source, backdrop);`
`3396`	`3396`	`}`
`3397`	`3397`
`3398`	`3398`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders`
`82`	`82`	`{`
`83`	`83`	`source.W *= opacity;`
`84`	`84`
`85`		`- return In(backdrop, source, <#=blender#>(backdrop, source));`
	`85`	`+ return In(backdrop, source);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/// <summary>`
`@@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders`
`155`	`155`	`{`
`156`	`156`	`source.W *= opacity;`
`157`	`157`
`158`		`- return In(source, backdrop, <#=blender#>(source, backdrop));`
	`158`	`+ return In(source, backdrop);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/// <summary>`