mirror of https://github.com/SixLabors/ImageSharp
James Jackson-South
6 years ago
committed by
GitHub
GitHub
25 changed files with 1364 additions and 446 deletions
@ -0,0 +1,44 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
|
|||
namespace SixLabors.ImageSharp.Formats.Png |
|||
{ |
|||
/// <summary>
|
|||
/// Provides enumeration of available PNG optimization methods.
|
|||
/// </summary>
|
|||
[Flags] |
|||
public enum PngChunkFilter |
|||
{ |
|||
/// <summary>
|
|||
/// With the None filter, all chunks will be written.
|
|||
/// </summary>
|
|||
None = 0, |
|||
|
|||
/// <summary>
|
|||
/// Excludes the physical dimension information chunk from encoding.
|
|||
/// </summary>
|
|||
ExcludePhysicalChunk = 1 << 0, |
|||
|
|||
/// <summary>
|
|||
/// Excludes the gamma information chunk from encoding.
|
|||
/// </summary>
|
|||
ExcludeGammaChunk = 1 << 1, |
|||
|
|||
/// <summary>
|
|||
/// Excludes the eXIf chunk from encoding.
|
|||
/// </summary>
|
|||
ExcludeExifChunk = 1 << 2, |
|||
|
|||
/// <summary>
|
|||
/// Excludes the tTXt, iTXt or zTXt chunk from encoding.
|
|||
/// </summary>
|
|||
ExcludeTextChunks = 1 << 3, |
|||
|
|||
/// <summary>
|
|||
/// All ancillary chunks will be excluded.
|
|||
/// </summary>
|
|||
ExcludeAll = ~None |
|||
} |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
namespace SixLabors.ImageSharp.Formats.Png |
|||
{ |
|||
/// <summary>
|
|||
/// Enum indicating how the transparency should be handled on encoding.
|
|||
/// </summary>
|
|||
public enum PngTransparentColorMode |
|||
{ |
|||
/// <summary>
|
|||
/// The transparency will be kept as is.
|
|||
/// </summary>
|
|||
Preserve = 0, |
|||
|
|||
/// <summary>
|
|||
/// Converts fully transparent pixels that may contain R, G, B values which are not 0,
|
|||
/// to transparent black, which can yield in better compression in some cases.
|
|||
/// </summary>
|
|||
Clear = 1, |
|||
} |
|||
} |
|||
@ -0,0 +1,70 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
namespace SixLabors.ImageSharp.Formats.Png.Zlib |
|||
{ |
|||
/// <content>
|
|||
/// Contains precalulated tables for scalar calculations.
|
|||
/// </content>
|
|||
internal static partial class Crc32 |
|||
{ |
|||
/// <summary>
|
|||
/// The table of all possible eight bit values for fast scalar lookup.
|
|||
/// </summary>
|
|||
private static readonly uint[] CrcTable = |
|||
{ |
|||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, |
|||
0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, |
|||
0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, |
|||
0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, |
|||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, |
|||
0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, |
|||
0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, |
|||
0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, |
|||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, |
|||
0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, |
|||
0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, |
|||
0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, |
|||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, |
|||
0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, |
|||
0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, |
|||
0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, |
|||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, |
|||
0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, |
|||
0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, |
|||
0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, |
|||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, |
|||
0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, |
|||
0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, |
|||
0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, |
|||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, |
|||
0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, |
|||
0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, |
|||
0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, |
|||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, |
|||
0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, |
|||
0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, |
|||
0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, |
|||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, |
|||
0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, |
|||
0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, |
|||
0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, |
|||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, |
|||
0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, |
|||
0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, |
|||
0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, |
|||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, |
|||
0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, |
|||
0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, |
|||
0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, |
|||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, |
|||
0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, |
|||
0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, |
|||
0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, |
|||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, |
|||
0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, |
|||
0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, |
|||
0x2D02EF8D |
|||
}; |
|||
} |
|||
} |
|||
@ -1,43 +0,0 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
|
|||
namespace SixLabors.ImageSharp.Formats.Png.Zlib |
|||
{ |
|||
/// <summary>
|
|||
/// Interface to compute a data checksum used by checked input/output streams.
|
|||
/// A data checksum can be updated by one byte or with a byte array. After each
|
|||
/// update the value of the current checksum can be returned by calling
|
|||
/// <code>Value</code>. The complete checksum object can also be reset
|
|||
/// so it can be used again with new data.
|
|||
/// </summary>
|
|||
internal interface IChecksum |
|||
{ |
|||
/// <summary>
|
|||
/// Gets the data checksum computed so far.
|
|||
/// </summary>
|
|||
long Value { get; } |
|||
|
|||
/// <summary>
|
|||
/// Resets the data checksum as if no update was ever called.
|
|||
/// </summary>
|
|||
void Reset(); |
|||
|
|||
/// <summary>
|
|||
/// Adds one byte to the data checksum.
|
|||
/// </summary>
|
|||
/// <param name = "value">
|
|||
/// The data value to add. The high byte of the integer is ignored.
|
|||
/// </param>
|
|||
void Update(int value); |
|||
|
|||
/// <summary>
|
|||
/// Updates the data checksum with the bytes taken from the span.
|
|||
/// </summary>
|
|||
/// <param name="data">
|
|||
/// buffer an array of bytes
|
|||
/// </param>
|
|||
void Update(ReadOnlySpan<byte> data); |
|||
} |
|||
} |
|||
@ -1,5 +1,11 @@ |
|||
Deflatestream implementation adapted from |
|||
DeflateStream implementation adapted from |
|||
|
|||
https://github.com/icsharpcode/SharpZipLib |
|||
|
|||
LIcensed under MIT |
|||
Licensed under MIT |
|||
|
|||
Crc32 and Adler32 SIMD implementation adapted from |
|||
|
|||
https://github.com/chromium/chromium |
|||
|
|||
Licensed under BSD 3-Clause "New" or "Revised" License |
|||
|
|||
Binary file not shown.
@ -0,0 +1,72 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
using BenchmarkDotNet.Attributes; |
|||
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|||
using SharpAdler32 = ICSharpCode.SharpZipLib.Checksum.Adler32; |
|||
|
|||
namespace SixLabors.ImageSharp.Benchmarks.General |
|||
{ |
|||
[Config(typeof(Config.ShortClr))] |
|||
public class Adler32Benchmark |
|||
{ |
|||
private byte[] data; |
|||
private readonly SharpAdler32 adler = new SharpAdler32(); |
|||
|
|||
[Params(1024, 2048, 4096)] |
|||
public int Count { get; set; } |
|||
|
|||
[GlobalSetup] |
|||
public void SetUp() |
|||
{ |
|||
this.data = new byte[this.Count]; |
|||
new Random(1).NextBytes(this.data); |
|||
} |
|||
|
|||
[Benchmark(Baseline = true)] |
|||
public long SharpZipLibCalculate() |
|||
{ |
|||
this.adler.Reset(); |
|||
this.adler.Update(this.data); |
|||
return this.adler.Value; |
|||
} |
|||
|
|||
[Benchmark] |
|||
public uint SixLaborsCalculate() |
|||
{ |
|||
return Adler32.Calculate(this.data); |
|||
} |
|||
} |
|||
|
|||
// ########## 17/05/2020 ##########
|
|||
//
|
|||
// | Method | Runtime | Count | Mean | Error | StdDev | Ratio | RatioSD | Gen 0 | Gen 1 | Gen 2 | Allocated |
|
|||
// |--------------------- |-------------- |------ |------------:|------------:|----------:|------:|--------:|------:|------:|------:|----------:|
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 1024 | 793.18 ns | 775.66 ns | 42.516 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 1024 | 384.86 ns | 15.64 ns | 0.857 ns | 0.49 | 0.03 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 1024 | 790.31 ns | 353.34 ns | 19.368 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 1024 | 465.28 ns | 652.41 ns | 35.761 ns | 0.59 | 0.03 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 1024 | 877.25 ns | 97.89 ns | 5.365 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 1024 | 45.60 ns | 13.28 ns | 0.728 ns | 0.05 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 2048 | 1,537.04 ns | 428.44 ns | 23.484 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 2048 | 849.76 ns | 1,066.34 ns | 58.450 ns | 0.55 | 0.04 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 2048 | 1,616.97 ns | 276.70 ns | 15.167 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 2048 | 790.77 ns | 691.71 ns | 37.915 ns | 0.49 | 0.03 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 2048 | 1,735.11 ns | 1,374.22 ns | 75.325 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 2048 | 87.80 ns | 56.84 ns | 3.116 ns | 0.05 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 4096 | 3,054.53 ns | 796.41 ns | 43.654 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 4096 | 1,538.90 ns | 487.02 ns | 26.695 ns | 0.50 | 0.01 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 4096 | 3,223.48 ns | 32.32 ns | 1.771 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 4096 | 1,547.60 ns | 309.72 ns | 16.977 ns | 0.48 | 0.01 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 4096 | 3,672.33 ns | 1,095.81 ns | 60.065 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 4096 | 159.44 ns | 36.31 ns | 1.990 ns | 0.04 | 0.00 | - | - | - | - |
|
|||
} |
|||
@ -0,0 +1,72 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
using BenchmarkDotNet.Attributes; |
|||
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|||
using SharpCrc32 = ICSharpCode.SharpZipLib.Checksum.Crc32; |
|||
|
|||
namespace SixLabors.ImageSharp.Benchmarks.General |
|||
{ |
|||
[Config(typeof(Config.ShortClr))] |
|||
public class Crc32Benchmark |
|||
{ |
|||
private byte[] data; |
|||
private readonly SharpCrc32 crc = new SharpCrc32(); |
|||
|
|||
[Params(1024, 2048, 4096)] |
|||
public int Count { get; set; } |
|||
|
|||
[GlobalSetup] |
|||
public void SetUp() |
|||
{ |
|||
this.data = new byte[this.Count]; |
|||
new Random(1).NextBytes(this.data); |
|||
} |
|||
|
|||
[Benchmark(Baseline = true)] |
|||
public long SharpZipLibCalculate() |
|||
{ |
|||
this.crc.Reset(); |
|||
this.crc.Update(this.data); |
|||
return this.crc.Value; |
|||
} |
|||
|
|||
[Benchmark] |
|||
public long SixLaborsCalculate() |
|||
{ |
|||
return Crc32.Calculate(this.data); |
|||
} |
|||
} |
|||
|
|||
// ########## 17/05/2020 ##########
|
|||
//
|
|||
// | Method | Runtime | Count | Mean | Error | StdDev | Ratio | RatioSD | Gen 0 | Gen 1 | Gen 2 | Allocated |
|
|||
// |--------------------- |-------------- |------ |-------------:|-------------:|-----------:|------:|--------:|------:|------:|------:|----------:|
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 1024 | 2,797.77 ns | 278.697 ns | 15.276 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 1024 | 2,275.56 ns | 216.100 ns | 11.845 ns | 0.81 | 0.01 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 1024 | 2,923.43 ns | 2,656.882 ns | 145.633 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 1024 | 2,257.79 ns | 75.081 ns | 4.115 ns | 0.77 | 0.04 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 1024 | 2,764.14 ns | 86.281 ns | 4.729 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 1024 | 49.32 ns | 1.813 ns | 0.099 ns | 0.02 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 2048 | 5,603.71 ns | 427.240 ns | 23.418 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 2048 | 4,525.02 ns | 33.931 ns | 1.860 ns | 0.81 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 2048 | 5,563.32 ns | 49.337 ns | 2.704 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 2048 | 4,519.61 ns | 29.837 ns | 1.635 ns | 0.81 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 2048 | 5,543.37 ns | 518.551 ns | 28.424 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 2048 | 89.07 ns | 3.312 ns | 0.182 ns | 0.02 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET 4.7.2 | 4096 | 11,396.95 ns | 373.450 ns | 20.470 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET 4.7.2 | 4096 | 9,070.35 ns | 271.083 ns | 14.859 ns | 0.80 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 2.1 | 4096 | 11,127.81 ns | 239.177 ns | 13.110 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 2.1 | 4096 | 9,050.46 ns | 230.916 ns | 12.657 ns | 0.81 | 0.00 | - | - | - | - |
|
|||
// | | | | | | | | | | | | |
|
|||
// | SharpZipLibCalculate | .NET Core 3.1 | 4096 | 11,098.62 ns | 687.978 ns | 37.710 ns | 1.00 | 0.00 | - | - | - | - |
|
|||
// | SixLaborsCalculate | .NET Core 3.1 | 4096 | 168.11 ns | 3.633 ns | 0.199 ns | 0.02 | 0.00 | - | - | - | - |
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|||
using Xunit; |
|||
using SharpAdler32 = ICSharpCode.SharpZipLib.Checksum.Adler32; |
|||
|
|||
namespace SixLabors.ImageSharp.Tests.Formats.Png |
|||
{ |
|||
public class Adler32Tests |
|||
{ |
|||
[Theory] |
|||
[InlineData(0)] |
|||
[InlineData(1)] |
|||
[InlineData(2)] |
|||
public void ReturnsCorrectWhenEmpty(uint input) |
|||
{ |
|||
Assert.Equal(input, Adler32.Calculate(input, default)); |
|||
} |
|||
|
|||
[Theory] |
|||
[InlineData(0)] |
|||
[InlineData(8)] |
|||
[InlineData(215)] |
|||
[InlineData(1024)] |
|||
[InlineData(1024 + 15)] |
|||
[InlineData(2034)] |
|||
[InlineData(4096)] |
|||
public void MatchesReference(int length) |
|||
{ |
|||
var data = GetBuffer(length); |
|||
var adler = new SharpAdler32(); |
|||
adler.Update(data); |
|||
|
|||
long expected = adler.Value; |
|||
long actual = Adler32.Calculate(data); |
|||
|
|||
Assert.Equal(expected, actual); |
|||
} |
|||
|
|||
private static byte[] GetBuffer(int length) |
|||
{ |
|||
var data = new byte[length]; |
|||
new Random(1).NextBytes(data); |
|||
|
|||
return data; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
using SixLabors.ImageSharp.Formats.Png.Zlib; |
|||
using Xunit; |
|||
using SharpCrc32 = ICSharpCode.SharpZipLib.Checksum.Crc32; |
|||
|
|||
namespace SixLabors.ImageSharp.Tests.Formats.Png |
|||
{ |
|||
public class Crc32Tests |
|||
{ |
|||
[Theory] |
|||
[InlineData(0)] |
|||
[InlineData(1)] |
|||
[InlineData(2)] |
|||
public void ReturnsCorrectWhenEmpty(uint input) |
|||
{ |
|||
Assert.Equal(input, Crc32.Calculate(input, default)); |
|||
} |
|||
|
|||
[Theory] |
|||
[InlineData(0)] |
|||
[InlineData(8)] |
|||
[InlineData(215)] |
|||
[InlineData(1024)] |
|||
[InlineData(1024 + 15)] |
|||
[InlineData(2034)] |
|||
[InlineData(4096)] |
|||
public void MatchesReference(int length) |
|||
{ |
|||
var data = GetBuffer(length); |
|||
var crc = new SharpCrc32(); |
|||
crc.Update(data); |
|||
|
|||
long expected = crc.Value; |
|||
long actual = Crc32.Calculate(data); |
|||
|
|||
Assert.Equal(expected, actual); |
|||
} |
|||
|
|||
private static byte[] GetBuffer(int length) |
|||
{ |
|||
var data = new byte[length]; |
|||
new Random(1).NextBytes(data); |
|||
|
|||
return data; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,328 @@ |
|||
// Copyright (c) Six Labors and contributors.
|
|||
// Licensed under the GNU Affero General Public License, Version 3.
|
|||
|
|||
using System; |
|||
using System.Buffers.Binary; |
|||
using System.Collections.Generic; |
|||
using System.ComponentModel; |
|||
using System.IO; |
|||
using SixLabors.ImageSharp.Formats.Png; |
|||
using SixLabors.ImageSharp.PixelFormats; |
|||
using Xunit; |
|||
|
|||
// ReSharper disable InconsistentNaming
|
|||
namespace SixLabors.ImageSharp.Tests.Formats.Png |
|||
{ |
|||
public partial class PngEncoderTests |
|||
{ |
|||
[Fact] |
|||
public void HeaderChunk_ComesFirst() |
|||
{ |
|||
// arrange
|
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
|
|||
// act
|
|||
input.Save(memStream, PngEncoder); |
|||
|
|||
// assert
|
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var type = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
Assert.Equal(PngChunkType.Header, type); |
|||
} |
|||
|
|||
[Fact] |
|||
public void EndChunk_IsLast() |
|||
{ |
|||
// arrange
|
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
|
|||
// act
|
|||
input.Save(memStream, PngEncoder); |
|||
|
|||
// assert
|
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
bool endChunkFound = false; |
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var type = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
Assert.False(endChunkFound); |
|||
if (type == PngChunkType.End) |
|||
{ |
|||
endChunkFound = true; |
|||
} |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
} |
|||
|
|||
[Theory] |
|||
[InlineData(PngChunkType.Gamma)] |
|||
[InlineData(PngChunkType.Chroma)] |
|||
[InlineData(PngChunkType.EmbeddedColorProfile)] |
|||
[InlineData(PngChunkType.SignificantBits)] |
|||
[InlineData(PngChunkType.StandardRgbColourSpace)] |
|||
public void Chunk_ComesBeforePlteAndIDat(object chunkTypeObj) |
|||
{ |
|||
// arrange
|
|||
var chunkType = (PngChunkType)chunkTypeObj; |
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
|
|||
// act
|
|||
input.Save(memStream, PngEncoder); |
|||
|
|||
// assert
|
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
bool palFound = false; |
|||
bool dataFound = false; |
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var type = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
if (chunkType == type) |
|||
{ |
|||
Assert.False(palFound || dataFound, $"{chunkType} chunk should come before data and palette chunk"); |
|||
} |
|||
|
|||
switch (type) |
|||
{ |
|||
case PngChunkType.Data: |
|||
dataFound = true; |
|||
break; |
|||
case PngChunkType.Palette: |
|||
palFound = true; |
|||
break; |
|||
} |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
} |
|||
|
|||
[Theory] |
|||
[InlineData(PngChunkType.Physical)] |
|||
[InlineData(PngChunkType.SuggestedPalette)] |
|||
public void Chunk_ComesBeforeIDat(object chunkTypeObj) |
|||
{ |
|||
// arrange
|
|||
var chunkType = (PngChunkType)chunkTypeObj; |
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
|
|||
// act
|
|||
input.Save(memStream, PngEncoder); |
|||
|
|||
// assert
|
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
bool dataFound = false; |
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var type = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
if (chunkType == type) |
|||
{ |
|||
Assert.False(dataFound, $"{chunkType} chunk should come before data chunk"); |
|||
} |
|||
|
|||
if (type == PngChunkType.Data) |
|||
{ |
|||
dataFound = true; |
|||
} |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
} |
|||
|
|||
[Fact] |
|||
public void IgnoreMetadata_WillExcludeAllAncillaryChunks() |
|||
{ |
|||
// arrange
|
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
var encoder = new PngEncoder() { IgnoreMetadata = true, TextCompressionThreshold = 8 }; |
|||
var expectedChunkTypes = new Dictionary<PngChunkType, bool>() |
|||
{ |
|||
{ PngChunkType.Header, false }, |
|||
{ PngChunkType.Palette, false }, |
|||
{ PngChunkType.Data, false }, |
|||
{ PngChunkType.End, false } |
|||
}; |
|||
var excludedChunkTypes = new List<PngChunkType>() |
|||
{ |
|||
PngChunkType.Gamma, |
|||
PngChunkType.Exif, |
|||
PngChunkType.Physical, |
|||
PngChunkType.Text, |
|||
PngChunkType.InternationalText, |
|||
PngChunkType.CompressedText, |
|||
}; |
|||
|
|||
// act
|
|||
input.Save(memStream, encoder); |
|||
|
|||
// assert
|
|||
Assert.True(excludedChunkTypes.Count > 0); |
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var chunkType = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
Assert.False(excludedChunkTypes.Contains(chunkType), $"{chunkType} chunk should have been excluded"); |
|||
if (expectedChunkTypes.ContainsKey(chunkType)) |
|||
{ |
|||
expectedChunkTypes[chunkType] = true; |
|||
} |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
|
|||
// all expected chunk types should have been seen at least once.
|
|||
foreach (PngChunkType chunkType in expectedChunkTypes.Keys) |
|||
{ |
|||
Assert.True(expectedChunkTypes[chunkType], $"We expect {chunkType} chunk to be present at least once"); |
|||
} |
|||
} |
|||
|
|||
[Theory] |
|||
[InlineData(PngChunkFilter.ExcludeGammaChunk)] |
|||
[InlineData(PngChunkFilter.ExcludeExifChunk)] |
|||
[InlineData(PngChunkFilter.ExcludePhysicalChunk)] |
|||
[InlineData(PngChunkFilter.ExcludeTextChunks)] |
|||
[InlineData(PngChunkFilter.ExcludeAll)] |
|||
public void ExcludeFilter_Works(object filterObj) |
|||
{ |
|||
// arrange
|
|||
var chunkFilter = (PngChunkFilter)filterObj; |
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
var encoder = new PngEncoder() { ChunkFilter = chunkFilter, TextCompressionThreshold = 8 }; |
|||
var expectedChunkTypes = new Dictionary<PngChunkType, bool>() |
|||
{ |
|||
{ PngChunkType.Header, false }, |
|||
{ PngChunkType.Gamma, false }, |
|||
{ PngChunkType.Palette, false }, |
|||
{ PngChunkType.InternationalText, false }, |
|||
{ PngChunkType.Text, false }, |
|||
{ PngChunkType.CompressedText, false }, |
|||
{ PngChunkType.Exif, false }, |
|||
{ PngChunkType.Physical, false }, |
|||
{ PngChunkType.Data, false }, |
|||
{ PngChunkType.End, false } |
|||
}; |
|||
var excludedChunkTypes = new List<PngChunkType>(); |
|||
switch (chunkFilter) |
|||
{ |
|||
case PngChunkFilter.ExcludeGammaChunk: |
|||
excludedChunkTypes.Add(PngChunkType.Gamma); |
|||
expectedChunkTypes.Remove(PngChunkType.Gamma); |
|||
break; |
|||
case PngChunkFilter.ExcludeExifChunk: |
|||
excludedChunkTypes.Add(PngChunkType.Exif); |
|||
expectedChunkTypes.Remove(PngChunkType.Exif); |
|||
break; |
|||
case PngChunkFilter.ExcludePhysicalChunk: |
|||
excludedChunkTypes.Add(PngChunkType.Physical); |
|||
expectedChunkTypes.Remove(PngChunkType.Physical); |
|||
break; |
|||
case PngChunkFilter.ExcludeTextChunks: |
|||
excludedChunkTypes.Add(PngChunkType.Text); |
|||
excludedChunkTypes.Add(PngChunkType.InternationalText); |
|||
excludedChunkTypes.Add(PngChunkType.CompressedText); |
|||
expectedChunkTypes.Remove(PngChunkType.Text); |
|||
expectedChunkTypes.Remove(PngChunkType.InternationalText); |
|||
expectedChunkTypes.Remove(PngChunkType.CompressedText); |
|||
break; |
|||
case PngChunkFilter.ExcludeAll: |
|||
excludedChunkTypes.Add(PngChunkType.Gamma); |
|||
excludedChunkTypes.Add(PngChunkType.Exif); |
|||
excludedChunkTypes.Add(PngChunkType.Physical); |
|||
excludedChunkTypes.Add(PngChunkType.Text); |
|||
excludedChunkTypes.Add(PngChunkType.InternationalText); |
|||
excludedChunkTypes.Add(PngChunkType.CompressedText); |
|||
expectedChunkTypes.Remove(PngChunkType.Gamma); |
|||
expectedChunkTypes.Remove(PngChunkType.Exif); |
|||
expectedChunkTypes.Remove(PngChunkType.Physical); |
|||
expectedChunkTypes.Remove(PngChunkType.Text); |
|||
expectedChunkTypes.Remove(PngChunkType.InternationalText); |
|||
expectedChunkTypes.Remove(PngChunkType.CompressedText); |
|||
break; |
|||
} |
|||
|
|||
// act
|
|||
input.Save(memStream, encoder); |
|||
|
|||
// assert
|
|||
Assert.True(excludedChunkTypes.Count > 0); |
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var chunkType = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
Assert.False(excludedChunkTypes.Contains(chunkType), $"{chunkType} chunk should have been excluded"); |
|||
if (expectedChunkTypes.ContainsKey(chunkType)) |
|||
{ |
|||
expectedChunkTypes[chunkType] = true; |
|||
} |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
|
|||
// all expected chunk types should have been seen at least once.
|
|||
foreach (PngChunkType chunkType in expectedChunkTypes.Keys) |
|||
{ |
|||
Assert.True(expectedChunkTypes[chunkType], $"We expect {chunkType} chunk to be present at least once"); |
|||
} |
|||
} |
|||
|
|||
[Fact] |
|||
public void ExcludeFilter_WithNone_DoesNotExcludeChunks() |
|||
{ |
|||
// arrange
|
|||
var testFile = TestFile.Create(TestImages.Png.PngWithMetadata); |
|||
using Image<Rgba32> input = testFile.CreateRgba32Image(); |
|||
using var memStream = new MemoryStream(); |
|||
var encoder = new PngEncoder() { ChunkFilter = PngChunkFilter.None, TextCompressionThreshold = 8 }; |
|||
var expectedChunkTypes = new List<PngChunkType>() |
|||
{ |
|||
PngChunkType.Header, |
|||
PngChunkType.Gamma, |
|||
PngChunkType.Palette, |
|||
PngChunkType.InternationalText, |
|||
PngChunkType.Text, |
|||
PngChunkType.CompressedText, |
|||
PngChunkType.Exif, |
|||
PngChunkType.Physical, |
|||
PngChunkType.Data, |
|||
PngChunkType.End, |
|||
}; |
|||
|
|||
// act
|
|||
input.Save(memStream, encoder); |
|||
memStream.Position = 0; |
|||
Span<byte> bytesSpan = memStream.ToArray().AsSpan(8); // Skip header.
|
|||
while (bytesSpan.Length > 0) |
|||
{ |
|||
int length = BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(0, 4)); |
|||
var chunkType = (PngChunkType)BinaryPrimitives.ReadInt32BigEndian(bytesSpan.Slice(4, 4)); |
|||
Assert.True(expectedChunkTypes.Contains(chunkType), $"{chunkType} chunk should have been present"); |
|||
|
|||
bytesSpan = bytesSpan.Slice(4 + 4 + length + 4); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
Loading…
Reference in new issue