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

Simplified setting the compression in the tiff encoder

pull/1570/head
Brian Popow 5 years ago
parent
4175fb8bf6
commit
f9d953cdad
1 changed files with 26 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs

94
src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
View File

@ -426,79 +426,37 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
private ushort GetCompressionType() private ushort GetCompressionType()
{ {
if (this.CompressionType == TiffEncoderCompression.Deflate && this.Mode == TiffEncodingMode.Default) switch (this.CompressionType)
{ {
return (ushort)TiffCompression.Deflate; case TiffEncoderCompression.Deflate:
} // Deflate is allowed for all modes.
return (ushort)TiffCompression.Deflate;
if (this.CompressionType == TiffEncoderCompression.Deflate && this.Mode == TiffEncodingMode.Rgb) case TiffEncoderCompression.PackBits:
{ // PackBits is allowed for all modes.
return (ushort)TiffCompression.Deflate; return (ushort)TiffCompression.PackBits;
} case TiffEncoderCompression.Lzw:
if (this.Mode == TiffEncodingMode.Rgb || this.Mode == TiffEncodingMode.Gray || this.Mode == TiffEncodingMode.ColorPalette)
if (this.CompressionType == TiffEncoderCompression.Lzw && this.Mode == TiffEncodingMode.Rgb) {
{ return (ushort)TiffCompression.Lzw;
return (ushort)TiffCompression.Lzw; }
}
if (this.CompressionType == TiffEncoderCompression.PackBits && this.Mode == TiffEncodingMode.Default)
{
return (ushort)TiffCompression.PackBits;
}
if (this.CompressionType == TiffEncoderCompression.PackBits && this.Mode == TiffEncodingMode.Rgb)
{
return (ushort)TiffCompression.PackBits;
}
if (this.CompressionType == TiffEncoderCompression.Deflate && this.Mode == TiffEncodingMode.Gray)
{
return (ushort)TiffCompression.Deflate;
}
if (this.CompressionType == TiffEncoderCompression.Lzw && this.Mode == TiffEncodingMode.Gray)
{
return (ushort)TiffCompression.Lzw;
}
if (this.CompressionType == TiffEncoderCompression.PackBits && this.Mode == TiffEncodingMode.Gray)
{
return (ushort)TiffCompression.PackBits;
}
if (this.CompressionType == TiffEncoderCompression.Deflate && this.Mode == TiffEncodingMode.ColorPalette)
{
return (ushort)TiffCompression.Deflate;
}
if (this.CompressionType == TiffEncoderCompression.Lzw && this.Mode == TiffEncodingMode.ColorPalette)
{
return (ushort)TiffCompression.Lzw;
}
if (this.CompressionType == TiffEncoderCompression.PackBits && this.Mode == TiffEncodingMode.ColorPalette) break;
{
return (ushort)TiffCompression.PackBits;
}
if (this.CompressionType == TiffEncoderCompression.Deflate && this.Mode == TiffEncodingMode.BiColor) case TiffEncoderCompression.CcittGroup3Fax:
{ if (this.Mode == TiffEncodingMode.BiColor)
return (ushort)TiffCompression.Deflate; {
} return (ushort)TiffCompression.CcittGroup3Fax;
}
if (this.CompressionType == TiffEncoderCompression.PackBits && this.Mode == TiffEncodingMode.BiColor) break;
{
return (ushort)TiffCompression.PackBits;
}
if (this.CompressionType == TiffEncoderCompression.CcittGroup3Fax && this.Mode == TiffEncodingMode.BiColor) case TiffEncoderCompression.ModifiedHuffman:
{ if (this.Mode == TiffEncodingMode.BiColor)
return (ushort)TiffCompression.CcittGroup3Fax; {
} return (ushort)TiffCompression.Ccitt1D;
}
if (this.CompressionType == TiffEncoderCompression.ModifiedHuffman && this.Mode == TiffEncodingMode.BiColor) break;
{
return (ushort)TiffCompression.Ccitt1D;
} }
return (ushort)TiffCompression.None; return (ushort)TiffCompression.None;

Write Preview
Loading…
Cancel
Save