From b6d4f352d9ef1b422787bc5a2cb2aac5b598fa83 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sat, 19 Aug 2017 00:35:18 +0200 Subject: [PATCH] GolangPort namespaces following folder structure --- src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs | 2 ++ .../Formats/Jpeg/GolangPort/Components/BlockQuad.cs | 4 +++- src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs | 4 +++- .../Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs | 2 +- .../Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/Component.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/ComponentScan.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs | 4 ++-- .../GolangPort/Components/Decoder/DecoderErrorCode.cs | 2 +- .../GolangPort/Components/Decoder/DecoderThrowHelper.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/EOFException.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/InputProcessor.cs | 2 +- .../GolangPort/Components/Decoder/JpegBlockProcessor.cs | 4 ++-- .../Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs | 4 +++- .../Decoder/JpegScanDecoder.ComputationData.cs | 4 +++- .../Components/Decoder/JpegScanDecoder.DataPointers.cs | 4 +++- .../GolangPort/Components/Decoder/JpegScanDecoder.cs | 4 ++-- .../Components/Decoder/MissingFF00Exception.cs | 2 +- .../Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs | 4 ++-- .../GolangPort/Components/Decoder/YCbCrToRgbTables.cs | 3 ++- .../Jpeg/GolangPort/Components/Encoder/HuffIndex.cs | 2 +- .../Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs | 2 +- .../Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs | 2 +- .../Jpeg/GolangPort/Components/Encoder/QuantIndex.cs | 2 +- .../GolangPort/Components/Encoder/RgbToYCbCrTables.cs | 2 +- src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs | 2 +- .../Formats/Jpeg/GolangPort/JpegDecoderCore.cs | 4 ++-- .../Formats/Jpeg/GolangPort/JpegEncoderCore.cs | 9 +++++---- .../Formats/Jpeg/GolangPort/Utils/JpegUtils.cs | 3 +-- .../Formats/Jpeg/GolangPort/Utils/MutableSpan.cs | 2 +- .../Jpeg/GolangPort/Utils/MutableSpanExtensions.cs | 2 +- src/ImageSharp/Formats/Jpeg/JpegEncoder.cs | 1 + src/ImageSharp/Formats/Jpeg/JpegFormat.cs | 2 ++ tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs | 1 + tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs | 2 ++ tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs | 2 +- .../Formats/Jpg/JpegUtilityTestFixture.cs | 1 + tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs | 1 + .../Formats/Jpg/ReferenceImplementations.cs | 1 + .../Formats/Jpg/ReferenceImplementationsTests.cs | 1 + tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs | 1 + 42 files changed, 65 insertions(+), 41 deletions(-) diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs index 130b5856c..2b8cb0f72 100644 --- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs +++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs @@ -11,6 +11,8 @@ namespace ImageSharp.Formats.Jpg using System.Runtime.CompilerServices; using System.Runtime.InteropServices; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; + /// /// DCT code Ported from https://github.com/norishigefukushima/dct_simd /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs index 63453da21..1bb66d6a9 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs @@ -2,8 +2,10 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg.Components +namespace ImageSharp.Formats.Jpeg.GolangPort.Components { + using ImageSharp.Formats.Jpg; + /// /// Poor man's stackalloc: Contains a value-type buffer sized for 4 instances. /// Useful for decoder/encoder operations allocating a block for each Jpeg component. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs index 5729fe46d..de90ea999 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs @@ -4,11 +4,13 @@ // // ReSharper disable InconsistentNaming -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components { using System.Numerics; using System.Runtime.CompilerServices; + using ImageSharp.Formats.Jpg; + /// /// Contains forward and inverse DCT implementations /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs index 02f585be0..99ed59337 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs index 0e57e98d8..89f228adb 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; using System.Buffers; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs index 5b53db190..a633ef6ff 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { /// /// Represents a single color component diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs index 89fc115ea..3a8727420 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System.Runtime.InteropServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs index 900d77ec4..2a9fe6f0e 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs @@ -3,9 +3,9 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { - using System; + using ImageSharp.Formats.Jpg; /// /// A structure to store unprocessed instances and their coordinates while scanning the image. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs index 8b82184fa..e8ce9c603 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { /// /// Represents "recoverable" decoder errors. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs index 9ce5ea414..07c5afadb 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs index 5ed25ef04..0d7a14e37 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs index 390e5dd15..108fdbd4b 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; using System.Buffers; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs index 60042d36f..a9633c977 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; using System.IO; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs index 71472c00f..0204dea6f 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs @@ -3,11 +3,11 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { - using System.Runtime.CompilerServices; using System.Runtime.InteropServices; + using ImageSharp.Formats.Jpg; using ImageSharp.Memory; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs index 342ce299c..2cc1e5916 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs @@ -2,10 +2,12 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System.Runtime.CompilerServices; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; + using ImageSharp.Formats.Jpg; using ImageSharp.Memory; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs index 7b910cdd2..a6b3ddc3b 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs @@ -3,10 +3,12 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System.Runtime.InteropServices; + using ImageSharp.Formats.Jpg; + /// /// Conains the definition of /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs index 52e25f3a8..44f743501 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs @@ -3,8 +3,10 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { + using ImageSharp.Formats.Jpg; + /// /// Conains the definition of /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs index 7d2e6d441..68ebe64bc 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs @@ -3,12 +3,12 @@ // Licensed under the Apache License, Version 2.0. // // ReSharper disable InconsistentNaming -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { - using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; + using ImageSharp.Formats.Jpg; using ImageSharp.Memory; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs index f8c157237..2190c07bd 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs index c9cc327b8..745ff6781 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs @@ -2,12 +2,12 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System; - using System.Buffers; using ImageSharp.Memory; + using SixLabors.Primitives; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs index 5c9e8f9fc..b9f4d0c81 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs @@ -3,9 +3,10 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { using System.Runtime.CompilerServices; + using ImageSharp.PixelFormats; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs index 3875cc12f..837eaee9d 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder { /// /// Enumerates the Huffman tables diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs index d0003b919..3c98f11d1 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder { /// /// A compiled look-up table representation of a huffmanSpec. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs index a0eea6e71..9b0861a80 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder { /// /// The Huffman encoding specifications. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs index 5a469e0e9..550462f97 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs @@ -2,7 +2,7 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder { /// /// Enumerates the quantization tables diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs index 94173d3e4..c2c05ea38 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder { using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs index 99c0399dc..2a824a2d7 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats +namespace ImageSharp.Formats.Jpeg.GolangPort { using System.Collections.Generic; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs index 0ce927e51..028d079b0 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats +namespace ImageSharp.Formats.Jpeg.GolangPort { using System; - using System.Collections.Generic; using System.IO; using System.Runtime.CompilerServices; using System.Threading.Tasks; + using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder; using ImageSharp.Formats.Jpg; using ImageSharp.Memory; using ImageSharp.PixelFormats; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs index d2b7d2d7c..92a4be52f 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs @@ -3,15 +3,16 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats +namespace ImageSharp.Formats.Jpeg.GolangPort { using System.Buffers; - using System.Collections.Generic; using System.IO; - using System.Linq; using System.Runtime.CompilerServices; + + using ImageSharp.Formats.Jpeg.GolangPort.Components; + using ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; - using ImageSharp.Formats.Jpg.Components; using ImageSharp.PixelFormats; /// diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs index afb8e0700..53be00b98 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs @@ -2,9 +2,8 @@ // Copyright (c) James Jackson-South and contributors. // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Utils { - using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs index 99d1c3e04..721890708 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Utils { using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs index 45ecfc092..fce8f706b 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpg +namespace ImageSharp.Formats.Jpeg.GolangPort.Utils { using System.Numerics; using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs index 6c6561468..f04e8d2e0 100644 --- a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs +++ b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs @@ -9,6 +9,7 @@ namespace ImageSharp.Formats using System.Collections.Generic; using System.IO; + using ImageSharp.Formats.Jpeg.GolangPort; using ImageSharp.PixelFormats; /// diff --git a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs index 23cd5d875..6f6e1eec3 100644 --- a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs +++ b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs @@ -7,6 +7,8 @@ namespace ImageSharp.Formats { using System.Collections.Generic; + using ImageSharp.Formats.Jpeg.GolangPort; + /// /// Registers the image encoders, decoders and mime type detectors for the jpeg format. /// diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs b/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs index ebcdf972a..90816ec13 100644 --- a/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs +++ b/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs @@ -11,6 +11,7 @@ namespace ImageSharp.Benchmarks.Image using BenchmarkDotNet.Attributes; using ImageSharp.Formats; + using ImageSharp.Formats.Jpeg.GolangPort; using ImageSharp.PixelFormats; using CoreImage = ImageSharp.Image; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs index 01501a33d..1d96043c9 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs @@ -14,6 +14,8 @@ namespace ImageSharp.Tests using System.Numerics; using ImageSharp.Formats; + using ImageSharp.Formats.Jpeg.GolangPort.Components; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; using Xunit; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs index 234f4dcdc..672c83895 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Tests using System.Linq; using ImageSharp.Formats; - + using ImageSharp.Formats.Jpeg.GolangPort; using ImageSharp.PixelFormats; using ImageSharp.Tests.TestUtilities.ImageComparison; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs index 252b01138..7956462ab 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs @@ -13,6 +13,7 @@ namespace ImageSharp.Tests using System; using System.Diagnostics; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; public class JpegUtilityTestFixture : MeasureFixture diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs index 1075c4692..f79b689d1 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs @@ -9,6 +9,7 @@ namespace ImageSharp.Tests using System; using System.Numerics; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; using ImageSharp.PixelFormats; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs index e76a11cec..d3d6e4e70 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs @@ -12,6 +12,7 @@ namespace ImageSharp.Tests using System.Runtime.CompilerServices; using ImageSharp.Formats; + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; /// diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs index 50b94bc24..67f9a1182 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs @@ -6,6 +6,7 @@ // ReSharper disable InconsistentNaming namespace ImageSharp.Tests.Formats.Jpg { + using ImageSharp.Formats.Jpeg.GolangPort.Utils; using ImageSharp.Formats.Jpg; using Xunit; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs index b911e1184..c23836143 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs @@ -5,6 +5,7 @@ namespace ImageSharp.Tests { + using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder; using ImageSharp.Formats.Jpg; using SixLabors.Primitives; using Xunit;