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

Fix build issues after merging the master branch

pull/1552/head
Brian Popow 6 years ago
parent
6c76364bf1
commit
dd3aa98641
3 changed files with 76 additions and 39 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. 37
      src/ImageSharp/Formats/WebP/WebPDecoder.cs
  2. 77
      src/ImageSharp/Formats/WebP/WebPDecoderCore.cs
  3. 1
      src/ImageSharp/Formats/WebP/WebPEncoderCore.cs

37
src/ImageSharp/Formats/WebP/WebPDecoder.cs
View File

@ -3,6 +3,9 @@
using System.IO;
using System.Threading.Tasks;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats;
namespace SixLabors.ImageSharp.Formats.WebP
@ -23,7 +26,19 @@ namespace SixLabors.ImageSharp.Formats.WebP
{
Guard.NotNull(stream, nameof(stream));
return new WebPDecoderCore(configuration, this).Decode<TPixel>(stream);
var decoder = new WebPDecoderCore(configuration, this);
try
{
using var bufferedStream = new BufferedReadStream(configuration, stream);
return decoder.Decode<TPixel>(bufferedStream);
}
catch (InvalidMemoryOperationException ex)
{
Size dims = decoder.Dimensions;
throw new InvalidImageContentException($"Cannot decode image. Failed to allocate buffers for possibly degenerate dimensions: {dims.Width}x{dims.Height}. This error can happen for very large RLE bitmaps, which are not supported.", ex);
}
}
/// <inheritdoc/>
@ -31,7 +46,8 @@ namespace SixLabors.ImageSharp.Formats.WebP
{
Guard.NotNull(stream, nameof(stream));
return new WebPDecoderCore(configuration, this).Identify(stream);
using var bufferedStream = new BufferedReadStream(configuration, stream);
return new WebPDecoderCore(configuration, this).Identify(bufferedStream);
}
/// <inheritdoc />
@ -43,7 +59,19 @@ namespace SixLabors.ImageSharp.Formats.WebP
{
Guard.NotNull(stream, nameof(stream));
return new WebPDecoderCore(configuration, this).DecodeAsync<TPixel>(stream);
var decoder = new WebPDecoderCore(configuration, this);
try
{
using var bufferedStream = new BufferedReadStream(configuration, stream);
return decoder.DecodeAsync<TPixel>(bufferedStream);
}
catch (InvalidMemoryOperationException ex)
{
Size dims = decoder.Dimensions;
throw new InvalidImageContentException($"Cannot decode image. Failed to allocate buffers for possibly degenerate dimensions: {dims.Width}x{dims.Height}. This error can happen for very large RLE bitmaps, which are not supported.", ex);
}
}
/// <inheritdoc />
@ -55,7 +83,8 @@ namespace SixLabors.ImageSharp.Formats.WebP
{
Guard.NotNull(stream, nameof(stream));
return new WebPDecoderCore(configuration, this).IdentifyAsync(stream);
using var bufferedStream = new BufferedReadStream(configuration, stream);
return new WebPDecoderCore(configuration, this).IdentifyAsync(bufferedStream);
}
}
}

77
src/ImageSharp/Formats/WebP/WebPDecoderCore.cs
View File

