Merge pull request #1050 from Sergio0694/feature/public-vector4-conversions

JimBobSquarePants · web-flow · commit 7fcefa65bb9f · 2019-12-18T00:13:47.000+11:00
Public Vector4 to/from conversions
diff --git a/src/ImageSharp/PixelFormats/PixelConversionModifiers.cs b/src/ImageSharp/PixelFormats/PixelConversionModifiers.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.PixelFormats
     /// knowing the pixel type.
     /// </summary>
     [Flags]
-    internal enum PixelConversionModifiers
+    public enum PixelConversionModifiers
     {
         /// <summary>
         /// No special operation is selected
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Argb32.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -42,13 +43,13 @@ internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Argb32
             }
 
             /// <inheritdoc />
-            internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)
+            public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale));
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
+            public override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale));
             }
@@ -284,6 +285,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToArgb32(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgr24.PixelOperations.Generated.cs
@@ -43,13 +43,13 @@ internal override void ToBgr24(Configuration configuration, ReadOnlySpan<Bgr24>
             }
 
             /// <inheritdoc />
-            internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)
+            public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale | PixelConversionModifiers.Premultiply));
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
+            public override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale | PixelConversionModifiers.Premultiply));
             }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra32.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -42,13 +43,13 @@ internal override void ToBgra32(Configuration configuration, ReadOnlySpan<Bgra32
             }
 
             /// <inheritdoc />
-            internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgra32> destPixels, PixelConversionModifiers modifiers)
+            public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgra32> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale));
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
+            public override void ToVector4(Configuration configuration, ReadOnlySpan<Bgra32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale));
             }
@@ -284,6 +285,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToBgra32(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra5551.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Bgra5551.PixelOperations.Generated.cs
@@ -11,7 +11,6 @@
 using System.Runtime.InteropServices;
 
 
-
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -248,7 +247,6 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToBgra5551(configuration, sourcePixels, destinationPixels);
             }
-
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb24.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -42,13 +43,13 @@ internal override void ToRgb24(Configuration configuration, ReadOnlySpan<Rgb24>
             }
 
             /// <inheritdoc />
-            internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Rgb24> destPixels, PixelConversionModifiers modifiers)
+            public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Rgb24> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale | PixelConversionModifiers.Premultiply));
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
+            public override void ToVector4(Configuration configuration, ReadOnlySpan<Rgb24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale | PixelConversionModifiers.Premultiply));
             }
