Refactor how to set the scene values in the native library.

dlemstra · Sep 28, 2024 · fd8b185 · fd8b185
1 parent e7cfa17
commit fd8b185
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/src/Magick.NET/MagickImage.cs b/src/Magick.NET/MagickImage.cs
@@ -7163,8 +7163,6 @@ private MagickReadSettings CreateReadSettings(IMagickReadSettings<QuantumType>?
         else
             newReadSettings = new MagickReadSettings(readSettings);
 
-        newReadSettings.ForceSingleFrame();
-
         return newReadSettings;
     }
 

diff --git a/src/Magick.NET/Settings/MagickReadSettings.cs b/src/Magick.NET/Settings/MagickReadSettings.cs
@@ -125,12 +125,6 @@ public bool UseMonochrome
     /// </summary>
     public uint? Width { get; set; }
 
-    internal void ForceSingleFrame()
-    {
-        FrameCount = 1;
-        ApplyFrame();
-    }
-
     private static string GetDefineKey(IDefine define)
     {
         if (define.Format == MagickFormat.Unknown)
@@ -139,19 +133,6 @@ private static string GetDefineKey(IDefine define)
         return EnumHelper.GetName(define.Format) + ":" + define.Name;
     }
 
-    private string? GetScenes()
-    {
-        if (!FrameIndex.HasValue && (!FrameCount.HasValue || FrameCount.Value == 1))
-            return null;
-
-        if (FrameIndex.HasValue && (!FrameCount.HasValue || FrameCount.Value == 1))
-            return FrameIndex.Value.ToString(CultureInfo.InvariantCulture);
-
-        var frame = FrameIndex ?? 0;
-        var count = FrameCount ?? 1;
-        return string.Format(CultureInfo.InvariantCulture, "{0}-{1}", frame, frame + count);
-    }
-
     private void ApplyDefines()
     {
         if (Defines is null)
@@ -178,9 +159,13 @@ private void ApplyFrame()
         if (!FrameIndex.HasValue && !FrameCount.HasValue)
             return;
 
-        Scenes = GetScenes();
         Scene = FrameIndex ?? 0;
         NumberScenes = FrameCount ?? 1;
+
+        if (FrameIndex.HasValue && (!FrameCount.HasValue || FrameCount.Value == 1))
+            Scenes = FrameIndex.Value.ToString(CultureInfo.InvariantCulture);
+        else
+            Scenes = string.Format(CultureInfo.InvariantCulture, "{0}-{1}", Scene, Scene + NumberScenes);
     }
 
     private void Copy(IMagickReadSettings<QuantumType> settings)
-Original file line number
+Diff line change
@@ Expand Up @@
             else
                 newReadSettings = new MagickReadSettings(readSettings);
-            newReadSettings.ForceSingleFrame();
             return newReadSettings;
         }
@@ Expand Down @@