From 3678f2d08c8a33b7406347398eb81d240d6b0bd0 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Wed, 18 Apr 2018 10:28:13 -0700 Subject: [PATCH] Rename currentStream to stream --- src/ImageSharp/Formats/Gif/GifDecoderCore.cs | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs index 1f2cccc6e..4d6f010de 100644 --- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs +++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs @@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// /// The currently loaded stream. /// - private Stream currentStream; + private Stream stream; /// /// The global color table. @@ -236,7 +236,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// private void ReadGraphicalControlExtension() { - this.currentStream.Read(this.buffer, 0, 6); + this.stream.Read(this.buffer, 0, 6); this.graphicsControlExtension = GifGraphicsControlExtension.Parse(this.buffer); } @@ -247,7 +247,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// private GifImageDescriptor ReadImageDescriptor() { - this.currentStream.Read(this.buffer, 0, 9); + this.stream.Read(this.buffer, 0, 9); return GifImageDescriptor.Parse(this.buffer); } @@ -257,7 +257,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// private void ReadLogicalScreenDescriptor() { - this.currentStream.Read(this.buffer, 0, 7); + this.stream.Read(this.buffer, 0, 7); this.logicalScreenDescriptor = GifLogicalScreenDescriptor.Parse(this.buffer); } @@ -268,13 +268,13 @@ namespace SixLabors.ImageSharp.Formats.Gif /// The number of bytes to skip. private void Skip(int length) { - this.currentStream.Skip(length); + this.stream.Skip(length); int flag; - while ((flag = this.currentStream.ReadByte()) != 0) + while ((flag = this.stream.ReadByte()) != 0) { - this.currentStream.Skip(flag); + this.stream.Skip(flag); } } @@ -285,7 +285,7 @@ namespace SixLabors.ImageSharp.Formats.Gif { int length; - while ((length = this.currentStream.ReadByte()) != 0) + while ((length = this.stream.ReadByte()) != 0) { if (length > GifConstants.MaxCommentLength) { @@ -294,13 +294,13 @@ namespace SixLabors.ImageSharp.Formats.Gif if (this.IgnoreMetadata) { - this.currentStream.Seek(length, SeekOrigin.Current); + this.stream.Seek(length, SeekOrigin.Current); continue; } using (IManagedByteBuffer commentsBuffer = this.MemoryManager.AllocateManagedByteBuffer(length)) { - this.currentStream.Read(commentsBuffer.Array, 0, length); + this.stream.Read(commentsBuffer.Array, 0, length); string comments = this.TextEncoding.GetString(commentsBuffer.Array, 0, length); this.metaData.Properties.Add(new ImageProperty(GifConstants.Comments, comments)); } @@ -327,7 +327,7 @@ namespace SixLabors.ImageSharp.Formats.Gif { int length = imageDescriptor.LocalColorTableSize * 3; localColorTable = this.configuration.MemoryManager.AllocateManagedByteBuffer(length, true); - this.currentStream.Read(localColorTable.Array, 0, length); + this.stream.Read(localColorTable.Array, 0, length); } indices = this.configuration.MemoryManager.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, true); @@ -354,8 +354,8 @@ namespace SixLabors.ImageSharp.Formats.Gif [MethodImpl(MethodImplOptions.AggressiveInlining)] private void ReadFrameIndices(in GifImageDescriptor imageDescriptor, Span indices) { - int dataSize = this.currentStream.ReadByte(); - using (var lzwDecoder = new LzwDecoder(this.configuration.MemoryManager, this.currentStream)) + int dataSize = this.stream.ReadByte(); + using (var lzwDecoder = new LzwDecoder(this.configuration.MemoryManager, this.stream)) { lzwDecoder.DecodePixels(imageDescriptor.Width, imageDescriptor.Height, dataSize, indices); } @@ -526,10 +526,10 @@ namespace SixLabors.ImageSharp.Formats.Gif { this.metaData = new ImageMetaData(); - this.currentStream = stream; + this.stream = stream; // Skip the identifier - this.currentStream.Skip(6); + this.stream.Skip(6); this.ReadLogicalScreenDescriptor(); if (this.logicalScreenDescriptor.GlobalColorTableFlag)