Merge branch 'main' into patch-1

SixLabors · Aug 10, 2022 · 1cc618a · 1cc618a
2 parents 7f14e34 + d33b364
commit 1cc618a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffEncoderCore.cs
@@ -417,6 +417,13 @@ private void SanitizeAndSetEncoderOptions(TiffBitsPerPixel? bitsPerPixel, int in
                     return;
 
                 case TiffPhotometricInterpretation.Rgb:
+                    // Make sure 1 Bit compression is only used with 1 bit pixel type.
+                    if (IsOneBitCompression(this.CompressionType))
+                    {
+                        // Invalid compression / bits per pixel combination, fallback to no compression.
+                        compression = DefaultCompression;
+                    }
+
                     this.SetEncoderOptions(TiffBitsPerPixel.Bit24, photometricInterpretation, compression, predictor);
                     return;
             }