mirror of https://github.com/SixLabors/ImageSharp
Brian Popow
5 years ago
committed by
GitHub
GitHub
9 changed files with 471 additions and 203 deletions
@ -0,0 +1,21 @@ |
|||||
|
// Copyright (c) Six Labors.
|
||||
|
// Licensed under the Apache License, Version 2.0.
|
||||
|
|
||||
|
namespace SixLabors.ImageSharp.Common.Helpers |
||||
|
{ |
||||
|
internal readonly struct ExifResolutionValues |
||||
|
{ |
||||
|
public ExifResolutionValues(ushort resolutionUnit, double? horizontalResolution, double? verticalResolution) |
||||
|
{ |
||||
|
this.ResolutionUnit = resolutionUnit; |
||||
|
this.HorizontalResolution = horizontalResolution; |
||||
|
this.VerticalResolution = verticalResolution; |
||||
|
} |
||||
|
|
||||
|
public ushort ResolutionUnit { get; } |
||||
|
|
||||
|
public double? HorizontalResolution { get; } |
||||
|
|
||||
|
public double? VerticalResolution { get; } |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,114 @@ |
|||||
|
// Copyright (c) Six Labors.
|
||||
|
// Licensed under the Apache License, Version 2.0.
|
||||
|
|
||||
|
using System.IO; |
||||
|
|
||||
|
using SixLabors.ImageSharp.Formats; |
||||
|
using SixLabors.ImageSharp.Formats.Tiff; |
||||
|
using SixLabors.ImageSharp.Formats.Tiff.Constants; |
||||
|
using SixLabors.ImageSharp.Metadata.Profiles.Exif; |
||||
|
using SixLabors.ImageSharp.PixelFormats; |
||||
|
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; |
||||
|
using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; |
||||
|
|
||||
|
using Xunit; |
||||
|
|
||||
|
namespace SixLabors.ImageSharp.Tests.Formats.Tiff |
||||
|
{ |
||||
|
[Trait("Format", "Tiff")] |
||||
|
public abstract class TiffEncoderBaseTester |
||||
|
{ |
||||
|
protected static readonly IImageDecoder ReferenceDecoder = new MagickReferenceDecoder(); |
||||
|
|
||||
|
protected static void TestStripLength<TPixel>( |
||||
|
TestImageProvider<TPixel> provider, |
||||
|
TiffPhotometricInterpretation photometricInterpretation, |
||||
|
TiffCompression compression, |
||||
|
bool useExactComparer = true, |
||||
|
float compareTolerance = 0.01f) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> |
||||
|
{ |
||||
|
// arrange
|
||||
|
var tiffEncoder = new TiffEncoder() { PhotometricInterpretation = photometricInterpretation, Compression = compression }; |
||||
|
using Image<TPixel> input = provider.GetImage(); |
||||
|
using var memStream = new MemoryStream(); |
||||
|
TiffFrameMetadata inputMeta = input.Frames.RootFrame.Metadata.GetTiffMetadata(); |
||||
|
TiffCompression inputCompression = inputMeta.Compression ?? TiffCompression.None; |
||||
|
|
||||
|
// act
|
||||
|
input.Save(memStream, tiffEncoder); |
||||
|
|
||||
|
// assert
|
||||
|
memStream.Position = 0; |
||||
|
using var output = Image.Load<Rgba32>(memStream); |
||||
|
ExifProfile exifProfileOutput = output.Frames.RootFrame.Metadata.ExifProfile; |
||||
|
TiffFrameMetadata outputMeta = output.Frames.RootFrame.Metadata.GetTiffMetadata(); |
||||
|
ImageFrame<Rgba32> rootFrame = output.Frames.RootFrame; |
||||
|
|
||||
|
Number rowsPerStrip = exifProfileOutput.GetValue(ExifTag.RowsPerStrip) != null ? exifProfileOutput.GetValue(ExifTag.RowsPerStrip).Value : TiffConstants.RowsPerStripInfinity; |
||||
|
Assert.True(output.Height > (int)rowsPerStrip); |
||||
|
Assert.True(exifProfileOutput.GetValue(ExifTag.StripOffsets)?.Value.Length > 1); |
||||
|
Number[] stripByteCounts = exifProfileOutput.GetValue(ExifTag.StripByteCounts)?.Value; |
||||
|
Assert.NotNull(stripByteCounts); |
||||
|
Assert.True(stripByteCounts.Length > 1); |
||||
|
Assert.NotNull(outputMeta.BitsPerPixel); |
||||
|
|
||||
|
foreach (Number sz in stripByteCounts) |
||||
|
{ |
||||
|
Assert.True((uint)sz <= TiffConstants.DefaultStripSize); |
||||
|
} |
||||
|
|
||||
|
// For uncompressed more accurate test.
|
||||
|
if (compression == TiffCompression.None) |
||||
|
{ |
||||
|
for (int i = 0; i < stripByteCounts.Length - 1; i++) |
||||
|
{ |
||||
|
// The difference must be less than one row.
|
||||
|
int stripBytes = (int)stripByteCounts[i]; |
||||
|
int widthBytes = ((int)outputMeta.BitsPerPixel + 7) / 8 * rootFrame.Width; |
||||
|
|
||||
|
Assert.True((TiffConstants.DefaultStripSize - stripBytes) < widthBytes); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// Compare with reference.
|
||||
|
TestTiffEncoderCore( |
||||
|
provider, |
||||
|
inputMeta.BitsPerPixel, |
||||
|
photometricInterpretation, |
||||
|
inputCompression, |
||||
|
useExactComparer: useExactComparer, |
||||
|
compareTolerance: compareTolerance); |
||||
|
} |
||||
|
|
||||
|
protected static void TestTiffEncoderCore<TPixel>( |
||||
|
TestImageProvider<TPixel> provider, |
||||
|
TiffBitsPerPixel? bitsPerPixel, |
||||
|
TiffPhotometricInterpretation photometricInterpretation, |
||||
|
TiffCompression compression = TiffCompression.None, |
||||
|
TiffPredictor predictor = TiffPredictor.None, |
||||
|
bool useExactComparer = true, |
||||
|
float compareTolerance = 0.001f, |
||||
|
IImageDecoder imageDecoder = null) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> |
||||
|
{ |
||||
|
using Image<TPixel> image = provider.GetImage(); |
||||
|
var encoder = new TiffEncoder |
||||
|
{ |
||||
|
PhotometricInterpretation = photometricInterpretation, |
||||
|
BitsPerPixel = bitsPerPixel, |
||||
|
Compression = compression, |
||||
|
HorizontalPredictor = predictor |
||||
|
}; |
||||
|
|
||||
|
// Does DebugSave & load reference CompareToReferenceInput():
|
||||
|
image.VerifyEncoder( |
||||
|
provider, |
||||
|
"tiff", |
||||
|
bitsPerPixel, |
||||
|
encoder, |
||||
|
useExactComparer ? ImageComparer.Exact : ImageComparer.Tolerant(compareTolerance), |
||||
|
referenceDecoder: imageDecoder ?? ReferenceDecoder); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,179 @@ |
|||||
|
// Copyright (c) Six Labors.
|
||||
|
// Licensed under the Apache License, Version 2.0.
|
||||
|
|
||||
|
using System; |
||||
|
using SixLabors.ImageSharp.Formats.Tiff; |
||||
|
using SixLabors.ImageSharp.Formats.Tiff.Constants; |
||||
|
using SixLabors.ImageSharp.PixelFormats; |
||||
|
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; |
||||
|
using Xunit; |
||||
|
|
||||
|
using static SixLabors.ImageSharp.Tests.TestImages.Tiff; |
||||
|
|
||||
|
namespace SixLabors.ImageSharp.Tests.Formats.Tiff |
||||
|
{ |
||||
|
[Trait("Format", "Tiff")] |
||||
|
public class TiffEncoderMultiframeTests : TiffEncoderBaseTester |
||||
|
{ |
||||
|
[Theory] |
||||
|
[WithFile(MultiframeLzwPredictor, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_Works<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> => TestTiffEncoderCore(provider, TiffBitsPerPixel.Bit24, TiffPhotometricInterpretation.Rgb); |
||||
|
|
||||
|
[Theory] |
||||
|
[WithFile(MultiframeDifferentSize, PixelTypes.Rgba32)] |
||||
|
[WithFile(MultiframeDifferentVariants, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_NotSupport<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> => Assert.Throws<NotSupportedException>(() => TestTiffEncoderCore(provider, TiffBitsPerPixel.Bit24, TiffPhotometricInterpretation.Rgb)); |
||||
|
|
||||
|
[Theory] |
||||
|
[WithFile(MultiframeDeflateWithPreview, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_WithPreview<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> => TestTiffEncoderCore(provider, TiffBitsPerPixel.Bit24, TiffPhotometricInterpretation.Rgb); |
||||
|
|
||||
|
[Theory] |
||||
|
[WithFile(TestImages.Gif.Receipt, PixelTypes.Rgb24)] |
||||
|
[WithFile(TestImages.Gif.Issues.BadDescriptorWidth, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_Convert<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> => TestTiffEncoderCore(provider, TiffBitsPerPixel.Bit48, TiffPhotometricInterpretation.Rgb); |
||||
|
|
||||
|
[Theory] |
||||
|
[WithFile(MultiframeLzwPredictor, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_RemoveFrames<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> |
||||
|
{ |
||||
|
using Image<TPixel> image = provider.GetImage(); |
||||
|
Assert.True(image.Frames.Count > 1); |
||||
|
|
||||
|
image.Frames.RemoveFrame(0); |
||||
|
|
||||
|
TiffBitsPerPixel bitsPerPixel = TiffBitsPerPixel.Bit24; |
||||
|
var encoder = new TiffEncoder |
||||
|
{ |
||||
|
PhotometricInterpretation = TiffPhotometricInterpretation.Rgb, |
||||
|
BitsPerPixel = bitsPerPixel, |
||||
|
Compression = TiffCompression.Deflate |
||||
|
}; |
||||
|
|
||||
|
image.VerifyEncoder( |
||||
|
provider, |
||||
|
"tiff", |
||||
|
bitsPerPixel, |
||||
|
encoder, |
||||
|
ImageComparer.Exact); |
||||
|
} |
||||
|
|
||||
|
[Theory] |
||||
|
[WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_AddFrames<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> |
||||
|
{ |
||||
|
using Image<TPixel> image = provider.GetImage(); |
||||
|
Assert.Equal(1, image.Frames.Count); |
||||
|
|
||||
|
using var image1 = new Image<Rgba32>(image.Width, image.Height, Color.Green.ToRgba32()); |
||||
|
|
||||
|
using var image2 = new Image<Rgba32>(image.Width, image.Height, Color.Yellow.ToRgba32()); |
||||
|
|
||||
|
image.Frames.AddFrame(image1.Frames.RootFrame); |
||||
|
image.Frames.AddFrame(image2.Frames.RootFrame); |
||||
|
|
||||
|
TiffBitsPerPixel bitsPerPixel = TiffBitsPerPixel.Bit24; |
||||
|
var encoder = new TiffEncoder |
||||
|
{ |
||||
|
PhotometricInterpretation = TiffPhotometricInterpretation.Rgb, |
||||
|
BitsPerPixel = bitsPerPixel, |
||||
|
Compression = TiffCompression.Deflate |
||||
|
}; |
||||
|
|
||||
|
using (var ms = new System.IO.MemoryStream()) |
||||
|
{ |
||||
|
image.Save(ms, encoder); |
||||
|
|
||||
|
ms.Position = 0; |
||||
|
using var output = Image.Load<Rgba32>(ms); |
||||
|
|
||||
|
Assert.Equal(3, output.Frames.Count); |
||||
|
|
||||
|
ImageFrame<Rgba32> frame1 = output.Frames[1]; |
||||
|
ImageFrame<Rgba32> frame2 = output.Frames[2]; |
||||
|
|
||||
|
Assert.Equal(Color.Green.ToRgba32(), frame1[10, 10]); |
||||
|
Assert.Equal(Color.Yellow.ToRgba32(), frame2[10, 10]); |
||||
|
|
||||
|
Assert.Equal(TiffCompression.Deflate, frame1.Metadata.GetTiffMetadata().Compression); |
||||
|
Assert.Equal(TiffCompression.Deflate, frame1.Metadata.GetTiffMetadata().Compression); |
||||
|
|
||||
|
Assert.Equal(TiffPhotometricInterpretation.Rgb, frame1.Metadata.GetTiffMetadata().PhotometricInterpretation); |
||||
|
Assert.Equal(TiffPhotometricInterpretation.Rgb, frame2.Metadata.GetTiffMetadata().PhotometricInterpretation); |
||||
|
} |
||||
|
|
||||
|
image.VerifyEncoder( |
||||
|
provider, |
||||
|
"tiff", |
||||
|
bitsPerPixel, |
||||
|
encoder, |
||||
|
ImageComparer.Exact); |
||||
|
} |
||||
|
|
||||
|
[Theory] |
||||
|
[WithBlankImages(100, 100, PixelTypes.Rgba32)] |
||||
|
public void TiffEncoder_EncodeMultiframe_Create<TPixel>(TestImageProvider<TPixel> provider) |
||||
|
where TPixel : unmanaged, IPixel<TPixel> |
||||
|
{ |
||||
|
using Image<TPixel> image = provider.GetImage(); |
||||
|
|
||||
|
using var image0 = new Image<Rgba32>(image.Width, image.Height, Color.Red.ToRgba32()); |
||||
|
|
||||
|
using var image1 = new Image<Rgba32>(image.Width, image.Height, Color.Green.ToRgba32()); |
||||
|
|
||||
|
using var image2 = new Image<Rgba32>(image.Width, image.Height, Color.Yellow.ToRgba32()); |
||||
|
|
||||
|
image.Frames.AddFrame(image0.Frames.RootFrame); |
||||
|
image.Frames.AddFrame(image1.Frames.RootFrame); |
||||
|
image.Frames.AddFrame(image2.Frames.RootFrame); |
||||
|
image.Frames.RemoveFrame(0); |
||||
|
|
||||
|
TiffBitsPerPixel bitsPerPixel = TiffBitsPerPixel.Bit8; |
||||
|
var encoder = new TiffEncoder |
||||
|
{ |
||||
|
PhotometricInterpretation = TiffPhotometricInterpretation.PaletteColor, |
||||
|
BitsPerPixel = bitsPerPixel, |
||||
|
Compression = TiffCompression.Lzw |
||||
|
}; |
||||
|
|
||||
|
using (var ms = new System.IO.MemoryStream()) |
||||
|
{ |
||||
|
image.Save(ms, encoder); |
||||
|
|
||||
|
ms.Position = 0; |
||||
|
using var output = Image.Load<Rgba32>(ms); |
||||
|
|
||||
|
Assert.Equal(3, output.Frames.Count); |
||||
|
|
||||
|
ImageFrame<Rgba32> frame0 = output.Frames[0]; |
||||
|
ImageFrame<Rgba32> frame1 = output.Frames[1]; |
||||
|
ImageFrame<Rgba32> frame2 = output.Frames[2]; |
||||
|
|
||||
|
Assert.Equal(Color.Red.ToRgba32(), frame0[10, 10]); |
||||
|
Assert.Equal(Color.Green.ToRgba32(), frame1[10, 10]); |
||||
|
Assert.Equal(Color.Yellow.ToRgba32(), frame2[10, 10]); |
||||
|
|
||||
|
Assert.Equal(TiffCompression.Lzw, frame0.Metadata.GetTiffMetadata().Compression); |
||||
|
Assert.Equal(TiffCompression.Lzw, frame1.Metadata.GetTiffMetadata().Compression); |
||||
|
Assert.Equal(TiffCompression.Lzw, frame1.Metadata.GetTiffMetadata().Compression); |
||||
|
|
||||
|
Assert.Equal(TiffPhotometricInterpretation.PaletteColor, frame0.Metadata.GetTiffMetadata().PhotometricInterpretation); |
||||
|
Assert.Equal(TiffPhotometricInterpretation.PaletteColor, frame1.Metadata.GetTiffMetadata().PhotometricInterpretation); |
||||
|
Assert.Equal(TiffPhotometricInterpretation.PaletteColor, frame2.Metadata.GetTiffMetadata().PhotometricInterpretation); |
||||
|
} |
||||
|
|
||||
|
image.VerifyEncoder( |
||||
|
provider, |
||||
|
"tiff", |
||||
|
bitsPerPixel, |
||||
|
encoder, |
||||
|
ImageComparer.Exact); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
Loading…
Reference in new issue