Merge branch 'master' into bp/tiffjpegcompression

Author: brianpopow

src/ImageSharp/Formats/Jpeg/JpegConstants.cs

@@ -133,6 +133,11 @@ internal static class Markers
             /// </summary>
             public const byte APP15 = 0xEF;
 
+            /// <summary>
+            /// Define arithmetic coding conditioning marker.
+            /// </summary>
+            public const byte DAC = 0xCC;
+
             /// <summary>
             /// The text comment marker
             /// </summary>
@@ -173,6 +178,56 @@ internal static class Markers
             /// </summary>
             public const byte SOF2 = 0xC2;
 
+            /// <summary>
+            /// Start of Frame marker, non differential lossless, Huffman coding.
+            /// </summary>
+            public const byte SOF3 = 0xC3;
+
+            /// <summary>
+            /// Start of Frame marker, differential, Huffman coding, Differential sequential DCT.
+            /// </summary>
+            public const byte SOF5 = 0xC5;
+
+            /// <summary>
+            /// Start of Frame marker, differential, Huffman coding, Differential progressive DCT.
+            /// </summary>
+            public const byte SOF6 = 0xC6;
+
+            /// <summary>
+            /// Start of Frame marker, differential lossless, Huffman coding.
+            /// </summary>
+            public const byte SOF7 = 0xC7;
+
+            /// <summary>
+            /// Start of Frame marker, non-differential, arithmetic coding, Extended sequential DCT.
+            /// </summary>
+            public const byte SOF9 = 0xC9;
+
+            /// <summary>
+            /// Start of Frame marker, non-differential, arithmetic coding, Progressive DCT.
+            /// </summary>
+            public const byte SOF10 = 0xCA;
+
+            /// <summary>
+            /// Start of Frame marker, non-differential, arithmetic coding, Lossless (sequential).
+            /// </summary>
+            public const byte SOF11 = 0xCB;
+
+            /// <summary>
+            /// Start of Frame marker, differential, arithmetic coding, Differential sequential DCT.
+            /// </summary>
+            public const byte SOF13 = 0xCD;
+
+            /// <summary>
+            /// Start of Frame marker, differential, arithmetic coding, Differential progressive DCT.
+            /// </summary>
+            public const byte SOF14 = 0xCE;
+
+            /// <summary>
+            /// Start of Frame marker, differential, arithmetic coding, Differential lossless (sequential).
+            /// </summary>
+            public const byte SOF15 = 0xCF;
+
             /// <summary>
             /// Define Huffman Table(s)
             /// <remarks>

src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs

@@ -309,6 +309,28 @@ internal void ParseStream(BufferedReadStream stream, HuffmanScanDecoder scanDeco
                             this.ProcessStartOfFrameMarker(stream, remaining, fileMarker, metadataOnly);
                             break;
 
+                        case JpegConstants.Markers.SOF5:
+                            JpegThrowHelper.ThrowNotSupportedException("Decoding jpeg files with differential sequential DCT is not supported.");
+                            break;
+
+                        case JpegConstants.Markers.SOF6:
+                            JpegThrowHelper.ThrowNotSupportedException("Decoding jpeg files with differential progressive DCT is not supported.");
+                            break;
+
+                        case JpegConstants.Markers.SOF3:
+                        case JpegConstants.Markers.SOF7:
+                            JpegThrowHelper.ThrowNotSupportedException("Decoding lossless jpeg files is not supported.");
+                            break;
+
+                        case JpegConstants.Markers.SOF9:
+                        case JpegConstants.Markers.SOF10:
+                        case JpegConstants.Markers.SOF11:
+                        case JpegConstants.Markers.SOF13:
+                        case JpegConstants.Markers.SOF14:
+                        case JpegConstants.Markers.SOF15:
+                            JpegThrowHelper.ThrowNotSupportedException("Decoding jpeg files with arithmetic coding is not supported.");
+                            break;
+
                         case JpegConstants.Markers.SOS:
                             if (!metadataOnly)
                             {
@@ -388,6 +410,10 @@ internal void ParseStream(BufferedReadStream stream, HuffmanScanDecoder scanDeco
                         case JpegConstants.Markers.COM:
                             stream.Skip(remaining);
                             break;
+
+                        case JpegConstants.Markers.DAC:
+                            JpegThrowHelper.ThrowNotSupportedException("Decoding jpeg files with arithmetic coding is not supported.");
+                            break;
                     }
                 }
 

src/ImageSharp/Formats/Jpeg/JpegThrowHelper.cs

@@ -8,6 +8,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     internal static class JpegThrowHelper
     {
+        /// <summary>
+        /// Cold path optimization for throwing <see cref="NotSupportedException"/>'s.
+        /// </summary>
+        /// <param name="errorMessage">The error message for the exception.</param>
+        [MethodImpl(InliningOptions.ColdPath)]
+        public static void ThrowNotSupportedException(string errorMessage) => throw new NotSupportedException(errorMessage);
+
         /// <summary>
         /// Cold path optimization for throwing <see cref="InvalidImageContentException"/>'s.
         /// </summary>