@ -8,6 +8,7 @@ using System.IO;
using SixLabors.ImageSharp.Formats.WebP.BitReader;
using SixLabors.ImageSharp.Formats.WebP.Lossless;
using SixLabors.ImageSharp.Formats.WebP.Lossy;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
@ -41,6 +42,11 @@ namespace SixLabors.ImageSharp.Formats.WebP
/// </summary>
private WebPMetadata webpMetadata;
/// <summary>
/// Information about the webp image.
/// </summary>
private WebPImageInfo webImageInfo;
/// <summary>
/// Initializes a new instance of the <see cref="WebPDecoderCore"/> class.
/// </summary>
@ -67,58 +73,59 @@ namespace SixLabors.ImageSharp.Formats.WebP
public Configuration Configuration { get; }
/// <summary>
/// Decodes the image from the specified <see cref="Stream"/> and sets the data to the image.
/// Gets the dimensions of the image.
/// </summary>
/// <typeparam name="TPixel">The pixel format.</typeparam>
/// <param name="stream">The stream, where the image should be.</param>
/// <returns>The decoded image.</returns>
public Image<TPixel> Decode<TPixel>(Stream stream)
public Size Dimensions => new Size((int)this.webImageInfo.Width, (int)this.webImageInfo.Height);
/// <inheritdoc />
public Image<TPixel> Decode<TPixel>(BufferedReadStream stream)
where TPixel : unmanaged, IPixel<TPixel>
{
this.Metadata = new ImageMetadata();
this.currentStream = stream;
this.ReadImageHeader();
using WebPImageInfo imageInfo = this.ReadVp8Info();
if (imageInfo.Features != null && imageInfo.Features.Animation)
{
WebPThrowHelper.ThrowNotSupportedException("Animations are not supported");
}
var image = new Image<TPixel>(this.Configuration, (int)imageInfo.Width, (int)imageInfo.Height, this.Metadata);
Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer();
if (imageInfo.IsLossless)
{
var losslessDecoder = new WebPLosslessDecoder(imageInfo.Vp8LBitReader, this.memoryAllocator, this.Configuration);
losslessDecoder.Decode(pixels, image.Width, image.Height);
}
else
using (this.webImageInfo = this.ReadVp8Info())
{
var lossyDecoder = new WebPLossyDecoder(imageInfo.Vp8BitReader, this.memoryAllocator, this.Configuration);
lossyDecoder.Decode(pixels, image.Width, image.Height, imageInfo);
}
if (this.webImageInfo.Features != null && this.webImageInfo.Features.Animation)
{
WebPThrowHelper.ThrowNotSupportedException("Animations are not supported");
}
// There can be optional chunks after the image data, like EXIF and XMP.
if (imageInfo.Features != null)
{
this.ParseOptionalChunks(imageInfo.Features);
}
var image = new Image<TPixel>(this.Configuration, (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, this.Metadata);
Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer();
if (this.webImageInfo.IsLossless)
{
var losslessDecoder = new WebPLosslessDecoder(this.webImageInfo.Vp8LBitReader, this.memoryAllocator, this.Configuration);
losslessDecoder.Decode(pixels, image.Width, image.Height);
}
else
{
var lossyDecoder = new WebPLossyDecoder(this.webImageInfo.Vp8BitReader, this.memoryAllocator, this.Configuration);
lossyDecoder.Decode(pixels, image.Width, image.Height, this.webImageInfo);
}
// There can be optional chunks after the image data, like EXIF and XMP.
if (this.webImageInfo.Features != null)
{
this.ParseOptionalChunks(this.webImageInfo.Features);
}
return image;
return image;
}
}
/// <summary>
/// Reads the raw image information from the specified stream.
/// </summary>
/// <param name="stream">The <see cref="Stream"/> containing image data.</param>
public IImageInfo Identify(Stream stream)
/// <inheritdoc />
public IImageInfo Identify(BufferedReadStream stream)
{
this.currentStream = stream;
this.ReadImageHeader();
WebPImageInfo imageInfo = this.ReadVp8Info();
return new ImageInfo(new PixelTypeInfo((int)imageInfo.BitsPerPixel), (int)imageInfo.Width, (int)imageInfo.Height, this.Metadata);
using (this.webImageInfo = this.ReadVp8Info())
{
return new ImageInfo(new PixelTypeInfo((int)this.webImageInfo.BitsPerPixel), (int)this.webImageInfo.Width, (int)this.webImageInfo.Height, this.Metadata);
}
}
/// <summary>

1
src/ImageSharp/Formats/WebP/WebPEncoderCore.cs
View File

@ -3,6 +3,7 @@
using System.IO;
using System.Threading.Tasks;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats.WebP.Lossless;
using SixLabors.ImageSharp.Formats.WebP.Lossy;

Write Preview
Loading…
Cancel
Save