Browse Source

Fix spelling

pull/493/head
James Jackson-South 8 years ago
parent
commit
fc06762f4e
  1. 8
      src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
  2. 2
      src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
  3. 4
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs
  4. 2
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt
  5. 24
      src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs
  6. 2
      tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests.cs
  7. 2
      tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs

8
src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs

@ -141,17 +141,17 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
} }
} }
internal class Substract : PixelBlender<TPixel> internal class Subtract : PixelBlender<TPixel>
{ {
/// <summary> /// <summary>
/// Gets the static instance of this blender. /// Gets the static instance of this blender.
/// </summary> /// </summary>
public static Substract Instance { get; } = new Substract(); public static Subtract Instance { get; } = new Subtract();
/// <inheritdoc /> /// <inheritdoc />
public override TPixel Blend(TPixel background, TPixel source, float amount) public override TPixel Blend(TPixel background, TPixel source, float amount)
{ {
return PorterDuffFunctions.Substract(background, source, amount); return PorterDuffFunctions.Subtract(background, source, amount);
} }
/// <inheritdoc /> /// <inheritdoc />
@ -172,7 +172,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
for (int i = 0; i < destination.Length; i++) for (int i = 0; i < destination.Length; i++)
{ {
destinationSpan[i] = PorterDuffFunctions.Substract(backgroundSpan[i], sourceSpan[i], amount[i]); destinationSpan[i] = PorterDuffFunctions.Subtract(backgroundSpan[i], sourceSpan[i], amount[i]);
} }
PixelOperations<TPixel>.Instance.PackFromVector4(destinationSpan, destination, destination.Length); PixelOperations<TPixel>.Instance.PackFromVector4(destinationSpan, destination, destination.Length);

2
src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt

@ -42,7 +42,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
"Normal", "Normal",
"Multiply", "Multiply",
"Add", "Add",
"Substract", "Subtract",
"Screen", "Screen",
"Darken", "Darken",
"Lighten", "Lighten",

4
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.cs

@ -285,11 +285,11 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static TPixel Substract<TPixel>(TPixel backdrop, TPixel source, float amount) public static TPixel Subtract<TPixel>(TPixel backdrop, TPixel source, float amount)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel dest = default(TPixel); TPixel dest = default(TPixel);
dest.PackFromVector4(Substract(backdrop.ToVector4(), source.ToVector4(), amount)); dest.PackFromVector4(Subtract(backdrop.ToVector4(), source.ToVector4(), amount));
return dest; return dest;
} }

2
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.Generated.tt

@ -83,7 +83,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
GeneratePixelBlender("Normal"); GeneratePixelBlender("Normal");
GeneratePixelBlender("Multiply"); GeneratePixelBlender("Multiply");
GeneratePixelBlender("Add"); GeneratePixelBlender("Add");
GeneratePixelBlender("Substract"); GeneratePixelBlender("Subtract");
GeneratePixelBlender("Screen"); GeneratePixelBlender("Screen");
GeneratePixelBlender("Darken"); GeneratePixelBlender("Darken");
GeneratePixelBlender("Lighten"); GeneratePixelBlender("Lighten");

24
src/ImageSharp/PixelFormats/PixelBlenders/PorterDuffFunctions.cs

@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Source over backdrop /// Source over backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Source multiplied by backdrop /// Source multiplied by backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Source added to backdrop /// Source added to backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -63,14 +63,14 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
} }
/// <summary> /// <summary>
/// Source substracted from backdrop /// Source subtracted from backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector4 Substract(Vector4 backdrop, Vector4 source, float opacity) public static Vector4 Subtract(Vector4 backdrop, Vector4 source, float opacity)
{ {
source.W *= opacity; source.W *= opacity;
return Compose(backdrop, source, Vector4.Max(Vector4.Zero, backdrop - source)); return Compose(backdrop, source, Vector4.Max(Vector4.Zero, backdrop - source));
@ -79,7 +79,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Complement of source multiplied by the complement of backdrop /// Complement of source multiplied by the complement of backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Per element, chooses the smallest value of source and backdrop /// Per element, chooses the smallest value of source and backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -107,7 +107,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Per element, chooses the largest value of source and backdrop /// Per element, chooses the largest value of source and backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Overlays source over backdrop /// Overlays source over backdrop
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -139,7 +139,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// Hard light effect /// Hard light effect
/// </summary> /// </summary>
/// <param name="backdrop">Backgrop color</param> /// <param name="backdrop">Backdrop color</param>
/// <param name="source">Source color</param> /// <param name="source">Source color</param>
/// <param name="opacity">Opacity applied to Source Alpha</param> /// <param name="opacity">Opacity applied to Source Alpha</param>
/// <returns>Output color</returns> /// <returns>Output color</returns>
@ -169,7 +169,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
/// <summary> /// <summary>
/// General composition function for all modes, with a general solution for alpha channel /// General composition function for all modes, with a general solution for alpha channel
/// </summary> /// </summary>
/// <param name="backdrop">Original backgrop color</param> /// <param name="backdrop">Original Backdrop color</param>
/// <param name="source">Original source color</param> /// <param name="source">Original source color</param>
/// <param name="xform">Desired transformed color, without taking Alpha channel in account</param> /// <param name="xform">Desired transformed color, without taking Alpha channel in account</param>
/// <returns>The final color</returns> /// <returns>The final color</returns>

2
tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests.cs

@ -79,7 +79,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
[MemberData(nameof(SubstractFunctionData))] [MemberData(nameof(SubstractFunctionData))]
public void SubstractFunction(TestVector4 back, TestVector4 source, float amount, TestVector4 expected) public void SubstractFunction(TestVector4 back, TestVector4 source, float amount, TestVector4 expected)
{ {
Vector4 actual = PorterDuffFunctions.Substract((Vector4)back, source, amount); Vector4 actual = PorterDuffFunctions.Subtract((Vector4)back, source, amount);
VectorAssert.Equal(expected, actual, 5); VectorAssert.Equal(expected, actual, 5);
} }

2
tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs

@ -151,7 +151,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
public void SubstractFunction<TPixel>(TestPixel<TPixel> back, TestPixel<TPixel> source, float amount, TestPixel<TPixel> expected) public void SubstractFunction<TPixel>(TestPixel<TPixel> back, TestPixel<TPixel> source, float amount, TestPixel<TPixel> expected)
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
TPixel actual = PorterDuffFunctions.Substract((TPixel)back, source, amount); TPixel actual = PorterDuffFunctions.Subtract((TPixel)back, source, amount);
VectorAssert.Equal(expected, actual, 2); VectorAssert.Equal(expected, actual, 2);
} }

Loading…
Cancel
Save