Fighting 2 extra bytes.

juliusfriedman · Oct 21, 2024 · 1fac6cb · 1fac6cb
1 parent aa8aa5a
commit 1fac6cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Codecs/Image/Jpeg/JpegImage.cs b/Codecs/Image/Jpeg/JpegImage.cs
@@ -248,13 +248,13 @@ private void WriteStartOfFrame(byte functionCode, Stream stream)
                 sof[i] = frameComponent;
             }
         }
-        stream.Write(sof.Array, sof.Offset, sof.Count);
+        WriteMarker(stream, sof);
     }
 
     private void WriteStartOfScan(Stream stream)
     {
         var numberOfComponents = ImageFormat.Components.Length;
-        var sos = new StartOfScan(numberOfComponents);
+        using var sos = new StartOfScan(numberOfComponents);
         // Set the Ss, Se, Ah, and Al fields
         // These values are typical for a baseline or progessive JPEG but not lossless. (1-7)
         sos.Ss = 0;  // Start of spectral selection
@@ -282,7 +282,7 @@ private void WriteStartOfScan(Stream stream)
                 sos[i] = componentSelector;
             }
         }
-        stream.Write(sos.Array, sos.Offset, sos.Count);
+        WriteMarker(stream, sos);
     }
 
     private void WriteMarker(Stream stream, Marker marker)

diff --git a/Codecs/Image/Jpeg/JpegUnitTests.cs b/Codecs/Image/Jpeg/JpegUnitTests.cs
@@ -21,7 +21,12 @@ public static void TestSave()
             using (var stream = new MemoryStream())
             {
                 image.Save(stream);
-                Console.WriteLine(stream.Length > 0 ? "Pass" : "Fail");
+                stream.Position = 0;
+                using (var jpgImage = JpegImage.FromStream(stream))
+                {
+                    if (jpgImage.Width != 100) throw new Exception();
+                    if (jpgImage.Height != 100) throw new Exception();
+                }
             }
         }