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

Remove Nullable disable from Png Code 

I added a new Property to PngChunk --> DataSpan. On all places Data was used the same way. So we have the guard on this place and can just use it.
pull/3024/head
Stefan Nikolei 3 months ago
parent
0b34bcac0e
commit
73a9278a82
3 changed files with 39 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/ImageSharp/Formats/Png/Chunks/PngHeader.cs
  2. 15
      src/ImageSharp/Formats/Png/PngChunk.cs
  3. 52
      src/ImageSharp/Formats/Png/PngDecoderCore.cs

3
src/ImageSharp/Formats/Png/Chunks/PngHeader.cs
View File

@ -1,6 +1,5 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
#nullable disable
using System.Buffers.Binary;
@ -88,7 +87,7 @@ internal readonly struct PngHeader
/// </exception>
public void Validate()
{
if (!PngConstants.ColorTypes.TryGetValue(this.ColorType, out byte[] supportedBitDepths))
if (!PngConstants.ColorTypes.TryGetValue(this.ColorType, out byte[]? supportedBitDepths))
{
throw new NotSupportedException($"Invalid or unsupported color type. Was '{this.ColorType}'.");
}

15
src/ImageSharp/Formats/Png/PngChunk.cs
View File

@ -1,8 +1,8 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
#nullable disable
using System.Buffers;
using SixLabors.ImageSharp.Memory;
namespace SixLabors.ImageSharp.Formats.Png;
@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Formats.Png;
/// </summary>
internal readonly struct PngChunk
{
public PngChunk(int length, PngChunkType type, IMemoryOwner<byte> data = null)
public PngChunk(int length, PngChunkType type, IMemoryOwner<byte>? data = null)
{
this.Length = length;
this.Type = type;
@ -36,7 +36,16 @@ internal readonly struct PngChunk
/// Gets the data bytes appropriate to the chunk type, if any.
/// This field can be of zero length or null.
/// </summary>
public IMemoryOwner<byte> Data { get; }
public IMemoryOwner<byte>? Data { get; }
public ReadOnlySpan<byte> DataSpan
{
get
{
DebugGuard.NotNull(this.Data);
return this.Data.GetSpan();
}
}
/// <summary>
/// Gets a value indicating whether the given chunk is critical to decoding

52
src/ImageSharp/Formats/Png/PngDecoderCore.cs
View File

@ -192,24 +192,24 @@ internal sealed class PngDecoderCore : ImageDecoderCore
PngThrowHelper.ThrowInvalidHeader();
}
this.ReadHeaderChunk(pngMetadata, chunk.Data.GetSpan());
this.ReadHeaderChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.AnimationControl:
this.ReadAnimationControlChunk(pngMetadata, chunk.Data.GetSpan());
this.ReadAnimationControlChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.Physical:
ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
ReadPhysicalChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.Gamma:
ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
ReadGammaChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.Cicp:
ReadCicpChunk(metadata, chunk.Data.GetSpan());
ReadCicpChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.FrameControl:
frameCount++;
currentFrame = null;
currentFrameControl = this.ReadFrameControlChunk(chunk.Data.GetSpan());
currentFrameControl = this.ReadFrameControlChunk(chunk.DataSpan);
break;
case PngChunkType.FrameData:
if (frameCount >= this.maxFrames)
@ -277,32 +277,32 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
case PngChunkType.Palette:
this.palette = chunk.Data.GetSpan().ToArray();
this.palette = chunk.DataSpan.ToArray();
break;
case PngChunkType.Transparency:
this.paletteAlpha = chunk.Data.GetSpan().ToArray();
this.paletteAlpha = chunk.DataSpan.ToArray();
this.AssignTransparentMarkers(this.paletteAlpha, pngMetadata);
break;
case PngChunkType.Text:
this.ReadTextChunk(metadata, pngMetadata, chunk.Data.GetSpan());
this.ReadTextChunk(metadata, pngMetadata, chunk.DataSpan);
break;
case PngChunkType.CompressedText:
this.ReadCompressedTextChunk(metadata, pngMetadata, chunk.Data.GetSpan());
this.ReadCompressedTextChunk(metadata, pngMetadata, chunk.DataSpan);
break;
case PngChunkType.InternationalText:
this.ReadInternationalTextChunk(metadata, chunk.Data.GetSpan());
this.ReadInternationalTextChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.Exif:
if (!this.skipMetadata)
{
byte[] exifData = new byte[chunk.Length];
chunk.Data.GetSpan().CopyTo(exifData);
chunk.DataSpan.CopyTo(exifData);
MergeOrSetExifProfile(metadata, new ExifProfile(exifData), replaceExistingKeys: true);
}
break;
case PngChunkType.EmbeddedColorProfile:
this.ReadColorProfileChunk(metadata, chunk.Data.GetSpan());
this.ReadColorProfileChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.End:
goto EOF;
@ -360,10 +360,10 @@ internal sealed class PngDecoderCore : ImageDecoderCore
switch (chunk.Type)
{
case PngChunkType.Header:
this.ReadHeaderChunk(pngMetadata, chunk.Data.GetSpan());
this.ReadHeaderChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.AnimationControl:
this.ReadAnimationControlChunk(pngMetadata, chunk.Data.GetSpan());
this.ReadAnimationControlChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.Physical:
if (this.colorMetadataOnly)
@ -372,7 +372,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
ReadPhysicalChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.Gamma:
if (this.colorMetadataOnly)
@ -381,7 +381,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
ReadGammaChunk(pngMetadata, chunk.Data.GetSpan());
ReadGammaChunk(pngMetadata, chunk.DataSpan);
break;
case PngChunkType.Cicp:
if (this.colorMetadataOnly)
@ -390,7 +390,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
ReadCicpChunk(metadata, chunk.Data.GetSpan());
ReadCicpChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.FrameControl:
++frameCount;
@ -399,7 +399,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
currentFrameControl = this.ReadFrameControlChunk(chunk.Data.GetSpan());
currentFrameControl = this.ReadFrameControlChunk(chunk.DataSpan);
break;
case PngChunkType.FrameData:
@ -445,11 +445,11 @@ internal sealed class PngDecoderCore : ImageDecoderCore
this.SkipChunkDataAndCrc(chunk);
break;
case PngChunkType.Palette:
this.palette = chunk.Data.GetSpan().ToArray();
this.palette = chunk.DataSpan.ToArray();
break;
case PngChunkType.Transparency:
this.paletteAlpha = chunk.Data.GetSpan().ToArray();
this.paletteAlpha = chunk.DataSpan.ToArray();
this.AssignTransparentMarkers(this.paletteAlpha, pngMetadata);
// Spec says tRNS must be after PLTE so safe to exit.
@ -466,7 +466,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
this.ReadTextChunk(metadata, pngMetadata, chunk.Data.GetSpan());
this.ReadTextChunk(metadata, pngMetadata, chunk.DataSpan);
break;
case PngChunkType.CompressedText:
if (this.colorMetadataOnly)
@ -475,7 +475,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
this.ReadCompressedTextChunk(metadata, pngMetadata, chunk.Data.GetSpan());
this.ReadCompressedTextChunk(metadata, pngMetadata, chunk.DataSpan);
break;
case PngChunkType.InternationalText:
if (this.colorMetadataOnly)
@ -484,7 +484,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
break;
}
this.ReadInternationalTextChunk(metadata, chunk.Data.GetSpan());
this.ReadInternationalTextChunk(metadata, chunk.DataSpan);
break;
case PngChunkType.Exif:
if (this.colorMetadataOnly)
@ -496,7 +496,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
if (!this.skipMetadata)
{
byte[] exifData = new byte[chunk.Length];
chunk.Data.GetSpan().CopyTo(exifData);
chunk.DataSpan.CopyTo(exifData);
MergeOrSetExifProfile(metadata, new ExifProfile(exifData), replaceExistingKeys: true);
}
@ -2015,7 +2015,7 @@ internal sealed class PngDecoderCore : ImageDecoderCore
this.crc32.Reset();
this.crc32.Append(chunkType);
this.crc32.Append(chunk.Data.GetSpan());
this.crc32.Append(chunk.DataSpan);
if (this.crc32.GetCurrentHashAsUInt32() != inputCrc)
{

Write Preview
Loading…
Cancel
Save