From 984327a004e263b554b16c35bb97c424950b7475 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 13 Oct 2022 10:11:22 +1000
Subject: [PATCH] Move options to first parameter position

---
 .../Tiff/Compression/Decompressors/OldJpegTiffCompression.cs  | 2 +-
 .../Tiff/Compression/Decompressors/WebpTiffCompression.cs     | 4 ++--
 .../Formats/Tiff/Compression/TiffDecompressorsFactory.cs      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp/Formats/Tiff/Compression/Decompressors/OldJpegTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/Decompressors/OldJpegTiffCompression.cs
index 978c93cb05..b58183ff60 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/Decompressors/OldJpegTiffCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/Decompressors/OldJpegTiffCompression.cs
@@ -19,10 +19,10 @@ internal sealed class OldJpegTiffCompression : TiffBaseDecompressor
     private readonly TiffPhotometricInterpretation photometricInterpretation;
 
     public OldJpegTiffCompression(
+        JpegDecoderOptions options,
         MemoryAllocator memoryAllocator,
         int width,
         int bitsPerPixel,
-        JpegDecoderOptions options,
         uint startOfImageMarker,
         TiffPhotometricInterpretation photometricInterpretation)
         : base(memoryAllocator, width, bitsPerPixel)
diff --git a/src/ImageSharp/Formats/Tiff/Compression/Decompressors/WebpTiffCompression.cs b/src/ImageSharp/Formats/Tiff/Compression/Decompressors/WebpTiffCompression.cs
index 347f09522c..4e1c9c2f84 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/Decompressors/WebpTiffCompression.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/Decompressors/WebpTiffCompression.cs
@@ -20,12 +20,12 @@ internal class WebpTiffCompression : TiffBaseDecompressor
     /// <summary>
     /// Initializes a new instance of the <see cref="WebpTiffCompression"/> class.
     /// </summary>
+    /// <param name="options">The general decoder options.</param>
     /// <param name="memoryAllocator">The memory allocator.</param>
     /// <param name="width">The width of the image.</param>
     /// <param name="bitsPerPixel">The bits per pixel.</param>
-    /// <param name="options">The general decoder options.</param>
     /// <param name="predictor">The predictor.</param>
-    public WebpTiffCompression(MemoryAllocator memoryAllocator, int width, int bitsPerPixel, DecoderOptions options, TiffPredictor predictor = TiffPredictor.None)
+    public WebpTiffCompression(DecoderOptions options, MemoryAllocator memoryAllocator, int width, int bitsPerPixel, TiffPredictor predictor = TiffPredictor.None)
         : base(memoryAllocator, width, bitsPerPixel, predictor)
         => this.options = options;
 
diff --git a/src/ImageSharp/Formats/Tiff/Compression/TiffDecompressorsFactory.cs b/src/ImageSharp/Formats/Tiff/Compression/TiffDecompressorsFactory.cs
index c4f73862ac..b9a1f31553 100644
--- a/src/ImageSharp/Formats/Tiff/Compression/TiffDecompressorsFactory.cs
+++ b/src/ImageSharp/Formats/Tiff/Compression/TiffDecompressorsFactory.cs
@@ -63,11 +63,11 @@ internal static class TiffDecompressorsFactory
 
             case TiffDecoderCompressionType.OldJpeg:
                 DebugGuard.IsTrue(predictor == TiffPredictor.None, "Predictor should only be used with lzw or deflate compression");
-                return new OldJpegTiffCompression(allocator, width, bitsPerPixel, new() { GeneralOptions = options }, oldJpegStartOfImageMarker, photometricInterpretation);
+                return new OldJpegTiffCompression(new() { GeneralOptions = options }, allocator, width, bitsPerPixel, oldJpegStartOfImageMarker, photometricInterpretation);
 
             case TiffDecoderCompressionType.Webp:
                 DebugGuard.IsTrue(predictor == TiffPredictor.None, "Predictor should only be used with lzw or deflate compression");
-                return new WebpTiffCompression(allocator, width, bitsPerPixel, options);
+                return new WebpTiffCompression(options, allocator, width, bitsPerPixel);
 
             default:
                 throw TiffThrowHelper.NotSupportedDecompressor(nameof(method));