From a473bf48780f0a350ae1a685a4467159fadd7418 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sat, 19 Aug 2017 00:46:57 +0200 Subject: [PATCH] prefixing GolangPort stuff with Old*** #Round1 --- .../GolangPort/Components/Decoder/Bytes.cs | 8 +-- .../Decoder/{Component.cs => OldComponent.cs} | 2 +- .../{ComponentScan.cs => OldComponentScan.cs} | 2 +- ... => OldJpegScanDecoder.ComputationData.cs} | 4 +- ....cs => OldJpegScanDecoder.DataPointers.cs} | 6 +-- ...egScanDecoder.cs => OldJpegScanDecoder.cs} | 20 ++++---- .../Jpeg/GolangPort/JpegDecoderCore.cs | 50 +++++++++---------- .../Jpeg/GolangPort/JpegEncoderCore.cs | 32 ++++++------ .../{JpegConstants.cs => OldJpegConstants.cs} | 2 +- .../Utils/{JpegUtils.cs => OldJpegUtils.cs} | 2 +- src/ImageSharp/Formats/Jpeg/JpegFormat.cs | 4 +- 11 files changed, 66 insertions(+), 66 deletions(-) rename src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/{Component.cs => OldComponent.cs} (96%) rename src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/{ComponentScan.cs => OldComponentScan.cs} (95%) rename src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/{JpegScanDecoder.ComputationData.cs => OldJpegScanDecoder.ComputationData.cs} (92%) rename src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/{JpegScanDecoder.DataPointers.cs => OldJpegScanDecoder.DataPointers.cs} (90%) rename src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/{JpegScanDecoder.cs => OldJpegScanDecoder.cs} (97%) rename src/ImageSharp/Formats/Jpeg/GolangPort/{JpegConstants.cs => OldJpegConstants.cs} (99%) rename src/ImageSharp/Formats/Jpeg/GolangPort/Utils/{JpegUtils.cs => OldJpegUtils.cs} (98%) diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs index 89f228adb1..5a1be35ffd 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs @@ -95,7 +95,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder x = this.BufferAsInt[this.I]; this.I++; this.UnreadableBytes = 1; - if (x != JpegConstants.Markers.XFFInt) + if (x != OldJpegConstants.Markers.XFFInt) { return DecoderErrorCode.NoError; } @@ -107,7 +107,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder this.I++; this.UnreadableBytes = 2; - x = JpegConstants.Markers.XFF; + x = OldJpegConstants.Markers.XFF; return DecoderErrorCode.NoError; } @@ -120,7 +120,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder return errorCode; } - if (x != JpegConstants.Markers.XFF) + if (x != OldJpegConstants.Markers.XFF) { return DecoderErrorCode.NoError; } @@ -137,7 +137,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder return DecoderErrorCode.MissingFF00; } - x = JpegConstants.Markers.XFF; + x = OldJpegConstants.Markers.XFF; return DecoderErrorCode.NoError; } diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponent.cs similarity index 96% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponent.cs index a633ef6ffc..ae0ee95ca1 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponent.cs @@ -8,7 +8,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// /// Represents a single color component /// - internal struct Component + internal struct OldComponent { /// /// Gets or sets the horizontal sampling factor. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponentScan.cs similarity index 95% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponentScan.cs index 3a87274209..c82481c392 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponentScan.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// Represents a component scan /// [StructLayout(LayoutKind.Sequential)] - internal struct ComponentScan + internal struct OldComponentScan { /// /// Gets or sets the component index. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs similarity index 92% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs index 41aa8d93ce..025f0d7b69 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs @@ -11,7 +11,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// /// Conains the definition of /// - internal unsafe partial struct JpegScanDecoder + internal unsafe partial struct OldJpegScanDecoder { /// /// Holds the "large" data blocks needed for computations. @@ -30,7 +30,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder public UnzigData Unzig; /// - /// The buffer storing the -s for each component + /// The buffer storing the -s for each component /// public fixed byte ScanData[3 * JpegDecoderCore.MaxComponents]; diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.DataPointers.cs similarity index 90% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.DataPointers.cs index bc9222222b..fda0d3654f 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.DataPointers.cs @@ -10,7 +10,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// /// Conains the definition of /// - internal unsafe partial struct JpegScanDecoder + internal unsafe partial struct OldJpegScanDecoder { /// /// Contains pointers to the memory regions of so they can be easily passed around to pointer based utility methods of @@ -30,7 +30,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// /// Pointer to as Scan* /// - public ComponentScan* ComponentScan; + public OldComponentScan* ComponentScan; /// /// Pointer to @@ -45,7 +45,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { this.Block = &basePtr->Block; this.Unzig = basePtr->Unzig.Data; - this.ComponentScan = (ComponentScan*)basePtr->ScanData; + this.ComponentScan = (OldComponentScan*)basePtr->ScanData; this.Dc = basePtr->Dc; } } diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.cs similarity index 97% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.cs index 081c524133..e6ea890e76 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.cs @@ -30,7 +30,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder /// For baseline JPEGs, these parameters are hard-coded to 0/63/0/0. /// [StructLayout(LayoutKind.Sequential)] - internal unsafe partial struct JpegScanDecoder + internal unsafe partial struct OldJpegScanDecoder { // The JpegScanDecoder members should be ordered in a way that results in optimal memory layout. #pragma warning disable SA1202 // ElementsMustBeOrderedByAccess @@ -96,12 +96,12 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder private int eobRun; /// - /// Initializes a default-constructed instance for reading data from -s stream. + /// Initializes a default-constructed instance for reading data from -s stream. /// - /// Pointer to on the stack + /// Pointer to on the stack /// The instance /// The remaining bytes in the segment block. - public static void InitStreamReading(JpegScanDecoder* p, JpegDecoderCore decoder, int remaining) + public static void InitStreamReading(OldJpegScanDecoder* p, JpegDecoderCore decoder, int remaining) { p->data = ComputationData.Create(); p->pointers = new DataPointers(&p->data); @@ -140,7 +140,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder { int blockCount = 0; int mcu = 0; - byte expectedRst = JpegConstants.Markers.RST0; + byte expectedRst = OldJpegConstants.Markers.RST0; for (int my = 0; my < decoder.MCUCountY; my++) { @@ -206,9 +206,9 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder } expectedRst++; - if (expectedRst == JpegConstants.Markers.RST7 + 1) + if (expectedRst == OldJpegConstants.Markers.RST7 + 1) { - expectedRst = JpegConstants.Markers.RST0; + expectedRst = OldJpegConstants.Markers.RST0; } } } @@ -434,7 +434,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder return ((this.by * decoder.MCUCountX) * this.hi) + this.bx; } - private void InitComponentScan(JpegDecoderCore decoder, int i, ref ComponentScan currentComponentScan, ref int totalHv) + private void InitComponentScan(JpegDecoderCore decoder, int i, ref OldComponentScan currentComponentScan, ref int totalHv) { // Component selector. int cs = decoder.Temp[1 + (2 * i)]; @@ -461,9 +461,9 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder private void ProcessComponentImpl( JpegDecoderCore decoder, int i, - ref ComponentScan currentComponentScan, + ref OldComponentScan currentComponentScan, ref int totalHv, - ref Component currentComponent) + ref OldComponent currentComponent) { // Section B.2.3 states that "the value of Cs_j shall be different from // the values of Cs_1 through Cs_(j-1)". Since we have previously diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs index 3422130f73..0bd7a16607 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs @@ -108,14 +108,14 @@ namespace ImageSharp.Formats.Jpeg.GolangPort this.HuffmanTrees = HuffmanTree.CreateHuffmanTrees(); this.QuantizationTables = new Block8x8F[MaxTq + 1]; this.Temp = new byte[2 * Block8x8F.ScalarCount]; - this.ComponentArray = new Component[MaxComponents]; + this.ComponentArray = new OldComponent[MaxComponents]; this.DecodedBlocks = new Buffer[MaxComponents]; } /// /// Gets the component array /// - public Component[] ComponentArray { get; } + public OldComponent[] ComponentArray { get; } /// /// Gets the huffman trees @@ -272,7 +272,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort // Check for the Start Of Image marker. this.InputProcessor.ReadFull(this.Temp, 0, 2); - if (this.Temp[0] != JpegConstants.Markers.XFF || this.Temp[1] != JpegConstants.Markers.SOI) + if (this.Temp[0] != OldJpegConstants.Markers.XFF || this.Temp[1] != OldJpegConstants.Markers.SOI) { throw new ImageFormatException("Missing SOI marker."); } @@ -322,12 +322,12 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } // End Of Image. - if (marker == JpegConstants.Markers.EOI) + if (marker == OldJpegConstants.Markers.EOI) { break; } - if (marker >= JpegConstants.Markers.RST0 && marker <= JpegConstants.Markers.RST7) + if (marker >= OldJpegConstants.Markers.RST0 && marker <= OldJpegConstants.Markers.RST7) { // Figures B.2 and B.16 of the specification suggest that restart markers should // only occur between Entropy Coded Segments and not after the final ECS. @@ -349,10 +349,10 @@ namespace ImageSharp.Formats.Jpeg.GolangPort switch (marker) { - case JpegConstants.Markers.SOF0: - case JpegConstants.Markers.SOF1: - case JpegConstants.Markers.SOF2: - this.IsProgressive = marker == JpegConstants.Markers.SOF2; + case OldJpegConstants.Markers.SOF0: + case OldJpegConstants.Markers.SOF1: + case OldJpegConstants.Markers.SOF2: + this.IsProgressive = marker == OldJpegConstants.Markers.SOF2; this.ProcessStartOfFrameMarker(remaining); if (metadataOnly && this.isJfif) { @@ -360,7 +360,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } break; - case JpegConstants.Markers.DHT: + case OldJpegConstants.Markers.DHT: if (metadataOnly) { this.InputProcessor.Skip(remaining); @@ -371,7 +371,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } break; - case JpegConstants.Markers.DQT: + case OldJpegConstants.Markers.DQT: if (metadataOnly) { this.InputProcessor.Skip(remaining); @@ -382,7 +382,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } break; - case JpegConstants.Markers.SOS: + case OldJpegConstants.Markers.SOS: if (metadataOnly) { return; @@ -398,7 +398,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } break; - case JpegConstants.Markers.DRI: + case OldJpegConstants.Markers.DRI: if (metadataOnly) { this.InputProcessor.Skip(remaining); @@ -409,25 +409,25 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } break; - case JpegConstants.Markers.APP0: + case OldJpegConstants.Markers.APP0: this.ProcessApplicationHeader(remaining); break; - case JpegConstants.Markers.APP1: + case OldJpegConstants.Markers.APP1: this.ProcessApp1Marker(remaining, metadata); break; - case JpegConstants.Markers.APP2: + case OldJpegConstants.Markers.APP2: this.ProcessApp2Marker(remaining, metadata); break; - case JpegConstants.Markers.APP14: + case OldJpegConstants.Markers.APP14: this.ProcessApp14Marker(remaining); break; default: - if ((marker >= JpegConstants.Markers.APP0 && marker <= JpegConstants.Markers.APP15) - || marker == JpegConstants.Markers.COM) + if ((marker >= OldJpegConstants.Markers.APP0 && marker <= OldJpegConstants.Markers.APP15) + || marker == OldJpegConstants.Markers.COM) { this.InputProcessor.Skip(remaining); } - else if (marker < JpegConstants.Markers.SOF0) + else if (marker < OldJpegConstants.Markers.SOF0) { // See Table B.1 "Marker code assignments". throw new ImageFormatException("Unknown marker"); @@ -452,8 +452,8 @@ namespace ImageSharp.Formats.Jpeg.GolangPort /// private void ProcessStartOfScan(int remaining) { - JpegScanDecoder scan = default(JpegScanDecoder); - JpegScanDecoder.InitStreamReading(&scan, this, remaining); + OldJpegScanDecoder scan = default(OldJpegScanDecoder); + OldJpegScanDecoder.InitStreamReading(&scan, this, remaining); this.InputProcessor.Bits = default(Bits); this.MakeImage(); scan.DecodeBlocks(this); @@ -508,11 +508,11 @@ namespace ImageSharp.Formats.Jpeg.GolangPort // See http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe // See https://docs.oracle.com/javase/8/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html // TODO: YCbCrA? - if (this.adobeTransform == JpegConstants.Adobe.ColorTransformYcck) + if (this.adobeTransform == OldJpegConstants.Adobe.ColorTransformYcck) { this.ConvertFromYcck(image); } - else if (this.adobeTransform == JpegConstants.Adobe.ColorTransformUnknown) + else if (this.adobeTransform == OldJpegConstants.Adobe.ColorTransformUnknown) { // Assume CMYK this.ConvertFromCmyk(image); @@ -764,7 +764,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort return false; } - if (this.adobeTransformValid && this.adobeTransform == JpegConstants.Adobe.ColorTransformUnknown) + if (this.adobeTransformValid && this.adobeTransform == OldJpegConstants.Adobe.ColorTransformUnknown) { // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe // says that 0 means Unknown (and in practice RGB) and 1 means YCbCr. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs index 585d972b86..9a7ba7ffc0 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs @@ -59,7 +59,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort /// private static readonly byte[] SosHeaderYCbCr = { - JpegConstants.Markers.XFF, JpegConstants.Markers.SOS, + OldJpegConstants.Markers.XFF, OldJpegConstants.Markers.SOS, // Marker 0x00, 0x0c, @@ -198,7 +198,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort Guard.NotNull(image, nameof(image)); Guard.NotNull(stream, nameof(stream)); - ushort max = JpegConstants.MaxLength; + ushort max = OldJpegConstants.MaxLength; if (image.Width >= max || image.Height >= max) { throw new ImageFormatException($"Image is too large to encode at {image.Width}x{image.Height}."); @@ -247,8 +247,8 @@ namespace ImageSharp.Formats.Jpeg.GolangPort } // Write the End Of Image marker. - this.buffer[0] = JpegConstants.Markers.XFF; - this.buffer[1] = JpegConstants.Markers.EOI; + this.buffer[0] = OldJpegConstants.Markers.XFF; + this.buffer[1] = OldJpegConstants.Markers.EOI; stream.Write(this.buffer, 0, 2); stream.Flush(); } @@ -509,12 +509,12 @@ namespace ImageSharp.Formats.Jpeg.GolangPort private void WriteApplicationHeader(short horizontalResolution, short verticalResolution) { // Write the start of image marker. Markers are always prefixed with with 0xff. - this.buffer[0] = JpegConstants.Markers.XFF; - this.buffer[1] = JpegConstants.Markers.SOI; + this.buffer[0] = OldJpegConstants.Markers.XFF; + this.buffer[1] = OldJpegConstants.Markers.SOI; // Write the JFIF headers - this.buffer[2] = JpegConstants.Markers.XFF; - this.buffer[3] = JpegConstants.Markers.APP0; // Application Marker + this.buffer[2] = OldJpegConstants.Markers.XFF; + this.buffer[3] = OldJpegConstants.Markers.APP0; // Application Marker this.buffer[4] = 0x00; this.buffer[5] = 0x10; this.buffer[6] = 0x4a; // J @@ -628,7 +628,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort markerlen += 1 + 16 + s.Values.Length; } - this.WriteMarkerHeader(JpegConstants.Markers.DHT, markerlen); + this.WriteMarkerHeader(OldJpegConstants.Markers.DHT, markerlen); for (int i = 0; i < specs.Length; i++) { HuffmanSpec spec = specs[i]; @@ -662,7 +662,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort { // Marker + quantization table lengths int markerlen = 2 + (QuantizationTableCount * (1 + Block8x8F.ScalarCount)); - this.WriteMarkerHeader(JpegConstants.Markers.DQT, markerlen); + this.WriteMarkerHeader(OldJpegConstants.Markers.DQT, markerlen); // Loop through and collect the tables as one array. // This allows us to reduce the number of writes to the stream. @@ -700,8 +700,8 @@ namespace ImageSharp.Formats.Jpeg.GolangPort int length = data.Length + 2; - this.buffer[0] = JpegConstants.Markers.XFF; - this.buffer[1] = JpegConstants.Markers.APP1; // Application Marker + this.buffer[0] = OldJpegConstants.Markers.XFF; + this.buffer[1] = OldJpegConstants.Markers.APP1; // Application Marker this.buffer[2] = (byte)((length >> 8) & 0xFF); this.buffer[3] = (byte)(length & 0xFF); @@ -759,8 +759,8 @@ namespace ImageSharp.Formats.Jpeg.GolangPort dataLength -= length; - this.buffer[0] = JpegConstants.Markers.XFF; - this.buffer[1] = JpegConstants.Markers.APP2; // Application Marker + this.buffer[0] = OldJpegConstants.Markers.XFF; + this.buffer[1] = OldJpegConstants.Markers.APP2; // Application Marker int markerLength = length + 16; this.buffer[2] = (byte)((markerLength >> 8) & 0xFF); this.buffer[3] = (byte)(markerLength & 0xFF); @@ -832,7 +832,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort // Length (high byte, low byte), 8 + components * 3. int markerlen = 8 + (3 * componentCount); - this.WriteMarkerHeader(JpegConstants.Markers.SOF0, markerlen); + this.WriteMarkerHeader(OldJpegConstants.Markers.SOF0, markerlen); this.buffer[0] = 8; // Data Precision. 8 for now, 12 and 16 bit jpegs not supported this.buffer[1] = (byte)(height >> 8); this.buffer[2] = (byte)(height & 0xff); // (2 bytes, Hi-Lo), must be > 0 if DNL not supported @@ -975,7 +975,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort private void WriteMarkerHeader(byte marker, int length) { // Markers are always prefixed with with 0xff. - this.buffer[0] = JpegConstants.Markers.XFF; + this.buffer[0] = OldJpegConstants.Markers.XFF; this.buffer[1] = marker; this.buffer[2] = (byte)(length >> 8); this.buffer[3] = (byte)(length & 0xff); diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OldJpegConstants.cs similarity index 99% rename from src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/OldJpegConstants.cs index 2a824a2d73..4e16816da9 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OldJpegConstants.cs @@ -10,7 +10,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort /// /// Defines jpeg constants defined in the specification. /// - internal static class JpegConstants + internal static class OldJpegConstants { /// /// The maximum allowable length in each dimension of a jpeg image. diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OldJpegUtils.cs similarity index 98% rename from src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs rename to src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OldJpegUtils.cs index 53be00b985..d7ca915de1 100644 --- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs +++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/OldJpegUtils.cs @@ -12,7 +12,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Utils /// /// Jpeg specific utilities and extension methods /// - internal static unsafe class JpegUtils + internal static unsafe class OldJpegUtils { /// /// Copy a region of an image into dest. De "outlier" area will be stretched out with pixels on the right and bottom of the image. diff --git a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs index 6f6e1eec32..a0fd56e970 100644 --- a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs +++ b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs @@ -21,9 +21,9 @@ namespace ImageSharp.Formats public string DefaultMimeType => "image/jpeg"; /// - public IEnumerable MimeTypes => JpegConstants.MimeTypes; + public IEnumerable MimeTypes => OldJpegConstants.MimeTypes; /// - public IEnumerable FileExtensions => JpegConstants.FileExtensions; + public IEnumerable FileExtensions => OldJpegConstants.FileExtensions; } } \ No newline at end of file