From 856535cf445596e97678ba3bb56e82fca041ddca Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Sat, 24 Dec 2016 16:33:49 +0100 Subject: [PATCH] moved WriteDataToDqt --- src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs | 16 ++-------------- src/ImageSharp/Formats/Jpg/Utils/JpegUtils.cs | 11 +++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs index 241db3a64..06e722024 100644 --- a/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpg/JpegEncoderCore.cs @@ -298,18 +298,6 @@ namespace ImageSharp.Formats } } -#pragma warning disable SA1204 - private static void WriteDataToDqt(byte[] dqt, ref int offset, QuantIndex i, ref Block8x8F q) - { - dqt[offset++] = (byte)i; - for (int j = 0; j < Block8x8F.ScalarCount; j++) - { - dqt[offset++] = (byte)q[j]; - } - } - -#pragma warning restore SA1204 - /// /// Emits the least significant count of bits of bits to the bit-stream. /// The precondition is bits < 1<<nBits && nBits <= 16. @@ -627,8 +615,8 @@ namespace ImageSharp.Formats byte[] dqt = ArrayPool.Shared.Rent(dqtCount); int offset = 0; - WriteDataToDqt(dqt, ref offset, QuantIndex.Luminance, ref this.luminanceQuantTable); - WriteDataToDqt(dqt, ref offset, QuantIndex.Chrominance, ref this.chrominanceQuantTable); + JpegUtils.WriteDataToDqt(dqt, ref offset, QuantIndex.Luminance, ref this.luminanceQuantTable); + JpegUtils.WriteDataToDqt(dqt, ref offset, QuantIndex.Chrominance, ref this.chrominanceQuantTable); this.outputStream.Write(dqt, 0, dqtCount); ArrayPool.Shared.Return(dqt); diff --git a/src/ImageSharp/Formats/Jpg/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpg/Utils/JpegUtils.cs index dd0e1c33c..f4c2fa2c4 100644 --- a/src/ImageSharp/Formats/Jpg/Utils/JpegUtils.cs +++ b/src/ImageSharp/Formats/Jpg/Utils/JpegUtils.cs @@ -7,6 +7,8 @@ namespace ImageSharp.Formats.Jpg.Utils using System; using System.Runtime.CompilerServices; + using ImageSharp.Formats.Jpg.Components.Encoder; + /// /// Jpeg specific utilities and extension methods /// @@ -89,5 +91,14 @@ namespace ImageSharp.Formats.Jpg.Utils { return fromX <= 0 || fromY <= 0 || fromX >= area.Width || fromY >= area.Height; } + + internal static void WriteDataToDqt(byte[] dqt, ref int offset, QuantIndex i, ref Block8x8F q) + { + dqt[offset++] = (byte)i; + for (int j = 0; j < Block8x8F.ScalarCount; j++) + { + dqt[offset++] = (byte)q[j]; + } + } } } \ No newline at end of file