|
|
@ -12,8 +12,8 @@ using SixLabors.ImageSharp.Formats.Png.Chunks; |
|
|
using SixLabors.ImageSharp.Formats.Png.Filters; |
|
|
using SixLabors.ImageSharp.Formats.Png.Filters; |
|
|
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|
|
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|
|
using SixLabors.ImageSharp.Memory; |
|
|
using SixLabors.ImageSharp.Memory; |
|
|
using SixLabors.ImageSharp.MetaData; |
|
|
using SixLabors.ImageSharp.Metadata; |
|
|
using SixLabors.ImageSharp.MetaData.Profiles.Exif; |
|
|
using SixLabors.ImageSharp.Metadata.Profiles.Exif; |
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
using SixLabors.ImageSharp.PixelFormats; |
|
|
using SixLabors.Memory; |
|
|
using SixLabors.Memory; |
|
|
|
|
|
|
|
|
@ -157,8 +157,8 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
public Image<TPixel> Decode<TPixel>(Stream stream) |
|
|
public Image<TPixel> Decode<TPixel>(Stream stream) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
var metaData = new ImageMetaData(); |
|
|
var metadata = new ImageMetadata(); |
|
|
PngMetaData pngMetaData = metaData.GetFormatMetaData(PngFormat.Instance); |
|
|
PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance); |
|
|
this.currentStream = stream; |
|
|
this.currentStream = stream; |
|
|
this.currentStream.Skip(8); |
|
|
this.currentStream.Skip(8); |
|
|
Image<TPixel> image = null; |
|
|
Image<TPixel> image = null; |
|
|
@ -171,24 +171,24 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
switch (chunk.Type) |
|
|
switch (chunk.Type) |
|
|
{ |
|
|
{ |
|
|
case PngChunkType.Header: |
|
|
case PngChunkType.Header: |
|
|
this.ReadHeaderChunk(pngMetaData, chunk.Data.Array); |
|
|
this.ReadHeaderChunk(pngMetadata, chunk.Data.Array); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Physical: |
|
|
case PngChunkType.Physical: |
|
|
this.ReadPhysicalChunk(metaData, chunk.Data.GetSpan()); |
|
|
this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan()); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Gamma: |
|
|
case PngChunkType.Gamma: |
|
|
this.ReadGammaChunk(pngMetaData, chunk.Data.GetSpan()); |
|
|
this.ReadGammaChunk(pngMetadata, chunk.Data.GetSpan()); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Data: |
|
|
case PngChunkType.Data: |
|
|
if (image is null) |
|
|
if (image is null) |
|
|
{ |
|
|
{ |
|
|
this.InitializeImage(metaData, out image); |
|
|
this.InitializeImage(metadata, out image); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
using (var deframeStream = new ZlibInflateStream(this.currentStream, this.ReadNextDataChunk)) |
|
|
using (var deframeStream = new ZlibInflateStream(this.currentStream, this.ReadNextDataChunk)) |
|
|
{ |
|
|
{ |
|
|
deframeStream.AllocateNewBytes(chunk.Length); |
|
|
deframeStream.AllocateNewBytes(chunk.Length); |
|
|
this.ReadScanlines(deframeStream.CompressedStream, image.Frames.RootFrame, pngMetaData); |
|
|
this.ReadScanlines(deframeStream.CompressedStream, image.Frames.RootFrame, pngMetadata); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
@ -201,17 +201,17 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
byte[] alpha = new byte[chunk.Length]; |
|
|
byte[] alpha = new byte[chunk.Length]; |
|
|
Buffer.BlockCopy(chunk.Data.Array, 0, alpha, 0, chunk.Length); |
|
|
Buffer.BlockCopy(chunk.Data.Array, 0, alpha, 0, chunk.Length); |
|
|
this.paletteAlpha = alpha; |
|
|
this.paletteAlpha = alpha; |
|
|
this.AssignTransparentMarkers(alpha, pngMetaData); |
|
|
this.AssignTransparentMarkers(alpha, pngMetadata); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Text: |
|
|
case PngChunkType.Text: |
|
|
this.ReadTextChunk(metaData, chunk.Data.Array.AsSpan(0, chunk.Length)); |
|
|
this.ReadTextChunk(metadata, chunk.Data.Array.AsSpan(0, chunk.Length)); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Exif: |
|
|
case PngChunkType.Exif: |
|
|
if (!this.ignoreMetadata) |
|
|
if (!this.ignoreMetadata) |
|
|
{ |
|
|
{ |
|
|
byte[] exifData = new byte[chunk.Length]; |
|
|
byte[] exifData = new byte[chunk.Length]; |
|
|
Buffer.BlockCopy(chunk.Data.Array, 0, exifData, 0, chunk.Length); |
|
|
Buffer.BlockCopy(chunk.Data.Array, 0, exifData, 0, chunk.Length); |
|
|
metaData.ExifProfile = new ExifProfile(exifData); |
|
|
metadata.ExifProfile = new ExifProfile(exifData); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
@ -246,8 +246,8 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <param name="stream">The <see cref="Stream"/> containing image data.</param>
|
|
|
/// <param name="stream">The <see cref="Stream"/> containing image data.</param>
|
|
|
public IImageInfo Identify(Stream stream) |
|
|
public IImageInfo Identify(Stream stream) |
|
|
{ |
|
|
{ |
|
|
var metaData = new ImageMetaData(); |
|
|
var metadata = new ImageMetadata(); |
|
|
PngMetaData pngMetaData = metaData.GetFormatMetaData(PngFormat.Instance); |
|
|
PngMetadata pngMetadata = metadata.GetFormatMetadata(PngFormat.Instance); |
|
|
this.currentStream = stream; |
|
|
this.currentStream = stream; |
|
|
this.currentStream.Skip(8); |
|
|
this.currentStream.Skip(8); |
|
|
try |
|
|
try |
|
|
@ -259,19 +259,19 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
switch (chunk.Type) |
|
|
switch (chunk.Type) |
|
|
{ |
|
|
{ |
|
|
case PngChunkType.Header: |
|
|
case PngChunkType.Header: |
|
|
this.ReadHeaderChunk(pngMetaData, chunk.Data.Array); |
|
|
this.ReadHeaderChunk(pngMetadata, chunk.Data.Array); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Physical: |
|
|
case PngChunkType.Physical: |
|
|
this.ReadPhysicalChunk(metaData, chunk.Data.GetSpan()); |
|
|
this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan()); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Gamma: |
|
|
case PngChunkType.Gamma: |
|
|
this.ReadGammaChunk(pngMetaData, chunk.Data.GetSpan()); |
|
|
this.ReadGammaChunk(pngMetadata, chunk.Data.GetSpan()); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Data: |
|
|
case PngChunkType.Data: |
|
|
this.SkipChunkDataAndCrc(chunk); |
|
|
this.SkipChunkDataAndCrc(chunk); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.Text: |
|
|
case PngChunkType.Text: |
|
|
this.ReadTextChunk(metaData, chunk.Data.Array.AsSpan(0, chunk.Length)); |
|
|
this.ReadTextChunk(metadata, chunk.Data.Array.AsSpan(0, chunk.Length)); |
|
|
break; |
|
|
break; |
|
|
case PngChunkType.End: |
|
|
case PngChunkType.End: |
|
|
this.isEndChunkReached = true; |
|
|
this.isEndChunkReached = true; |
|
|
@ -295,7 +295,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
throw new ImageFormatException("PNG Image does not contain a header chunk"); |
|
|
throw new ImageFormatException("PNG Image does not contain a header chunk"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return new ImageInfo(new PixelTypeInfo(this.CalculateBitsPerPixel()), this.header.Width, this.header.Height, metaData); |
|
|
return new ImageInfo(new PixelTypeInfo(this.CalculateBitsPerPixel()), this.header.Width, this.header.Height, metadata); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
@ -350,7 +350,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <param name="metadata">The metadata to read to.</param>
|
|
|
/// <param name="metadata">The metadata to read to.</param>
|
|
|
/// <param name="data">The data containing physical data.</param>
|
|
|
/// <param name="data">The data containing physical data.</param>
|
|
|
private void ReadPhysicalChunk(ImageMetaData metadata, ReadOnlySpan<byte> data) |
|
|
private void ReadPhysicalChunk(ImageMetadata metadata, ReadOnlySpan<byte> data) |
|
|
{ |
|
|
{ |
|
|
var physicalChunk = PhysicalChunkData.Parse(data); |
|
|
var physicalChunk = PhysicalChunkData.Parse(data); |
|
|
|
|
|
|
|
|
@ -367,7 +367,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <param name="pngMetadata">The metadata to read to.</param>
|
|
|
/// <param name="pngMetadata">The metadata to read to.</param>
|
|
|
/// <param name="data">The data containing physical data.</param>
|
|
|
/// <param name="data">The data containing physical data.</param>
|
|
|
private void ReadGammaChunk(PngMetaData pngMetadata, ReadOnlySpan<byte> data) |
|
|
private void ReadGammaChunk(PngMetadata pngMetadata, ReadOnlySpan<byte> data) |
|
|
{ |
|
|
{ |
|
|
// The value is encoded as a 4-byte unsigned integer, representing gamma times 100000.
|
|
|
// The value is encoded as a 4-byte unsigned integer, representing gamma times 100000.
|
|
|
// For example, a gamma of 1/2.2 would be stored as 45455.
|
|
|
// For example, a gamma of 1/2.2 would be stored as 45455.
|
|
|
@ -380,7 +380,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The type the pixels will be</typeparam>
|
|
|
/// <typeparam name="TPixel">The type the pixels will be</typeparam>
|
|
|
/// <param name="metadata">The metadata information for the image</param>
|
|
|
/// <param name="metadata">The metadata information for the image</param>
|
|
|
/// <param name="image">The image that we will populate</param>
|
|
|
/// <param name="image">The image that we will populate</param>
|
|
|
private void InitializeImage<TPixel>(ImageMetaData metadata, out Image<TPixel> image) |
|
|
private void InitializeImage<TPixel>(ImageMetadata metadata, out Image<TPixel> image) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
image = new Image<TPixel>(this.configuration, this.header.Width, this.header.Height, metadata); |
|
|
image = new Image<TPixel>(this.configuration, this.header.Width, this.header.Height, metadata); |
|
|
@ -471,17 +471,17 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <param name="dataStream">The <see cref="MemoryStream"/> containing data.</param>
|
|
|
/// <param name="dataStream">The <see cref="MemoryStream"/> containing data.</param>
|
|
|
/// <param name="image"> The pixel data.</param>
|
|
|
/// <param name="image"> The pixel data.</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata</param>
|
|
|
private void ReadScanlines<TPixel>(Stream dataStream, ImageFrame<TPixel> image, PngMetaData pngMetaData) |
|
|
private void ReadScanlines<TPixel>(Stream dataStream, ImageFrame<TPixel> image, PngMetadata pngMetadata) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
if (this.header.InterlaceMethod == PngInterlaceMode.Adam7) |
|
|
if (this.header.InterlaceMethod == PngInterlaceMode.Adam7) |
|
|
{ |
|
|
{ |
|
|
this.DecodeInterlacedPixelData(dataStream, image, pngMetaData); |
|
|
this.DecodeInterlacedPixelData(dataStream, image, pngMetadata); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
this.DecodePixelData(dataStream, image, pngMetaData); |
|
|
this.DecodePixelData(dataStream, image, pngMetadata); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -491,8 +491,8 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <param name="compressedStream">The compressed pixel data stream.</param>
|
|
|
/// <param name="compressedStream">The compressed pixel data stream.</param>
|
|
|
/// <param name="image">The image to decode to.</param>
|
|
|
/// <param name="image">The image to decode to.</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata</param>
|
|
|
private void DecodePixelData<TPixel>(Stream compressedStream, ImageFrame<TPixel> image, PngMetaData pngMetaData) |
|
|
private void DecodePixelData<TPixel>(Stream compressedStream, ImageFrame<TPixel> image, PngMetadata pngMetadata) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
while (this.currentRow < this.header.Height) |
|
|
while (this.currentRow < this.header.Height) |
|
|
@ -532,7 +532,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
throw new ImageFormatException("Unknown filter type."); |
|
|
throw new ImageFormatException("Unknown filter type."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.ProcessDefilteredScanline(scanlineSpan, image, pngMetaData); |
|
|
this.ProcessDefilteredScanline(scanlineSpan, image, pngMetadata); |
|
|
|
|
|
|
|
|
this.SwapBuffers(); |
|
|
this.SwapBuffers(); |
|
|
this.currentRow++; |
|
|
this.currentRow++; |
|
|
@ -546,8 +546,8 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <param name="compressedStream">The compressed pixel data stream.</param>
|
|
|
/// <param name="compressedStream">The compressed pixel data stream.</param>
|
|
|
/// <param name="image">The current image.</param>
|
|
|
/// <param name="image">The current image.</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata.</param>
|
|
|
private void DecodeInterlacedPixelData<TPixel>(Stream compressedStream, ImageFrame<TPixel> image, PngMetaData pngMetaData) |
|
|
private void DecodeInterlacedPixelData<TPixel>(Stream compressedStream, ImageFrame<TPixel> image, PngMetadata pngMetadata) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
while (true) |
|
|
while (true) |
|
|
@ -604,7 +604,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Span<TPixel> rowSpan = image.GetPixelRowSpan(this.currentRow); |
|
|
Span<TPixel> rowSpan = image.GetPixelRowSpan(this.currentRow); |
|
|
this.ProcessInterlacedDefilteredScanline(this.scanline.GetSpan(), rowSpan, pngMetaData, Adam7.FirstColumn[this.pass], Adam7.ColumnIncrement[this.pass]); |
|
|
this.ProcessInterlacedDefilteredScanline(this.scanline.GetSpan(), rowSpan, pngMetadata, Adam7.FirstColumn[this.pass], Adam7.ColumnIncrement[this.pass]); |
|
|
|
|
|
|
|
|
this.SwapBuffers(); |
|
|
this.SwapBuffers(); |
|
|
|
|
|
|
|
|
@ -632,8 +632,8 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <param name="defilteredScanline">The de-filtered scanline</param>
|
|
|
/// <param name="defilteredScanline">The de-filtered scanline</param>
|
|
|
/// <param name="pixels">The image</param>
|
|
|
/// <param name="pixels">The image</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata.</param>
|
|
|
private void ProcessDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, ImageFrame<TPixel> pixels, PngMetaData pngMetaData) |
|
|
private void ProcessDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, ImageFrame<TPixel> pixels, PngMetadata pngMetadata) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow); |
|
|
Span<TPixel> rowSpan = pixels.GetPixelRowSpan(this.currentRow); |
|
|
@ -653,9 +653,9 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
this.header, |
|
|
this.header, |
|
|
scanlineSpan, |
|
|
scanlineSpan, |
|
|
rowSpan, |
|
|
rowSpan, |
|
|
pngMetaData.HasTrans, |
|
|
pngMetadata.HasTrans, |
|
|
pngMetaData.TransparentGray16.GetValueOrDefault(), |
|
|
pngMetadata.TransparentGray16.GetValueOrDefault(), |
|
|
pngMetaData.TransparentGray8.GetValueOrDefault()); |
|
|
pngMetadata.TransparentGray8.GetValueOrDefault()); |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
@ -687,9 +687,9 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
rowSpan, |
|
|
rowSpan, |
|
|
this.bytesPerPixel, |
|
|
this.bytesPerPixel, |
|
|
this.bytesPerSample, |
|
|
this.bytesPerSample, |
|
|
pngMetaData.HasTrans, |
|
|
pngMetadata.HasTrans, |
|
|
pngMetaData.TransparentRgb48.GetValueOrDefault(), |
|
|
pngMetadata.TransparentRgb48.GetValueOrDefault(), |
|
|
pngMetaData.TransparentRgb24.GetValueOrDefault()); |
|
|
pngMetadata.TransparentRgb24.GetValueOrDefault()); |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
@ -714,10 +714,10 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <typeparam name="TPixel">The pixel format.</typeparam>
|
|
|
/// <param name="defilteredScanline">The de-filtered scanline</param>
|
|
|
/// <param name="defilteredScanline">The de-filtered scanline</param>
|
|
|
/// <param name="rowSpan">The current image row.</param>
|
|
|
/// <param name="rowSpan">The current image row.</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata.</param>
|
|
|
/// <param name="pixelOffset">The column start index. Always 0 for none interlaced images.</param>
|
|
|
/// <param name="pixelOffset">The column start index. Always 0 for none interlaced images.</param>
|
|
|
/// <param name="increment">The column increment. Always 1 for none interlaced images.</param>
|
|
|
/// <param name="increment">The column increment. Always 1 for none interlaced images.</param>
|
|
|
private void ProcessInterlacedDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, Span<TPixel> rowSpan, PngMetaData pngMetaData, int pixelOffset = 0, int increment = 1) |
|
|
private void ProcessInterlacedDefilteredScanline<TPixel>(ReadOnlySpan<byte> defilteredScanline, Span<TPixel> rowSpan, PngMetadata pngMetadata, int pixelOffset = 0, int increment = 1) |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
where TPixel : struct, IPixel<TPixel> |
|
|
{ |
|
|
{ |
|
|
// Trim the first marker byte from the buffer
|
|
|
// Trim the first marker byte from the buffer
|
|
|
@ -737,9 +737,9 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
rowSpan, |
|
|
rowSpan, |
|
|
pixelOffset, |
|
|
pixelOffset, |
|
|
increment, |
|
|
increment, |
|
|
pngMetaData.HasTrans, |
|
|
pngMetadata.HasTrans, |
|
|
pngMetaData.TransparentGray16.GetValueOrDefault(), |
|
|
pngMetadata.TransparentGray16.GetValueOrDefault(), |
|
|
pngMetaData.TransparentGray8.GetValueOrDefault()); |
|
|
pngMetadata.TransparentGray8.GetValueOrDefault()); |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
@ -776,9 +776,9 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
increment, |
|
|
increment, |
|
|
this.bytesPerPixel, |
|
|
this.bytesPerPixel, |
|
|
this.bytesPerSample, |
|
|
this.bytesPerSample, |
|
|
pngMetaData.HasTrans, |
|
|
pngMetadata.HasTrans, |
|
|
pngMetaData.TransparentRgb48.GetValueOrDefault(), |
|
|
pngMetadata.TransparentRgb48.GetValueOrDefault(), |
|
|
pngMetaData.TransparentRgb24.GetValueOrDefault()); |
|
|
pngMetadata.TransparentRgb24.GetValueOrDefault()); |
|
|
|
|
|
|
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
@ -799,11 +799,11 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Decodes and assigns marker colors that identify transparent pixels in non indexed images
|
|
|
/// Decodes and assigns marker colors that identify transparent pixels in non indexed images.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <param name="alpha">The alpha tRNS array</param>
|
|
|
/// <param name="alpha">The alpha tRNS array.</param>
|
|
|
/// <param name="pngMetaData">The png meta data</param>
|
|
|
/// <param name="pngMetadata">The png metadata.</param>
|
|
|
private void AssignTransparentMarkers(ReadOnlySpan<byte> alpha, PngMetaData pngMetaData) |
|
|
private void AssignTransparentMarkers(ReadOnlySpan<byte> alpha, PngMetadata pngMetadata) |
|
|
{ |
|
|
{ |
|
|
if (this.pngColorType == PngColorType.Rgb) |
|
|
if (this.pngColorType == PngColorType.Rgb) |
|
|
{ |
|
|
{ |
|
|
@ -815,16 +815,16 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
ushort gc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(2, 2)); |
|
|
ushort gc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(2, 2)); |
|
|
ushort bc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(4, 2)); |
|
|
ushort bc = BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(4, 2)); |
|
|
|
|
|
|
|
|
pngMetaData.TransparentRgb48 = new Rgb48(rc, gc, bc); |
|
|
pngMetadata.TransparentRgb48 = new Rgb48(rc, gc, bc); |
|
|
pngMetaData.HasTrans = true; |
|
|
pngMetadata.HasTrans = true; |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
byte r = ReadByteLittleEndian(alpha, 0); |
|
|
byte r = ReadByteLittleEndian(alpha, 0); |
|
|
byte g = ReadByteLittleEndian(alpha, 2); |
|
|
byte g = ReadByteLittleEndian(alpha, 2); |
|
|
byte b = ReadByteLittleEndian(alpha, 4); |
|
|
byte b = ReadByteLittleEndian(alpha, 4); |
|
|
pngMetaData.TransparentRgb24 = new Rgb24(r, g, b); |
|
|
pngMetadata.TransparentRgb24 = new Rgb24(r, g, b); |
|
|
pngMetaData.HasTrans = true; |
|
|
pngMetadata.HasTrans = true; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else if (this.pngColorType == PngColorType.Grayscale) |
|
|
else if (this.pngColorType == PngColorType.Grayscale) |
|
|
@ -833,14 +833,14 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
{ |
|
|
{ |
|
|
if (this.header.BitDepth == 16) |
|
|
if (this.header.BitDepth == 16) |
|
|
{ |
|
|
{ |
|
|
pngMetaData.TransparentGray16 = new Gray16(BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(0, 2))); |
|
|
pngMetadata.TransparentGray16 = new Gray16(BinaryPrimitives.ReadUInt16LittleEndian(alpha.Slice(0, 2))); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
pngMetaData.TransparentGray8 = new Gray8(ReadByteLittleEndian(alpha, 0)); |
|
|
pngMetadata.TransparentGray8 = new Gray8(ReadByteLittleEndian(alpha, 0)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pngMetaData.HasTrans = true; |
|
|
pngMetadata.HasTrans = true; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -848,16 +848,16 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Reads a header chunk from the data.
|
|
|
/// Reads a header chunk from the data.
|
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <param name="pngMetaData">The png metadata.</param>
|
|
|
/// <param name="pngMetadata">The png metadata.</param>
|
|
|
/// <param name="data">The <see cref="T:ReadOnlySpan{byte}"/> containing data.</param>
|
|
|
/// <param name="data">The <see cref="T:ReadOnlySpan{byte}"/> containing data.</param>
|
|
|
private void ReadHeaderChunk(PngMetaData pngMetaData, ReadOnlySpan<byte> data) |
|
|
private void ReadHeaderChunk(PngMetadata pngMetadata, ReadOnlySpan<byte> data) |
|
|
{ |
|
|
{ |
|
|
this.header = PngHeader.Parse(data); |
|
|
this.header = PngHeader.Parse(data); |
|
|
|
|
|
|
|
|
this.header.Validate(); |
|
|
this.header.Validate(); |
|
|
|
|
|
|
|
|
pngMetaData.BitDepth = (PngBitDepth)this.header.BitDepth; |
|
|
pngMetadata.BitDepth = (PngBitDepth)this.header.BitDepth; |
|
|
pngMetaData.ColorType = this.header.ColorType; |
|
|
pngMetadata.ColorType = this.header.ColorType; |
|
|
|
|
|
|
|
|
this.pngColorType = this.header.ColorType; |
|
|
this.pngColorType = this.header.ColorType; |
|
|
} |
|
|
} |
|
|
@ -867,7 +867,7 @@ namespace SixLabors.ImageSharp.Formats.Png |
|
|
/// </summary>
|
|
|
/// </summary>
|
|
|
/// <param name="metadata">The metadata to decode to.</param>
|
|
|
/// <param name="metadata">The metadata to decode to.</param>
|
|
|
/// <param name="data">The <see cref="T:Span"/> containing the data.</param>
|
|
|
/// <param name="data">The <see cref="T:Span"/> containing the data.</param>
|
|
|
private void ReadTextChunk(ImageMetaData metadata, ReadOnlySpan<byte> data) |
|
|
private void ReadTextChunk(ImageMetadata metadata, ReadOnlySpan<byte> data) |
|
|
{ |
|
|
{ |
|
|
if (this.ignoreMetadata) |
|
|
if (this.ignoreMetadata) |
|
|
{ |
|
|
{ |
|
|
|
Jason Nelson
7 years ago
James Jackson-South