From a46dcc11017ac236ec57d8e70eb1dd28a6e8fd1a Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 5 Oct 2021 23:31:14 +1100 Subject: [PATCH] Fix tuple casing --- src/ImageSharp/Image.Decode.cs | 2 +- src/ImageSharp/Image.FromStream.cs | 8 +++---- ...eHistogramEqualizationProcessor{TPixel}.cs | 24 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ImageSharp/Image.Decode.cs b/src/ImageSharp/Image.Decode.cs index 9d5ceeacfb..94da2c9958 100644 --- a/src/ImageSharp/Image.Decode.cs +++ b/src/ImageSharp/Image.Decode.cs @@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp /// The image stream to read the header from. /// The configuration. /// The decoder and the image format or null if none found. - private static async Task<(IImageDecoder decoder, IImageFormat format)> DiscoverDecoderAsync(Stream stream, Configuration config) + private static async Task<(IImageDecoder Decoder, IImageFormat Format)> DiscoverDecoderAsync(Stream stream, Configuration config) { IImageFormat format = await InternalDetectFormatAsync(stream, config).ConfigureAwait(false); diff --git a/src/ImageSharp/Image.FromStream.cs b/src/ImageSharp/Image.FromStream.cs index 3dde8e77bc..291d6f7cab 100644 --- a/src/ImageSharp/Image.FromStream.cs +++ b/src/ImageSharp/Image.FromStream.cs @@ -679,13 +679,13 @@ namespace SixLabors.ImageSharp /// A new . public static Image Load(Configuration configuration, Stream stream, out IImageFormat format) { - (Image img, IImageFormat format) data = WithSeekableStream(configuration, stream, s => Decode(s, configuration)); + (Image Img, IImageFormat Format) data = WithSeekableStream(configuration, stream, s => Decode(s, configuration)); - format = data.format; + format = data.Format; - if (data.img != null) + if (data.Img != null) { - return data.img; + return data.Img; } var sb = new StringBuilder(); diff --git a/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs index 91ed9f5de4..883f85be3b 100644 --- a/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs +++ b/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs @@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization { cdfData.CalculateLookupTables(source, this); - var tileYStartPositions = new List<(int y, int cdfY)>(); + var tileYStartPositions = new List<(int Y, int CdfY)>(); int cdfY = 0; int yStart = halfTileHeight; for (int tile = 0; tile < tileCount - 1; tile++) @@ -367,7 +367,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization private readonly struct RowIntervalOperation : IRowIntervalOperation { private readonly CdfTileData cdfData; - private readonly List<(int y, int cdfY)> tileYStartPositions; + private readonly List<(int Y, int CdfY)> tileYStartPositions; private readonly int tileWidth; private readonly int tileHeight; private readonly int tileCount; @@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization [MethodImpl(InliningOptions.ShortMethod)] public RowIntervalOperation( CdfTileData cdfData, - List<(int y, int cdfY)> tileYStartPositions, + List<(int Y, int CdfY)> tileYStartPositions, int tileWidth, int tileHeight, int tileCount, @@ -406,9 +406,9 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization { for (int index = rows.Min; index < rows.Max; index++) { - (int y, int cdfY) tileYStartPosition = this.tileYStartPositions[index]; - int y = tileYStartPosition.y; - int cdfYY = tileYStartPosition.cdfY; + (int Y, int CdfY) tileYStartPosition = this.tileYStartPositions[index]; + int y = tileYStartPosition.Y; + int cdfYY = tileYStartPosition.CdfY; int cdfX = 0; int x = this.halfTileWidth; @@ -473,7 +473,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization private readonly int tileWidth; private readonly int tileHeight; private readonly int luminanceLevels; - private readonly List<(int y, int cdfY)> tileYStartPositions; + private readonly List<(int Y, int CdfY)> tileYStartPositions; public CdfTileData( Configuration configuration, @@ -496,7 +496,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization this.pixelsInTile = tileWidth * tileHeight; // Calculate the start positions and rent buffers. - this.tileYStartPositions = new List<(int y, int cdfY)>(); + this.tileYStartPositions = new List<(int Y, int CdfY)>(); int cdfY = 0; for (int y = 0; y < sourceHeight; y += tileHeight) { @@ -556,7 +556,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization private readonly MemoryAllocator allocator; private readonly Buffer2D cdfMinBuffer2D; private readonly Buffer2D cdfLutBuffer2D; - private readonly List<(int y, int cdfY)> tileYStartPositions; + private readonly List<(int Y, int CdfY)> tileYStartPositions; private readonly int tileWidth; private readonly int tileHeight; private readonly int luminanceLevels; @@ -570,7 +570,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization MemoryAllocator allocator, Buffer2D cdfMinBuffer2D, Buffer2D cdfLutBuffer2D, - List<(int y, int cdfY)> tileYStartPositions, + List<(int Y, int CdfY)> tileYStartPositions, int tileWidth, int tileHeight, int luminanceLevels, @@ -596,8 +596,8 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization for (int index = rows.Min; index < rows.Max; index++) { int cdfX = 0; - int cdfY = this.tileYStartPositions[index].cdfY; - int y = this.tileYStartPositions[index].y; + int cdfY = this.tileYStartPositions[index].CdfY; + int y = this.tileYStartPositions[index].Y; int endY = Math.Min(y + this.tileHeight, this.sourceHeight); Span cdfMinSpan = this.cdfMinBuffer2D.GetRowSpan(cdfY); cdfMinSpan.Clear();