@@ -258,6 +259,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToRgb24(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgb48.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -247,6 +248,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToRgb48(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba32.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -273,6 +274,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToRgba32(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/Rgba64.PixelOperations.Generated.cs
@@ -11,6 +11,7 @@
 using System.Runtime.InteropServices;
 
 
+
 namespace SixLabors.ImageSharp.PixelFormats
 {
     /// <content>
@@ -247,6 +248,7 @@ internal override void From<TSourcePixel>(
             {
                 PixelOperations<TSourcePixel>.Instance.ToRgba64(configuration, sourcePixels, destinationPixels);
             }
+
         }
     }
 }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude b/src/ImageSharp/PixelFormats/PixelImplementations/Generated/_Common.ttinclude
@@ -130,13 +130,13 @@ using System.Runtime.InteropServices;
            }
 #>
             /// <inheritdoc />
-            internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)
+            public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(<#=removeTheseModifiers#>));
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
+            public override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)
             {
                 Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(<#=removeTheseModifiers#>));
             }
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/Rgba32.PixelOperations.cs b/src/ImageSharp/PixelFormats/PixelImplementations/Rgba32.PixelOperations.cs
@@ -20,7 +20,7 @@ public partial struct Rgba32
         internal partial class PixelOperations : PixelOperations<Rgba32>
         {
             /// <inheritdoc />
-            internal override void ToVector4(
+            public override void ToVector4(
                 Configuration configuration,
                 ReadOnlySpan<Rgba32> sourcePixels,
                 Span<Vector4> destVectors,
@@ -36,7 +36,7 @@ internal override void ToVector4(
             }
 
             /// <inheritdoc />
-            internal override void FromVector4Destructive(
+            public override void FromVector4Destructive(
                 Configuration configuration,
                 Span<Vector4> sourceVectors,
                 Span<Rgba32> destPixels,
@@ -52,4 +52,4 @@ internal override void FromVector4Destructive(
             }
         }
     }
-}
+}
diff --git a/src/ImageSharp/PixelFormats/PixelImplementations/RgbaVector.PixelOperations.cs b/src/ImageSharp/PixelFormats/PixelImplementations/RgbaVector.PixelOperations.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -21,7 +21,7 @@ public partial struct RgbaVector
         internal class PixelOperations : PixelOperations<RgbaVector>
         {
             /// <inheritdoc />
-            internal override void FromVector4Destructive(
+            public override void FromVector4Destructive(
                 Configuration configuration,
                 Span<Vector4> sourceVectors,
                 Span<RgbaVector> destinationColors,
@@ -34,7 +34,7 @@ internal override void FromVector4Destructive(
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(
+            public override void ToVector4(
                 Configuration configuration,
                 ReadOnlySpan<RgbaVector> sourcePixels,
                 Span<Vector4> destVectors,
diff --git a/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.cs b/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -34,7 +34,7 @@ public partial class PixelOperations<TPixel>
         /// <param name="sourceVectors">The <see cref="Span{T}"/> to the source vectors.</param>
         /// <param name="destPixels">The <see cref="Span{T}"/> to the destination colors.</param>
         /// <param name="modifiers">The <see cref="PixelConversionModifiers"/> to apply during the conversion</param>
-        internal virtual void FromVector4Destructive(
+        public virtual void FromVector4Destructive(
             Configuration configuration,
             Span<Vector4> sourceVectors,
             Span<TPixel> destPixels,
@@ -56,8 +56,11 @@ internal virtual void FromVector4Destructive(
         /// <param name="configuration">A <see cref="Configuration"/> to configure internal operations</param>
         /// <param name="sourceVectors">The <see cref="Span{T}"/> to the source vectors.</param>
         /// <param name="destPixels">The <see cref="Span{T}"/> to the destination colors.</param>
-        internal void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<TPixel> destPixels) =>
-            this.FromVector4Destructive(configuration, sourceVectors, destPixels, PixelConversionModifiers.None);
+        public void FromVector4Destructive(
+            Configuration configuration,
+            Span<Vector4> sourceVectors,
+            Span<TPixel> destPixels)
+            => this.FromVector4Destructive(configuration, sourceVectors, destPixels, PixelConversionModifiers.None);
 
         /// <summary>
         /// Bulk version of <see cref="IPixel.ToVector4()"/> converting 'sourceColors.Length' pixels into 'destinationVectors'.
@@ -66,7 +69,7 @@ internal void FromVector4Destructive(Configuration configuration, Span<Vector4>
         /// <param name="sourcePixels">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destVectors">The <see cref="Span{T}"/> to the destination vectors.</param>
         /// <param name="modifiers">The <see cref="PixelConversionModifiers"/> to apply during the conversion</param>
-        internal virtual void ToVector4(
+        public virtual void ToVector4(
             Configuration configuration,
             ReadOnlySpan<TPixel> sourcePixels,
             Span<Vector4> destVectors,
@@ -83,11 +86,11 @@ internal virtual void ToVector4(
         /// <param name="configuration">A <see cref="Configuration"/> to configure internal operations</param>
         /// <param name="sourcePixels">The <see cref="Span{T}"/> to the source colors.</param>
         /// <param name="destVectors">The <see cref="Span{T}"/> to the destination vectors.</param>
-        internal virtual void ToVector4(
+        public void ToVector4(
             Configuration configuration,
             ReadOnlySpan<TPixel> sourcePixels,
-            Span<Vector4> destVectors) =>
-            this.ToVector4(configuration, sourcePixels, destVectors, PixelConversionModifiers.None);
+            Span<Vector4> destVectors)
+            => this.ToVector4(configuration, sourcePixels, destVectors, PixelConversionModifiers.None);
 
         internal virtual void From<TSourcePixel>(
             Configuration configuration,

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.PixelFormats`
`15`	`15`	`/// knowing the pixel type.`
`16`	`16`	`/// </summary>`
`17`	`17`	`[Flags]`
`18`		`- internal enum PixelConversionModifiers`
	`18`	`+ public enum PixelConversionModifiers`
`19`	`19`	`{`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// No special operation is selected`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using System.Runtime.InteropServices;`
`12`	`12`
`13`	`13`
	`14`	`+`
`14`	`15`	`namespace SixLabors.ImageSharp.PixelFormats`
`15`	`16`	`{`
`16`	`17`	`/// <content>`
`@@ -42,13 +43,13 @@ internal override void ToArgb32(Configuration configuration, ReadOnlySpan<Argb32`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`/// <inheritdoc />`
`45`		`- internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)`
	`46`	`+ public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Argb32> destPixels, PixelConversionModifiers modifiers)`
`46`	`47`	`{`
`47`	`48`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale));`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`/// <inheritdoc />`
`51`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
	`52`	`+ public override void ToVector4(Configuration configuration, ReadOnlySpan<Argb32> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`52`	`53`	`{`
`53`	`54`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale));`
`54`	`55`	`}`
`@@ -284,6 +285,7 @@ internal override void From<TSourcePixel>(`
`284`	`285`	`{`
`285`	`286`	`PixelOperations<TSourcePixel>.Instance.ToArgb32(configuration, sourcePixels, destinationPixels);`
`286`	`287`	`}`
	`288`	`+`
`287`	`289`	`}`
`288`	`290`	`}`
`289`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ internal override void ToBgr24(Configuration configuration, ReadOnlySpan<Bgr24>`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/// <inheritdoc />`
`46`		`- internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)`
	`46`	`+ public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<Bgr24> destPixels, PixelConversionModifiers modifiers)`
`47`	`47`	`{`
`48`	`48`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(PixelConversionModifiers.Scale \| PixelConversionModifiers.Premultiply));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/// <inheritdoc />`
`52`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
	`52`	`+ public override void ToVector4(Configuration configuration, ReadOnlySpan<Bgr24> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`53`	`53`	`{`
`54`	`54`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(PixelConversionModifiers.Scale \| PixelConversionModifiers.Premultiply));`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`using System.Runtime.InteropServices;`
`12`	`12`
`13`	`13`
`14`		`-`
`15`	`14`	`namespace SixLabors.ImageSharp.PixelFormats`
`16`	`15`	`{`
`17`	`16`	`/// <content>`
`@@ -248,7 +247,6 @@ internal override void From<TSourcePixel>(`
`248`	`247`	`{`
`249`	`248`	`PixelOperations<TSourcePixel>.Instance.ToBgra5551(configuration, sourcePixels, destinationPixels);`
`250`	`249`	`}`
`251`		`-`
`252`	`250`	`}`
`253`	`251`	`}`
`254`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,13 @@ using System.Runtime.InteropServices;`
`130`	`130`	`}`
`131`	`131`	`#>`
`132`	`132`	`/// <inheritdoc />`
`133`		`- internal override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)`
	`133`	`+ public override void FromVector4Destructive(Configuration configuration, Span<Vector4> sourceVectors, Span<<#=pixelType#>> destPixels, PixelConversionModifiers modifiers)`
`134`	`134`	`{`
`135`	`135`	`Vector4Converters.RgbaCompatible.FromVector4(configuration, this, sourceVectors, destPixels, modifiers.Remove(<#=removeTheseModifiers#>));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/// <inheritdoc />`
`139`		`- internal override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
	`139`	`+ public override void ToVector4(Configuration configuration, ReadOnlySpan<<#=pixelType#>> sourcePixels, Span<Vector4> destVectors, PixelConversionModifiers modifiers)`
`140`	`140`	`{`
`141`	`141`	`Vector4Converters.RgbaCompatible.ToVector4(configuration, this, sourcePixels, destVectors, modifiers.Remove(<#=removeTheseModifiers#>));`
`142`	`142`	`}`