Skip to content

Add support decoding tiffs with horizontal predictor and bit depth > 8 #1729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 11, 2021
Merged

Add support decoding tiffs with horizontal predictor and bit depth > 8 #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1aea006
Add support for horizontal predictor for 16 bit gray tiff's
brianpopow Aug 7, 2021
78efd68
Add support for horizontal predictor for 32 bit gray tiff's
brianpopow Aug 7, 2021
484ec85
Add support for horizontal predictor with 16 bit color tiff's
brianpopow Aug 7, 2021
f8f0c10
Add support for horizontal predictor with 32 bit color tiff's
brianpopow Aug 7, 2021
6182eea
Merge remote-tracking branch 'origin/master' into bp/predictor
brianpopow Aug 9, 2021
05a4c5e
Merge remote-tracking branch 'origin/master' into bp/predictor
brianpopow Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/ImageSharp/Formats/Tiff/Compression/Decompressors/DeflateTiffCompression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using System.IO.Compression;

using SixLabors.ImageSharp.Compression.Zlib;
using SixLabors.ImageSharp.Formats.Tiff.Compression;
using SixLabors.ImageSharp.Formats.Tiff.Constants;
using SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;

Expand All @@ -20,16 +20,24 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Decompressors
/// </remarks>
internal class DeflateTiffCompression : TiffBaseDecompressor
{
private readonly bool isBigEndian;

private readonly TiffColorType colorType;

/// <summary>
/// Initializes a new instance of the <see cref="DeflateTiffCompression" /> class.
/// </summary>
/// <param name="memoryAllocator">The memoryAllocator to use for buffer allocations.</param>
/// <param name="width">The image width.</param>
/// <param name="bitsPerPixel">The bits used per pixel.</param>
/// <param name="colorType">The color type of the pixel data.</param>
/// <param name="predictor">The tiff predictor used.</param>
public DeflateTiffCompression(MemoryAllocator memoryAllocator, int width, int bitsPerPixel, TiffPredictor predictor)
/// <param name="isBigEndian">if set to <c>true</c> decodes the pixel data as big endian, otherwise as little endian.</param>
public DeflateTiffCompression(MemoryAllocator memoryAllocator, int width, int bitsPerPixel, TiffColorType colorType, TiffPredictor predictor, bool isBigEndian)
: base(memoryAllocator, width, bitsPerPixel, predictor)
{
this.colorType = colorType;
this.isBigEndian = isBigEndian;
}

/// <inheritdoc/>
Expand Down Expand Up @@ -62,7 +70,7 @@ protected override void Decompress(BufferedReadStream stream, int byteCount, Spa

if (this.Predictor == TiffPredictor.Horizontal)
{
HorizontalPredictor.Undo(buffer, this.Width, this.BitsPerPixel);
HorizontalPredictor.Undo(buffer, this.Width, this.colorType, this.isBigEndian);
}
}

Expand Down
13 changes: 11 additions & 2 deletions src/ImageSharp/Formats/Tiff/Compression/Decompressors/LzwTiffCompression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using SixLabors.ImageSharp.Formats.Tiff.Constants;
using SixLabors.ImageSharp.Formats.Tiff.PhotometricInterpretation;
using SixLabors.ImageSharp.IO;
using SixLabors.ImageSharp.Memory;

Expand All @@ -13,16 +14,24 @@ namespace SixLabors.ImageSharp.Formats.Tiff.Compression.Decompressors
/// </summary>
internal class LzwTiffCompression : TiffBaseDecompressor
{
private readonly bool isBigEndian;

private readonly TiffColorType colorType;

/// <summary>
/// Initializes a new instance of the <see cref="LzwTiffCompression" /> class.
/// </summary>
/// <param name="memoryAllocator">The memoryAllocator to use for buffer allocations.</param>
/// <param name="width">The image width.</param>
/// <param name="bitsPerPixel">The bits used per pixel.</param>
/// <param name="colorType">The color type of the pixel data.</param>
/// <param name="predictor">The tiff predictor used.</param>
public LzwTiffCompression(MemoryAllocator memoryAllocator, int width, int bitsPerPixel, TiffPredictor predictor)
/// <param name="isBigEndian">if set to <c>true</c> decodes the pixel data as big endian, otherwise as little endian.</param>
public LzwTiffCompression(MemoryAllocator memoryAllocator, int width, int bitsPerPixel, TiffColorType colorType, TiffPredictor predictor, bool isBigEndian)
: base(memoryAllocator, width, bitsPerPixel, predictor)
{
this.colorType = colorType;
this.isBigEndian = isBigEndian;
}

/// <inheritdoc/>
Expand All @@ -33,7 +42,7 @@ protected override void Decompress(BufferedReadStream stream, int byteCount, Spa

if (this.Predictor == TiffPredictor.Horizontal)
{
HorizontalPredictor.Undo(buffer, this.Width, this.BitsPerPixel);
HorizontalPredictor.Undo(buffer, this.Width, this.colorType, this.isBigEndian);
}
}

Expand Down
Loading