Merge pull request #571 from SixLabors/js/swap-jpeg-decoders

Swap jpeg decoders
SixLabors · May 16, 2018 · d566c27 · d566c27
2 parents dbe2b1b + 711844b
commit d566c27
Show file tree

Hide file tree

Showing 101 changed files with 1,069 additions and 1,088 deletions.
diff --git a/...mageSharp/Formats/Jpeg/Common/Block8x8.cs → ...Sharp/Formats/Jpeg/Components/Block8x8.cs b/...mageSharp/Formats/Jpeg/Common/Block8x8.cs → ...Sharp/Formats/Jpeg/Components/Block8x8.cs
@@ -7,7 +7,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// Represents a Jpeg block with <see cref="short"/> coefficiens.

diff --git a/...p/Formats/Jpeg/Common/Block8x8F.CopyTo.cs → ...rmats/Jpeg/Components/Block8x8F.CopyTo.cs b/...p/Formats/Jpeg/Common/Block8x8F.CopyTo.cs → ...rmats/Jpeg/Components/Block8x8F.CopyTo.cs
@@ -3,10 +3,11 @@
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
+
 using SixLabors.ImageSharp.Memory;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     internal partial struct Block8x8F
     {

diff --git a/...ormats/Jpeg/Common/Block8x8F.Generated.cs → ...ts/Jpeg/Components/Block8x8F.Generated.cs b/...ormats/Jpeg/Common/Block8x8F.Generated.cs → ...ts/Jpeg/Components/Block8x8F.Generated.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 
 // <auto-generated />
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
 	internal partial struct Block8x8F
     {

diff --git a/...ormats/Jpeg/Common/Block8x8F.Generated.tt → ...ts/Jpeg/Components/Block8x8F.Generated.tt b/...ormats/Jpeg/Common/Block8x8F.Generated.tt → ...ts/Jpeg/Components/Block8x8F.Generated.tt
@@ -18,7 +18,7 @@ using System.Runtime.CompilerServices;
 <#
 char[] coordz = {'X', 'Y', 'Z', 'W'};
 #>
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
 	internal partial struct Block8x8F
     {

diff --git a/...ageSharp/Formats/Jpeg/Common/Block8x8F.cs → ...harp/Formats/Jpeg/Components/Block8x8F.cs b/...ageSharp/Formats/Jpeg/Common/Block8x8F.cs → ...harp/Formats/Jpeg/Components/Block8x8F.cs
@@ -9,7 +9,7 @@
 using System.Text;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// Represents a Jpeg block with <see cref="float"/> coefficients.
@@ -100,7 +100,7 @@ public float this[int idx]
             {
                 float val = result[i];
                 val /= value;
-                result[i] = (float)val;
+                result[i] = val;
             }
 
             return result;
@@ -113,7 +113,7 @@ public float this[int idx]
             {
                 float val = result[i];
                 val += value;
-                result[i] = (float)val;
+                result[i] = val;
             }
 
             return result;
@@ -126,7 +126,7 @@ public float this[int idx]
             {
                 float val = result[i];
                 val -= value;
-                result[i] = (float)val;
+                result[i] = val;
             }
 
             return result;
@@ -153,7 +153,7 @@ public static Block8x8F Load(Span<int> data)
         public void Clear()
         {
             // The cheapest way to do this in C#:
-            this = default(Block8x8F);
+            this = default;
         }
 
         /// <summary>

diff --git a/...ormats/Jpeg/Common/Decoder/AdobeMarker.cs → ...ts/Jpeg/Components/Decoder/AdobeMarker.cs b/...ormats/Jpeg/Common/Decoder/AdobeMarker.cs → ...ts/Jpeg/Components/Decoder/AdobeMarker.cs
@@ -4,7 +4,7 @@
 using System;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Provides information about the Adobe marker segment.
@@ -78,7 +78,7 @@ public static bool TryParse(byte[] bytes, out AdobeMarker marker)
                 return true;
             }
 
-            marker = default(AdobeMarker);
+            marker = default;
             return false;
         }
 

diff --git a/...Converters/JpegColorConverter.FromCmyk.cs → ...Converters/JpegColorConverter.FromCmyk.cs b/...Converters/JpegColorConverter.FromCmyk.cs → ...Converters/JpegColorConverter.FromCmyk.cs
@@ -4,18 +4,18 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromCmyk : ColorConverters.JpegColorConverter
+        internal class FromCmyk : JpegColorConverter
         {
             public FromCmyk()
                 : base(JpegColorSpace.Cmyk)
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 // TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
                 ReadOnlySpan<float> cVals = values.Component0;

diff --git a/...rters/JpegColorConverter.FromGrayScale.cs → ...rters/JpegColorConverter.FromGrayScale.cs b/...rters/JpegColorConverter.FromGrayScale.cs → ...rters/JpegColorConverter.FromGrayScale.cs
@@ -4,18 +4,18 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromGrayscale : ColorConverters.JpegColorConverter
+        internal class FromGrayscale : JpegColorConverter
         {
             public FromGrayscale()
                 : base(JpegColorSpace.Grayscale)
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 // TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
                 ReadOnlySpan<float> yVals = values.Component0;

diff --git a/...rConverters/JpegColorConverter.FromRgb.cs → ...rConverters/JpegColorConverter.FromRgb.cs b/...rConverters/JpegColorConverter.FromRgb.cs → ...rConverters/JpegColorConverter.FromRgb.cs
@@ -4,18 +4,18 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromRgb : ColorConverters.JpegColorConverter
+        internal class FromRgb : JpegColorConverter
         {
             public FromRgb()
                 : base(JpegColorSpace.RGB)
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 // TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
                 ReadOnlySpan<float> rVals = values.Component0;

diff --git a/...ters/JpegColorConverter.FromYCbCrBasic.cs → ...ters/JpegColorConverter.FromYCbCrBasic.cs b/...ters/JpegColorConverter.FromYCbCrBasic.cs → ...ters/JpegColorConverter.FromYCbCrBasic.cs
@@ -4,18 +4,18 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromYCbCrBasic : ColorConverters.JpegColorConverter
+        internal class FromYCbCrBasic : JpegColorConverter
         {
             public FromYCbCrBasic()
                 : base(JpegColorSpace.YCbCr)
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 ConvertCore(values, result);
             }

diff --git a/...rters/JpegColorConverter.FromYCbCrSimd.cs → ...rters/JpegColorConverter.FromYCbCrSimd.cs b/...rters/JpegColorConverter.FromYCbCrSimd.cs → ...rters/JpegColorConverter.FromYCbCrSimd.cs
@@ -5,20 +5,21 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+
 using SixLabors.ImageSharp.Common.Tuples;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromYCbCrSimd : ColorConverters.JpegColorConverter
+        internal class FromYCbCrSimd : JpegColorConverter
         {
             public FromYCbCrSimd()
                 : base(JpegColorSpace.YCbCr)
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 int remainder = result.Length % 8;
                 int simdCount = result.Length - remainder;

diff --git a/...s/JpegColorConverter.FromYCbCrSimdAvx2.cs → ...s/JpegColorConverter.FromYCbCrSimdAvx2.cs b/...s/JpegColorConverter.FromYCbCrSimdAvx2.cs → ...s/JpegColorConverter.FromYCbCrSimdAvx2.cs
@@ -5,14 +5,15 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+
 using SixLabors.ImageSharp.Common.Tuples;
 
 // ReSharper disable ImpureMethodCallOnReadonlyValueField
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
-        internal class FromYCbCrSimdAvx2 : ColorConverters.JpegColorConverter
+        internal class FromYCbCrSimdAvx2 : JpegColorConverter
         {
             public FromYCbCrSimdAvx2()
                 : base(JpegColorSpace.YCbCr)
@@ -21,7 +22,7 @@ public FromYCbCrSimdAvx2()
 
             public static bool IsAvailable => Vector.IsHardwareAccelerated && SimdUtils.IsAvx2CompatibleArchitecture;
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 int remainder = result.Length % 8;
                 int simdCount = result.Length - remainder;

diff --git a/...Converters/JpegColorConverter.FromYccK.cs → ...Converters/JpegColorConverter.FromYccK.cs b/...Converters/JpegColorConverter.FromYccK.cs → ...Converters/JpegColorConverter.FromYccK.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     internal abstract partial class JpegColorConverter
     {
@@ -15,7 +15,7 @@ public FromYccK()
             {
             }
 
-            public override void ConvertToRGBA(ComponentValues values, Span<Vector4> result)
+            public override void ConvertToRgba(ComponentValues values, Span<Vector4> result)
             {
                 // TODO: We can optimize a lot here with Vector<float> and SRCS.Unsafe()!
                 ReadOnlySpan<float> yVals = values.Component0;

diff --git a/...der/ColorConverters/JpegColorConverter.cs → ...der/ColorConverters/JpegColorConverter.cs b/...der/ColorConverters/JpegColorConverter.cs → ...der/ColorConverters/JpegColorConverter.cs
@@ -5,10 +5,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+
 using SixLabors.ImageSharp.Common.Tuples;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.ColorConverters
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters
 {
     /// <summary>
     /// Encapsulates the conversion of Jpeg channels to RGBA values packed in <see cref="Vector4"/> buffer.
@@ -55,13 +56,13 @@ public static JpegColorConverter GetConverter(JpegColorSpace colorSpace)
         /// </summary>
         /// <param name="values">The input as a stack-only <see cref="ComponentValues"/> struct</param>
         /// <param name="result">The destination buffer of <see cref="Vector4"/> values</param>
-        public abstract void ConvertToRGBA(ComponentValues values, Span<Vector4> result);
+        public abstract void ConvertToRgba(ComponentValues values, Span<Vector4> result);
 
         /// <summary>
         /// Returns the <see cref="JpegColorConverter"/> for the YCbCr colorspace that matches the current CPU architecture.
         /// </summary>
         private static JpegColorConverter GetYCbCrConverter() =>
-            FromYCbCrSimdAvx2.IsAvailable ? (JpegColorConverter)new FromYCbCrSimdAvx2() : new FromYCbCrSimd();
+            JpegColorConverter.FromYCbCrSimdAvx2.IsAvailable ? (JpegColorConverter)new JpegColorConverter.FromYCbCrSimdAvx2() : new JpegColorConverter.FromYCbCrSimd();
 
         /// <summary>
         /// A stack-only struct to reference the input buffers using <see cref="ReadOnlySpan{T}"/>-s.

diff --git a/...ats/Jpeg/Common/Decoder/IJpegComponent.cs → ...Jpeg/Components/Decoder/IJpegComponent.cs b/...ats/Jpeg/Common/Decoder/IJpegComponent.cs → ...Jpeg/Components/Decoder/IJpegComponent.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Common interface to represent raw Jpeg components.

diff --git a/...rmats/Jpeg/Common/Decoder/IRawJpegData.cs → ...s/Jpeg/Components/Decoder/IRawJpegData.cs b/...rmats/Jpeg/Common/Decoder/IRawJpegData.cs → ...s/Jpeg/Components/Decoder/IRawJpegData.cs
@@ -1,13 +1,16 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Collections.Generic;
 
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <inheritdoc />
     /// <summary>
-    /// Represents decompressed, unprocessed jpeg data with spectral space <see cref="T:SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder.IJpegComponent" />-s.
+    /// Represents decompressed, unprocessed jpeg data with spectral space <see cref="IJpegComponent" />-s.
     /// </summary>
     internal interface IRawJpegData : IDisposable
     {

diff --git a/...Formats/Jpeg/Common/Decoder/JFifMarker.cs → ...ats/Jpeg/Components/Decoder/JFifMarker.cs b/...Formats/Jpeg/Common/Decoder/JFifMarker.cs → ...ats/Jpeg/Components/Decoder/JFifMarker.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Provides information about the JFIF marker segment

diff --git a/.../Common/Decoder/JpegBlockPostProcessor.cs → ...ponents/Decoder/JpegBlockPostProcessor.cs b/.../Common/Decoder/JpegBlockPostProcessor.cs → ...ponents/Decoder/JpegBlockPostProcessor.cs
@@ -2,10 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.InteropServices;
+
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Encapsulates the implementation of processing "raw" <see cref="IBuffer{T}"/>-s into Jpeg image channels.

diff --git a/...ats/Jpeg/Common/Decoder/JpegColorSpace.cs → ...Jpeg/Components/Decoder/JpegColorSpace.cs b/...ats/Jpeg/Common/Decoder/JpegColorSpace.cs → ...Jpeg/Components/Decoder/JpegColorSpace.cs
@@ -1,4 +1,7 @@
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Identifies the colorspace of a Jpeg image

diff --git a/...mon/Decoder/JpegComponentPostProcessor.cs → ...nts/Decoder/JpegComponentPostProcessor.cs b/...mon/Decoder/JpegComponentPostProcessor.cs → ...nts/Decoder/JpegComponentPostProcessor.cs
@@ -1,8 +1,12 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
+
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Encapsulates postprocessing data for one component for <see cref="JpegImagePostProcessor"/>.