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

Add webp prefix to AlphaCompressionMethod

pull/1552/head
Brian Popow 5 years ago
parent
7ff7075e04
commit
8c3f9b9cb2
1 changed files with 5 additions and 5 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. 10
      src/ImageSharp/Formats/WebP/AlphaDecoder.cs

10
src/ImageSharp/Formats/WebP/AlphaDecoder.cs
View File

@ -37,13 +37,13 @@ namespace SixLabors.ImageSharp.Formats.Webp
this.LastRow = 0; this.LastRow = 0;
int totalPixels = width * height; int totalPixels = width * height;
var compression = (AlphaCompressionMethod)(alphaChunkHeader & 0x03); var compression = (WebpAlphaCompressionMethod)(alphaChunkHeader & 0x03);
if (compression != AlphaCompressionMethod.NoCompression && compression != AlphaCompressionMethod.WebPLosslessCompression) if (compression != WebpAlphaCompressionMethod.NoCompression && compression != WebpAlphaCompressionMethod.WebpLosslessCompression)
{ {
WebpThrowHelper.ThrowImageFormatException($"unexpected alpha compression method {compression} found"); WebpThrowHelper.ThrowImageFormatException($"unexpected alpha compression method {compression} found");
} }
this.Compressed = compression == AlphaCompressionMethod.WebPLosslessCompression; this.Compressed = compression == WebpAlphaCompressionMethod.WebpLosslessCompression;
// The filtering method used. Only values between 0 and 3 are valid. // The filtering method used. Only values between 0 and 3 are valid.
int filter = (alphaChunkHeader >> 2) & 0x03; int filter = (alphaChunkHeader >> 2) & 0x03;
@ -127,7 +127,7 @@ namespace SixLabors.ImageSharp.Formats.Webp
/// </summary> /// </summary>
public void Decode() public void Decode()
{ {
if (this.Compressed == false) if (!this.Compressed)
{ {
Span<byte> dataSpan = this.Data.Memory.Span; Span<byte> dataSpan = this.Data.Memory.Span;
int pixelCount = this.Width * this.Height; int pixelCount = this.Width * this.Height;
@ -222,7 +222,7 @@ namespace SixLabors.ImageSharp.Formats.Webp
{ {
// For vertical and gradient filtering, we need to decode the part above the // For vertical and gradient filtering, we need to decode the part above the
// cropTop row, in order to have the correct spatial predictors. // cropTop row, in order to have the correct spatial predictors.
int topRow = this.AlphaFilterType == WebpAlphaFilterType.None || this.AlphaFilterType == WebpAlphaFilterType.Horizontal ? 0 : this.LastRow; int topRow = this.AlphaFilterType is WebpAlphaFilterType.None or WebpAlphaFilterType.Horizontal ? 0 : this.LastRow;
int firstRow = this.LastRow < topRow ? topRow : this.LastRow; int firstRow = this.LastRow < topRow ? topRow : this.LastRow;
if (lastRow > firstRow) if (lastRow > firstRow)
{ {

Write Preview
Loading…
Cancel
Save