Move common components

src/ImageSharp/Formats/Jpeg/Common/Block8x8.cs → src/ImageSharp/Formats/Jpeg/Components/Block8x8.cs

@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 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.

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.CopyTo.cs → src/ImageSharp/Formats/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
     {

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs → src/ImageSharp/Formats/Jpeg/Components/Block8x8F.Generated.cs

@@ -5,7 +5,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 
 // <auto-generated />
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
 	internal partial struct Block8x8F
     {

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt → src/ImageSharp/Formats/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
     {

src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs → src/ImageSharp/Formats/Jpeg/Components/Block8x8F.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 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.
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
     internal partial struct Block8x8F
     {
         /// <summary>
-        /// A number of scalar coefficients in a <see cref="Block8x8F"/>
+        /// A number of scalar coefficients in a <see cref="Components.Block8x8F"/>
         /// </summary>
         public const int Size = 64;
 
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             get
             {
                 GuardBlockIndex(idx);
-                ref float selfRef = ref Unsafe.As<Block8x8F, float>(ref this);
+                ref float selfRef = ref Unsafe.As<Components.Block8x8F, float>(ref this);
                 return Unsafe.Add(ref selfRef, idx);
             }
 
@@ -69,7 +69,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             set
             {
                 GuardBlockIndex(idx);
-                ref float selfRef = ref Unsafe.As<Block8x8F, float>(ref this);
+                ref float selfRef = ref Unsafe.As<Components.Block8x8F, float>(ref this);
                 Unsafe.Add(ref selfRef, idx) = value;
             }
         }
@@ -80,9 +80,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             set => this[(y * 8) + x] = value;
         }
 
-        public static Block8x8F operator *(Block8x8F block, float value)
+        public static Components.Block8x8F operator *(Components.Block8x8F block, float value)
         {
-            Block8x8F result = block;
+            Components.Block8x8F result = block;
             for (int i = 0; i < Size; i++)
             {
                 float val = result[i];
@@ -93,9 +93,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             return result;
         }
 
-        public static Block8x8F operator /(Block8x8F block, float value)
+        public static Components.Block8x8F operator /(Components.Block8x8F block, float value)
         {
-            Block8x8F result = block;
+            Components.Block8x8F result = block;
             for (int i = 0; i < Size; i++)
             {
                 float val = result[i];
@@ -106,9 +106,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             return result;
         }
 
-        public static Block8x8F operator +(Block8x8F block, float value)
+        public static Components.Block8x8F operator +(Components.Block8x8F block, float value)
         {
-            Block8x8F result = block;
+            Components.Block8x8F result = block;
             for (int i = 0; i < Size; i++)
             {
                 float val = result[i];
@@ -119,9 +119,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             return result;
         }
 
-        public static Block8x8F operator -(Block8x8F block, float value)
+        public static Components.Block8x8F operator -(Components.Block8x8F block, float value)
         {
-            Block8x8F result = block;
+            Components.Block8x8F result = block;
             for (int i = 0; i < Size; i++)
             {
                 float val = result[i];
@@ -132,16 +132,16 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
             return result;
         }
 
-        public static Block8x8F Load(Span<float> data)
+        public static Components.Block8x8F Load(Span<float> data)
         {
-            var result = default(Block8x8F);
+            var result = default(Components.Block8x8F);
             result.LoadFrom(data);
             return result;
         }
 
-        public static Block8x8F Load(Span<int> data)
+        public static Components.Block8x8F Load(Span<int> data)
         {
-            var result = default(Block8x8F);
+            var result = default(Components.Block8x8F);
             result.LoadFrom(data);
             return result;
         }
@@ -153,7 +153,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void Clear()
         {
             // The cheapest way to do this in C#:
-            this = default(Block8x8F);
+            this = default(Components.Block8x8F);
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void LoadFrom(Span<float> source)
         {
             ref byte s = ref Unsafe.As<float, byte>(ref MemoryMarshal.GetReference(source));
-            ref byte d = ref Unsafe.As<Block8x8F, byte>(ref this);
+            ref byte d = ref Unsafe.As<Components.Block8x8F, byte>(ref this);
 
             Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));
         }
@@ -175,7 +175,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// <param name="blockPtr">Block pointer</param>
         /// <param name="source">Source</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void LoadFrom(Block8x8F* blockPtr, Span<float> source)
+        public static unsafe void LoadFrom(Components.Block8x8F* blockPtr, Span<float> source)
         {
             blockPtr->LoadFrom(source);
         }
@@ -204,7 +204,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         public void CopyTo(Span<float> dest)
         {
             ref byte d = ref Unsafe.As<float, byte>(ref MemoryMarshal.GetReference(dest));
-            ref byte s = ref Unsafe.As<Block8x8F, byte>(ref this);
+            ref byte s = ref Unsafe.As<Components.Block8x8F, byte>(ref this);
 
             Unsafe.CopyBlock(ref d, ref s, Size * sizeof(float));
         }
@@ -215,7 +215,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// <param name="blockPtr">Pointer to block</param>
         /// <param name="dest">Destination</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void CopyTo(Block8x8F* blockPtr, Span<byte> dest)
+        public static unsafe void CopyTo(Components.Block8x8F* blockPtr, Span<byte> dest)
         {
             float* fPtr = (float*)blockPtr;
             for (int i = 0; i < Size; i++)
@@ -231,7 +231,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// <param name="blockPtr">Block pointer</param>
         /// <param name="dest">Destination</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void CopyTo(Block8x8F* blockPtr, Span<float> dest)
+        public static unsafe void CopyTo(Components.Block8x8F* blockPtr, Span<float> dest)
         {
             blockPtr->CopyTo(dest);
         }
@@ -301,7 +301,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// Multiply all elements of the block by the corresponding elements of 'other'
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void MultiplyInplace(ref Block8x8F other)
+        public void MultiplyInplace(ref Components.Block8x8F other)
         {
             this.V0L *= other.V0L;
             this.V0R *= other.V0R;
@@ -353,7 +353,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// <param name="qtPtr">Qt pointer</param>
         /// <param name="unzigPtr">Unzig pointer</param>
         // [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void DequantizeBlock(Block8x8F* blockPtr, Block8x8F* qtPtr, byte* unzigPtr)
+        public static unsafe void DequantizeBlock(Components.Block8x8F* blockPtr, Components.Block8x8F* qtPtr, byte* unzigPtr)
         {
             float* b = (float*)blockPtr;
             float* qtp = (float*)qtPtr;
@@ -378,9 +378,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// <param name="qt">The quantization table</param>
         /// <param name="unzigPtr">Pointer to elements of <see cref="ZigZag"/></param>
         public static unsafe void Quantize(
-            Block8x8F* block,
+            Components.Block8x8F* block,
-            Block8x8F* dest,
+            Components.Block8x8F* dest,
-            Block8x8F* qt,
+            Components.Block8x8F* qt,
             byte* unzigPtr)
         {
             float* s = (float*)block;
@@ -399,7 +399,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         /// </summary>
         /// <param name="destination">The destination block.</param>
         /// <param name="source">The source block.</param>
-        public static unsafe void Scale16X16To8X8(Block8x8F* destination, Block8x8F* source)
+        public static unsafe void Scale16X16To8X8(Components.Block8x8F* destination, Components.Block8x8F* source)
         {
             float* d = (float*)destination;
             for (int i = 0; i < 4; i++)
@@ -421,7 +421,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void DivideRoundAll(ref Block8x8F a, ref Block8x8F b)
+        private static void DivideRoundAll(ref Components.Block8x8F a, ref Components.Block8x8F b)
         {
             a.V0L = DivideRound(a.V0L, b.V0L);
             a.V0R = DivideRound(a.V0R, b.V0R);

src/ImageSharp/Formats/Jpeg/Components/Decoder/IJpegComponent.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 

src/ImageSharp/Formats/Jpeg/Components/Decoder/IRawJpegData.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs

@@ -3,7 +3,6 @@
 
 using System.Runtime.InteropServices;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 

src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponentPostProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;
 

src/ImageSharp/Formats/Jpeg/Components/Encoder/BlockQuad.cs

@@ -1,12 +1,10 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using Block8x8F = SixLabors.ImageSharp.Formats.Jpeg.Common.Block8x8F;
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     /// <summary>
-    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Common.Block8x8F"/> instances.
+    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
     /// Useful for decoder/encoder operations allocating a block for each Jpeg component.
     /// </summary>
     internal unsafe struct BlockQuad

src/ImageSharp/Formats/Jpeg/Components/Encoder/YCbCrForwardConverter{TPixel}.cs

@@ -2,7 +2,6 @@
 using System.Runtime.CompilerServices;
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder

src/ImageSharp/Formats/Jpeg/Common/FastFloatingPointDCT.cs → src/ImageSharp/Formats/Jpeg/Components/FastFloatingPointDCT.cs

@@ -5,7 +5,7 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// Contains inaccurate, but fast forward and inverse DCT implementations.

src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.cs → src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.Generated.cs

@@ -1,11 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
 // <auto-generated />
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
 	internal unsafe partial struct GenericBlock8x8<T>
     {

src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.Generated.tt → src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.Generated.tt

@@ -11,11 +11,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
 // <auto-generated />
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
 	internal unsafe partial struct GenericBlock8x8<T>
     {

src/ImageSharp/Formats/Jpeg/Common/GenericBlock8x8.cs → src/ImageSharp/Formats/Jpeg/Components/GenericBlock8x8.cs

@@ -1,13 +1,16 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
 
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// A generic 8x8 block implementation, useful for manipulating custom 8x8 pixel data.

src/ImageSharp/Formats/Jpeg/Common/SizeExtensions.cs → src/ImageSharp/Formats/Jpeg/Components/SizeExtensions.cs

@@ -3,9 +3,10 @@
 
 using System;
 using System.Numerics;
+
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// Extension methods for <see cref="Size"/>

src/ImageSharp/Formats/Jpeg/Common/ZigZag.cs → src/ImageSharp/Formats/Jpeg/Components/ZigZag.cs

@@ -1,10 +1,11 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.Common
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components
 {
     /// <summary>
     /// Holds the Jpeg UnZig array in a value/stack type.

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs

@@ -5,8 +5,6 @@ using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
-
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs

@@ -3,7 +3,8 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs

@@ -2,7 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.DataPointers.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
     internal unsafe partial struct GolangJpegScanDecoder
     {
         /// <summary>
-        /// Contains pointers to the memory regions of <see cref="ComputationData"/> so they can be easily passed around to pointer based utility methods of <see cref="Block8x8F"/>
+        /// Contains pointers to the memory regions of <see cref="ComputationData"/> so they can be easily passed around to pointer based utility methods of <see cref="Jpeg.Components.Block8x8F"/>
         /// </summary>
         public struct DataPointers
         {

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.cs

@@ -3,7 +3,8 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
@@ -558,7 +559,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 
                 if (bit)
                 {
-                    int stuff = (int)Block8x8.GetScalarAt(b, 0);
+                    int stuff = Block8x8.GetScalarAt(b, 0);
 
                     // int stuff = (int)b[0];
                     stuff |= delta;

src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs

@@ -3,7 +3,8 @@
 
 using System.Collections.Generic;
 using System.IO;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
 using SixLabors.ImageSharp.MetaData;

src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs

@@ -3,9 +3,9 @@
 
 using System.IO;
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;

src/ImageSharp/Formats/Jpeg/JpegFormat.cs

@@ -3,8 +3,6 @@
 
 using System.Collections.Generic;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
-
 namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>

src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs

@@ -4,7 +4,8 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.Primitives;

src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs

@@ -7,7 +7,8 @@ using System.Diagnostics;
 #endif
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 {

src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs

@@ -7,7 +7,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
 using SixLabors.ImageSharp.Memory;

src/ImageSharp/ImageSharp.csproj

@@ -57,11 +57,11 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <None Update="Formats\Jpeg\Common\Block8x8F.Generated.tt">
+    <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
     </None>
-    <None Update="Formats\Jpeg\Common\GenericBlock8x8.Generated.tt">
+    <None Update="Formats\Jpeg\Components\GenericBlock8x8.Generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>GenericBlock8x8.Generated.cs</LastGenOutput>
     </None>
@@ -87,12 +87,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Formats\Jpeg\Common\Block8x8F.Generated.cs">
+    <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Formats\Jpeg\Common\GenericBlock8x8.Generated.cs">
+    <Compile Update="Formats\Jpeg\Components\GenericBlock8x8.Generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>GenericBlock8x8.Generated.tt</DependentUpon>
@@ -123,4 +123,7 @@
       <DependentUpon>PorterDuffFunctions.Generated.tt</DependentUpon>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
 </Project>

tests/ImageSharp.Benchmarks/Color/RgbToYCbCr.cs

@@ -1,13 +1,12 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Buffers;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -104,14 +103,14 @@ namespace SixLabors.ImageSharp.Benchmarks
                 }
             }
         }
-        
+
         public struct Result
         {
             internal Block8x8F Y;
             internal Block8x8F Cb;
             internal Block8x8F Cr;
         }
-        
+
         // The operation is defined as "RGBA -> YCbCr Transform a stream of bytes into a stream of floats"
         // We need to benchmark the whole operation, to get true results, not missing any side effects!
         private byte[] inputSourceRGB = null;
@@ -200,11 +199,11 @@ namespace SixLabors.ImageSharp.Benchmarks
             float* cbPtr = (float*)&result.Cb;
             float* crPtr = (float*)&result.Cr;
             // end of code-bloat block :)
-            
+
             Vector<int> yCoeffs = new Vector<int>(ScaledCoeffs.Y);
             Vector<int> cbCoeffs = new Vector<int>(ScaledCoeffs.Cb);
             Vector<int> crCoeffs = new Vector<int>(ScaledCoeffs.Cr);
-            
+
             for (int i = 0; i < this.inputSourceRGB.Length; i++)
             {
                 this.inputSourceRGBAsInteger[i] = this.inputSourceRGB[i];
@@ -217,7 +216,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 Vector<int> y = yCoeffs * rgb;
                 Vector<int> cb = cbCoeffs * rgb;
                 Vector<int> cr = crCoeffs * rgb;
-                
+
                 *yPtr++ = (y[0] + y[1] + y[2]) >> 10;
                 *cbPtr++ = 128 + ((cb[0] - cb[1] + cb[2]) >> 10);
                 *crPtr++ = 128 + ((cr[0] - cr[1] - cr[2]) >> 10);
@@ -335,7 +334,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 *crPtr++ = 128 + ((cr0 - cr1 - cr2) >> 10);
             }
         }
-        
+
         [Benchmark(Description = "Scaled Integer LUT Conversion")]
         public unsafe void RgbaToYcbCrScaledIntegerLut()
         {

tests/ImageSharp.Benchmarks/General/Block8x8F_DivideRound.cs

@@ -5,7 +5,9 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
+
 // ReSharper disable InconsistentNaming
 
 namespace SixLabors.ImageSharp.Benchmarks.General

tests/ImageSharp.Benchmarks/General/Block8x8F_Round.cs

@@ -6,8 +6,7 @@ using System.Runtime.CompilerServices;
 
 using BenchmarkDotNet.Attributes;
 
-using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 
 namespace SixLabors.ImageSharp.Benchmarks.General
 {

tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs

@@ -4,7 +4,7 @@
 // Uncomment this to turn unit tests into benchmarks:
 //#define BENCHMARKING
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 using SixLabors.Primitives;

tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

@@ -7,7 +7,7 @@
 using System;
 using System.Diagnostics;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs

@@ -1,7 +1,7 @@
 // ReSharper disable InconsistentNaming
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 var temp = default(Block8x8F);
                 var actual = default(Block8x8F);
                 FastFloatingPointDCT.TransformIDCT(ref source, ref actual, ref temp);
-                
+
                 this.CompareBlocks(expected, actual, 1f);
             }
 

tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.PixelFormats;
 
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs

@@ -2,8 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Text;
-
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;

tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs

@@ -1,4 +1,7 @@
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs

@@ -1,8 +1,8 @@
-// ReSharper disable InconsistentNaming
+// Copyright (c) Six Labors and contributors.
-
+// Licensed under the Apache License, Version 2.0.
-using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+// ReSharper disable InconsistentNaming
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;
@@ -36,13 +36,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 this.CompareBlocks(original, src, 0.1f);
             }
-            
+
             // [Fact]
             public void LLM_CalcConstants()
             {
                 ReferenceImplementations.LLM_FloatingPoint_DCT.PrintConstants(this.Output);
             }
-            
+
             [Theory]
             [InlineData(42, 1000)]
             [InlineData(1, 1000)]
@@ -76,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 Block8x8F fExpected = iExpected.AsFloatBlock();
 
                 Block8x8F fActual = ReferenceImplementations.LLM_FloatingPoint_DCT.TransformIDCT(ref fSource);
-                
+
                 this.CompareBlocks(fExpected, fActual, 2);
             }
 
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 ReferenceImplementations.AccurateDCT.TransformIDCTInplace(intData);
 
                 float[] dest = new float[64];
-                
+
                 ReferenceImplementations.GT_FloatingPoint_DCT.iDCT8x8GT(floatSrc, dest);
 
                 this.CompareBlocks(intData.ConvertAllToFloat(), dest, 1f);

tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs

@@ -9,7 +9,7 @@ using System.IO;
 using System.Text;
 
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 
 using Xunit;
@@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                     double val = rnd.NextDouble();
                     val *= maxValue - minValue;
                     val += minValue;
-                    
+
                     result[i * 8 + j] = (float)val;
                 }
             }
@@ -147,7 +147,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
         internal void CompareBlocks(Block8x8 a, Block8x8 b, int tolerance) =>
             this.CompareBlocks(a.AsFloatBlock(), b.AsFloatBlock(), (float)tolerance + 1e-5f);
 
-        internal void CompareBlocks(Block8x8F a, Block8x8F b, float tolerance) 
+        internal void CompareBlocks(Block8x8F a, Block8x8F b, float tolerance)
             => this.CompareBlocks(a.ToArray(), b.ToArray(), tolerance);
 
         internal void CompareBlocks(Span<float> a, Span<float> b, float tolerance)
@@ -170,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 }
             }
 
-            this.Output.WriteLine("TOTAL DIFF: "+totalDifference);
+            this.Output.WriteLine("TOTAL DIFF: " + totalDifference);
             Assert.False(failed);
         }
 

tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs

@@ -1,3 +1,4 @@
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.PixelFormats;
 
@@ -7,7 +8,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
     using System.Linq;
     using System.Numerics;
 
-    using SixLabors.ImageSharp.Formats.Jpeg.Common;
     using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
     using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
     using SixLabors.ImageSharp.Memory;

tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs

@@ -1,8 +1,11 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Linq;
 using System.Numerics;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;

tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Numerics;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {
@@ -66,14 +66,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 
             string args = $@"""{sourceFile}"" ""{destFile}""";
             var process = new Process
-                              {
+            {
-                                  StartInfo =
+                StartInfo =
                                       {
                                           FileName = DumpToolFullPath,
                                           Arguments = args,
                                           WindowStyle = ProcessWindowStyle.Hidden
                                       }
-                              };
+            };
             process.Start();
             process.WaitForExit();
         }

tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.AccurateDCT.cs

@@ -1,6 +1,6 @@
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {

tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs

@@ -3,7 +3,7 @@ using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 using Xunit.Abstractions;
 
@@ -520,7 +520,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 y[1] = c0 + c3;
                 y[7] = c0 - c3;
             }
-            
+
             internal static void fDCT2D_llm(
                 Span<float> s,
                 Span<float> d,

tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.StandardIntegerDCT.cs

@@ -1,7 +1,7 @@
 // ReSharper disable InconsistentNaming
 using System;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 result.LoadFrom(temp);
                 return result;
             }
-            
+
             /// <summary>
             /// Performs a forward DCT on an 8x8 block of coefficients, including a level shift.
             /// Leave results scaled up by an overall factor of 8.

tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.cs

@@ -6,7 +6,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Common;
+using SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {