tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix tuple casing

pull/1777/head
James Jackson-South 5 years ago
parent
af1cbc3286
commit
a46dcc1101
3 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/ImageSharp/Image.Decode.cs
  2. 8
      src/ImageSharp/Image.FromStream.cs
  3. 24
      src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs

2
src/ImageSharp/Image.Decode.cs
View File

@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp
/// <param name="stream">The image stream to read the header from.</param> /// <param name="stream">The image stream to read the header from.</param>
/// <param name="config">The configuration.</param> /// <param name="config">The configuration.</param>
/// <returns>The decoder and the image format or null if none found.</returns> /// <returns>The decoder and the image format or null if none found.</returns>
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); IImageFormat format = await InternalDetectFormatAsync(stream, config).ConfigureAwait(false);

8
src/ImageSharp/Image.FromStream.cs
View File

@ -679,13 +679,13 @@ namespace SixLabors.ImageSharp
/// <returns>A new <see cref="Image{TPixel}"/>.</returns> /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
public static Image Load(Configuration configuration, Stream stream, out IImageFormat format) 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(); var sb = new StringBuilder();

24
src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationProcessor{TPixel}.cs
View File

@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
{ {
cdfData.CalculateLookupTables(source, this); cdfData.CalculateLookupTables(source, this);
var tileYStartPositions = new List<(int y, int cdfY)>(); var tileYStartPositions = new List<(int Y, int CdfY)>();
int cdfY = 0; int cdfY = 0;
int yStart = halfTileHeight; int yStart = halfTileHeight;
for (int tile = 0; tile < tileCount - 1; tile++) 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 struct RowIntervalOperation : IRowIntervalOperation
{ {
private readonly CdfTileData cdfData; 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 tileWidth;
private readonly int tileHeight; private readonly int tileHeight;
private readonly int tileCount; private readonly int tileCount;
@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
[MethodImpl(InliningOptions.ShortMethod)] [MethodImpl(InliningOptions.ShortMethod)]
public RowIntervalOperation( public RowIntervalOperation(
CdfTileData cdfData, CdfTileData cdfData,
List<(int y, int cdfY)> tileYStartPositions, List<(int Y, int CdfY)> tileYStartPositions,
int tileWidth, int tileWidth,
int tileHeight, int tileHeight,
int tileCount, int tileCount,
@ -406,9 +406,9 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
{ {
for (int index = rows.Min; index < rows.Max; index++) for (int index = rows.Min; index < rows.Max; index++)
{ {
(int y, int cdfY) tileYStartPosition = this.tileYStartPositions[index]; (int Y, int CdfY) tileYStartPosition = this.tileYStartPositions[index];
int y = tileYStartPosition.y; int y = tileYStartPosition.Y;
int cdfYY = tileYStartPosition.cdfY; int cdfYY = tileYStartPosition.CdfY;
int cdfX = 0; int cdfX = 0;
int x = this.halfTileWidth; int x = this.halfTileWidth;
@ -473,7 +473,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
private readonly int tileWidth; private readonly int tileWidth;
private readonly int tileHeight; private readonly int tileHeight;
private readonly int luminanceLevels; private readonly int luminanceLevels;
private readonly List<(int y, int cdfY)> tileYStartPositions; private readonly List<(int Y, int CdfY)> tileYStartPositions;
public CdfTileData( public CdfTileData(
Configuration configuration, Configuration configuration,
@ -496,7 +496,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
this.pixelsInTile = tileWidth * tileHeight; this.pixelsInTile = tileWidth * tileHeight;
// Calculate the start positions and rent buffers. // 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; int cdfY = 0;
for (int y = 0; y < sourceHeight; y += tileHeight) for (int y = 0; y < sourceHeight; y += tileHeight)
{ {
@ -556,7 +556,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
private readonly MemoryAllocator allocator; private readonly MemoryAllocator allocator;
private readonly Buffer2D<int> cdfMinBuffer2D; private readonly Buffer2D<int> cdfMinBuffer2D;
private readonly Buffer2D<int> cdfLutBuffer2D; private readonly Buffer2D<int> cdfLutBuffer2D;
private readonly List<(int y, int cdfY)> tileYStartPositions; private readonly List<(int Y, int CdfY)> tileYStartPositions;
private readonly int tileWidth; private readonly int tileWidth;
private readonly int tileHeight; private readonly int tileHeight;
private readonly int luminanceLevels; private readonly int luminanceLevels;
@ -570,7 +570,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
MemoryAllocator allocator, MemoryAllocator allocator,
Buffer2D<int> cdfMinBuffer2D, Buffer2D<int> cdfMinBuffer2D,
Buffer2D<int> cdfLutBuffer2D, Buffer2D<int> cdfLutBuffer2D,
List<(int y, int cdfY)> tileYStartPositions, List<(int Y, int CdfY)> tileYStartPositions,
int tileWidth, int tileWidth,
int tileHeight, int tileHeight,
int luminanceLevels, int luminanceLevels,
@ -596,8 +596,8 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
for (int index = rows.Min; index < rows.Max; index++) for (int index = rows.Min; index < rows.Max; index++)
{ {
int cdfX = 0; int cdfX = 0;
int cdfY = this.tileYStartPositions[index].cdfY; int cdfY = this.tileYStartPositions[index].CdfY;
int y = this.tileYStartPositions[index].y; int y = this.tileYStartPositions[index].Y;
int endY = Math.Min(y + this.tileHeight, this.sourceHeight); int endY = Math.Min(y + this.tileHeight, this.sourceHeight);
Span<int> cdfMinSpan = this.cdfMinBuffer2D.GetRowSpan(cdfY); Span<int> cdfMinSpan = this.cdfMinBuffer2D.GetRowSpan(cdfY);
cdfMinSpan.Clear(); cdfMinSpan.Clear();

Write Preview
Loading…
Cancel
Save