Add support for OpenEXR image format #3096
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Copyright (c) Six Labors. | ||
| // Licensed under the Six Labors Split License. | ||
|
|
||
| using SixLabors.ImageSharp.Formats.Exr.Constants; | ||
| using SixLabors.ImageSharp.Memory; | ||
|
|
||
| namespace SixLabors.ImageSharp.Formats.Exr.Compression.Compressors; | ||
|
|
||
| internal class NoneExrCompressor : ExrBaseCompressor | ||
| { | ||
| public NoneExrCompressor(Stream output, MemoryAllocator allocator, uint bytesPerBlock, uint bytesPerRow) | ||
| : base(output, allocator, bytesPerBlock, bytesPerRow) | ||
| { | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override ExrCompression Method => ExrCompression.Zip; | ||
|
Collaborator
Author
There was a problem hiding this comment. no, but is also not needed. I made this similar to how the TiffCompressors are defined, but currently the compression property is not used. I have removed it because of that. |
||
|
|
||
| /// <inheritdoc/> | ||
| public override uint CompressRowBlock(Span<byte> rows, int rowCount) | ||
| { | ||
| this.Output.Write(rows); | ||
| return (uint)rows.Length; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| protected override void Dispose(bool disposing) | ||
| { | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Copyright (c) Six Labors. | ||
| // Licensed under the Six Labors Split License. | ||
|
|
||
| using SixLabors.ImageSharp.Compression.Zlib; | ||
| using SixLabors.ImageSharp.Formats.Exr.Constants; | ||
| using SixLabors.ImageSharp.Memory; | ||
|
|
||
| namespace SixLabors.ImageSharp.Formats.Exr.Compression.Compressors; | ||
|
|
||
| internal class ZipExrCompressor : ExrBaseCompressor | ||
| { | ||
| private readonly DeflateCompressionLevel compressionLevel; | ||
|
|
||
| private readonly MemoryStream memoryStream; | ||
|
|
||
| private readonly System.Buffers.IMemoryOwner<byte> buffer; | ||
|
|
||
| public ZipExrCompressor(Stream output, MemoryAllocator allocator, uint bytesPerBlock, uint bytesPerRow, DeflateCompressionLevel compressionLevel) | ||
| : base(output, allocator, bytesPerBlock, bytesPerRow) | ||
| { | ||
| this.compressionLevel = compressionLevel; | ||
| this.buffer = allocator.Allocate<byte>((int)bytesPerBlock); | ||
| this.memoryStream = new(); | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override ExrCompression Method => ExrCompression.Zip; | ||
|
|
||
| /// <inheritdoc/> | ||
| public override uint CompressRowBlock(Span<byte> rows, int rowCount) | ||
| { | ||
| // Re-oder pixel values. | ||
| Span<byte> reordered = this.buffer.GetSpan()[..(int)(rowCount * this.BytesPerRow)]; | ||
| int n = reordered.Length; | ||
| int t1 = 0; | ||
| int t2 = (n + 1) >> 1; | ||
| for (int i = 0; i < n; i++) | ||
| { | ||
| bool isOdd = (i & 1) == 1; | ||
| reordered[isOdd ? t2++ : t1++] = rows[i]; | ||
| } | ||
|
|
||
| // Predictor. | ||
| Span<byte> predicted = reordered; | ||
| byte p = predicted[0]; | ||
| for (int i = 1; i < predicted.Length; i++) | ||
| { | ||
| int d = (predicted[i] - p + 128 + 256) & 255; | ||
| p = predicted[i]; | ||
| predicted[i] = (byte)d; | ||
| } | ||
|
|
||
| this.memoryStream.Seek(0, SeekOrigin.Begin); | ||
| using (ZlibDeflateStream stream = new(this.Allocator, this.memoryStream, this.compressionLevel)) | ||
| { | ||
| stream.Write(predicted); | ||
| stream.Flush(); | ||
| } | ||
|
|
||
| int size = (int)this.memoryStream.Position; | ||
| byte[] buffer = this.memoryStream.GetBuffer(); | ||
| this.Output.Write(buffer, 0, size); | ||
|
|
||
| // Reset memory stream for next pixel row. | ||
| this.memoryStream.Seek(0, SeekOrigin.Begin); | ||
| this.memoryStream.SetLength(0); | ||
|
|
||
| return (uint)size; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| protected override void Dispose(bool disposing) | ||
| { | ||
| this.buffer.Dispose(); | ||
| this.memoryStream?.Dispose(); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually truncation, not scaling, and introduces bias across the range. Here's a test demonstrating that vs a safer scaling operation like the one we have for
From16BitTo8Bit.The correct method would be.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this, I already had a feeling that there might be an issue with this