From 9a7f8095f42ef7a644a77ef365a8adcef4ff3f7e Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sat, 19 Aug 2017 00:41:12 +0200 Subject: [PATCH] adjust PdfJsPort namespaces --- src/ImageSharp/Formats/Jpeg/JpegDecoder.cs | 3 ++- src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Adobe.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/Component.cs | 3 ++- .../Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/FileMarker.cs | 2 +- src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs | 2 +- src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs | 4 +--- src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs | 3 ++- .../Jpeg/PdfJsPort/Components/QuantizationTables.cs | 2 +- .../Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs | 6 +++--- .../Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs | 3 ++- src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegConstants.cs | 2 +- src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegDecoderCore.cs | 7 ++----- 17 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs index 38160c148a..07fe5b7aa8 100644 --- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs +++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs @@ -7,6 +7,7 @@ namespace ImageSharp.Formats { using System.IO; + using ImageSharp.Formats.Jpeg.PdfJsPort; using ImageSharp.PixelFormats; /// @@ -26,7 +27,7 @@ namespace ImageSharp.Formats Guard.NotNull(stream, "stream"); // using (var decoder = new JpegDecoderCore(configuration, this)) - using (var decoder = new Jpeg.Port.JpegDecoderCore(configuration, this)) + using (var decoder = new JpegDecoderCore(configuration, this)) { return decoder.Decode(stream); } diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Adobe.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Adobe.cs index 6ef128ccb4..9238efb034 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Adobe.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Adobe.cs @@ -4,7 +4,7 @@ // // ReSharper disable InconsistentNaming -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs index a21cb66207..72d1cc24cf 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs @@ -3,10 +3,11 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Numerics; + using ImageSharp.Memory; /// diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs index a72835e757..cc396a4d01 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs index eaf3dafb95..b7537db5fd 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { /// /// Represents a jpeg file marker diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs index 06b4bbc24f..96301ce18a 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs index b386a86f3c..f3ae71415c 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs index 4c475450bd..36eb79a7ae 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs index d076c0b038..4da046a95c 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Collections.Generic; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs index 064b3bea36..7495c4c784 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs @@ -1,10 +1,8 @@ -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Runtime.CompilerServices; - using ImageSharp.Memory; - /// /// Performs the inverse Descrete Cosine Transform on each frame component. /// diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs index 6baecdf682..dc75acb1bb 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs index e88e396170..46cdc437b5 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs @@ -3,12 +3,13 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; + using ImageSharp.Memory; /// diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs index 352dc43f23..000398216f 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; using System.Runtime.CompilerServices; diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs index 8b711eaa89..ddb858446e 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs @@ -3,14 +3,14 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System; -#if DEBUG using System.Diagnostics; -#endif using System.IO; using System.Runtime.CompilerServices; +#if DEBUG +#endif /// /// Provides the means to decode a spectral scan diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs index 02397e1d77..74800b160c 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs @@ -1,6 +1,7 @@ -namespace ImageSharp.Formats.Jpeg.Port.Components +namespace ImageSharp.Formats.Jpeg.PdfJsPort.Components { using System.Runtime.CompilerServices; + using ImageSharp.PixelFormats; /// diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegConstants.cs index a02e055917..36799f7608 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegConstants.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegConstants.cs @@ -4,7 +4,7 @@ // // ReSharper disable InconsistentNaming -namespace ImageSharp.Formats.Jpeg.Port +namespace ImageSharp.Formats.Jpeg.PdfJsPort { /// /// Contains jpeg constant values diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegDecoderCore.cs index 3a6e14f59d..06e0ae02dd 100644 --- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegDecoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/JpegDecoderCore.cs @@ -3,16 +3,13 @@ // Licensed under the Apache License, Version 2.0. // -namespace ImageSharp.Formats.Jpeg.Port +namespace ImageSharp.Formats.Jpeg.PdfJsPort { using System; - using System.Collections.Generic; - using System.Diagnostics; using System.IO; using System.Runtime.CompilerServices; - using ImageSharp.Common.Extensions; - using ImageSharp.Formats.Jpeg.Port.Components; + using ImageSharp.Formats.Jpeg.PdfJsPort.Components; using ImageSharp.Memory; using ImageSharp.PixelFormats;