Follow up on post-merge discussions in #2551

antonfirsov · antonfirsov · commit 45b6c369e41d · 2023-10-14T14:11:08.000+02:00
diff --git a/src/ImageSharp/Formats/Pbm/BinaryDecoder.cs b/src/ImageSharp/Formats/Pbm/BinaryDecoder.cs
@@ -71,7 +71,7 @@ private static void ProcessGrayscale<TPixel>(Configuration configuration, Buffer
 
         for (int y = 0; y < height; y++)
         {
-            if (stream.Read(rowSpan) == 0)
+            if (stream.Read(rowSpan) < rowSpan.Length)
             {
                 return;
             }
@@ -97,7 +97,7 @@ private static void ProcessWideGrayscale<TPixel>(Configuration configuration, Bu
 
         for (int y = 0; y < height; y++)
         {
-            if (stream.Read(rowSpan) == 0)
+            if (stream.Read(rowSpan) < rowSpan.Length)
             {
                 return;
             }
@@ -123,7 +123,7 @@ private static void ProcessRgb<TPixel>(Configuration configuration, Buffer2D<TPi
 
         for (int y = 0; y < height; y++)
         {
-            if (stream.Read(rowSpan) == 0)
+            if (stream.Read(rowSpan) < rowSpan.Length)
             {
                 return;
             }
@@ -149,7 +149,7 @@ private static void ProcessWideRgb<TPixel>(Configuration configuration, Buffer2D
 
         for (int y = 0; y < height; y++)
         {
-            if (stream.Read(rowSpan) == 0)
+            if (stream.Read(rowSpan) < rowSpan.Length)
             {
                 return;
             }
diff --git a/src/ImageSharp/Formats/Pbm/BufferedReadStreamExtensions.cs b/src/ImageSharp/Formats/Pbm/BufferedReadStreamExtensions.cs
@@ -15,7 +15,7 @@ internal static class BufferedReadStreamExtensions
     /// </summary>
     /// <param name="stream">The buffered read stream.</param>
     /// <returns><see langword="false"/> if EOF has been reached while reading the stream; see langword="true"/> otherwise.</returns>
-    public static bool TrySkipWhitespaceAndComments(this BufferedReadStream stream)
+    public static bool SkipWhitespaceAndComments(this BufferedReadStream stream)
     {
         bool isWhitespace;
         do
@@ -61,7 +61,7 @@ public static bool TrySkipWhitespaceAndComments(this BufferedReadStream stream)
     /// A 'false' return value doesn't mean that the parsing has been failed, since it's possible to reach EOF while reading the last decimal in the file.
     /// It's up to the call site to handle such a situation.
     /// </remarks>
-    public static bool TryReadDecimal(this BufferedReadStream stream, out int value)
+    public static bool ReadDecimal(this BufferedReadStream stream, out int value)
     {
         value = 0;
         while (true)
diff --git a/src/ImageSharp/Formats/Pbm/PbmDecoderCore.cs b/src/ImageSharp/Formats/Pbm/PbmDecoderCore.cs
@@ -146,18 +146,18 @@ private void ProcessHeader(BufferedReadStream stream)
                 throw new InvalidImageContentException("Unknown of not implemented image type encountered.");
         }
 
-        if (!stream.TrySkipWhitespaceAndComments() ||
-            !stream.TryReadDecimal(out int width) ||
-            !stream.TrySkipWhitespaceAndComments() ||
-            !stream.TryReadDecimal(out int height) ||
-            !stream.TrySkipWhitespaceAndComments())
+        if (!stream.SkipWhitespaceAndComments() ||
+            !stream.ReadDecimal(out int width) ||
+            !stream.SkipWhitespaceAndComments() ||
+            !stream.ReadDecimal(out int height) ||
+            !stream.SkipWhitespaceAndComments())
         {
             ThrowPrematureEof();
         }
 
         if (this.colorType != PbmColorType.BlackAndWhite)
         {
-            if (!stream.TryReadDecimal(out this.maxPixelValue))
+            if (!stream.ReadDecimal(out this.maxPixelValue))
             {
                 ThrowPrematureEof();
             }
@@ -171,7 +171,7 @@ private void ProcessHeader(BufferedReadStream stream)
                 this.componentType = PbmComponentType.Byte;
             }
 
-            stream.TrySkipWhitespaceAndComments();
+            stream.SkipWhitespaceAndComments();
         }
         else
         {
diff --git a/src/ImageSharp/Formats/Pbm/PlainDecoder.cs b/src/ImageSharp/Formats/Pbm/PlainDecoder.cs
@@ -70,9 +70,9 @@ private static void ProcessGrayscale<TPixel>(Configuration configuration, Buffer
         {
             for (int x = 0; x < width; x++)
             {
-                stream.TryReadDecimal(out int value);
+                stream.ReadDecimal(out int value);
                 rowSpan[x] = new L8((byte)value);
-                eofReached = !stream.TrySkipWhitespaceAndComments();
+                eofReached = !stream.SkipWhitespaceAndComments();
                 if (eofReached)
                 {
                     break;
@@ -106,9 +106,9 @@ private static void ProcessWideGrayscale<TPixel>(Configuration configuration, Bu
         {
             for (int x = 0; x < width; x++)
             {
-                stream.TryReadDecimal(out int value);
+                stream.ReadDecimal(out int value);
                 rowSpan[x] = new L16((ushort)value);
-                eofReached = !stream.TrySkipWhitespaceAndComments();
+                eofReached = !stream.SkipWhitespaceAndComments();
                 if (eofReached)
                 {
                     break;
@@ -142,20 +142,20 @@ private static void ProcessRgb<TPixel>(Configuration configuration, Buffer2D<TPi
         {
             for (int x = 0; x < width; x++)
             {
-                if (!stream.TryReadDecimal(out int red) ||
-                    !stream.TrySkipWhitespaceAndComments() ||
-                    !stream.TryReadDecimal(out int green) ||
-                    !stream.TrySkipWhitespaceAndComments())
+                if (!stream.ReadDecimal(out int red) ||
+                    !stream.SkipWhitespaceAndComments() ||
+                    !stream.ReadDecimal(out int green) ||
+                    !stream.SkipWhitespaceAndComments())
                 {
                     // Reached EOF before reading a full RGB value
                     eofReached = true;
                     break;
                 }
 
-                stream.TryReadDecimal(out int blue);
+                stream.ReadDecimal(out int blue);
 
                 rowSpan[x] = new Rgb24((byte)red, (byte)green, (byte)blue);
-                eofReached = !stream.TrySkipWhitespaceAndComments();
+                eofReached = !stream.SkipWhitespaceAndComments();
                 if (eofReached)
                 {
                     break;
@@ -189,20 +189,20 @@ private static void ProcessWideRgb<TPixel>(Configuration configuration, Buffer2D
         {
             for (int x = 0; x < width; x++)
             {
-                if (!stream.TryReadDecimal(out int red) ||
-                    !stream.TrySkipWhitespaceAndComments() ||
-                    !stream.TryReadDecimal(out int green) ||
-                    !stream.TrySkipWhitespaceAndComments())
+                if (!stream.ReadDecimal(out int red) ||
+                    !stream.SkipWhitespaceAndComments() ||
+                    !stream.ReadDecimal(out int green) ||
+                    !stream.SkipWhitespaceAndComments())
                 {
                     // Reached EOF before reading a full RGB value
                     eofReached = true;
                     break;
                 }
 
-                stream.TryReadDecimal(out int blue);
+                stream.ReadDecimal(out int blue);
 
                 rowSpan[x] = new Rgb48((ushort)red, (ushort)green, (ushort)blue);
-                eofReached = !stream.TrySkipWhitespaceAndComments();
+                eofReached = !stream.SkipWhitespaceAndComments();
                 if (eofReached)
                 {
                     break;
@@ -236,10 +236,10 @@ private static void ProcessBlackAndWhite<TPixel>(Configuration configuration, Bu
         {
             for (int x = 0; x < width; x++)
             {
-                stream.TryReadDecimal(out int value);
+                stream.ReadDecimal(out int value);
 
                 rowSpan[x] = value == 0 ? White : Black;
-                eofReached = !stream.TrySkipWhitespaceAndComments();
+                eofReached = !stream.SkipWhitespaceAndComments();
                 if (eofReached)
                 {
                     break;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static void ProcessGrayscale<TPixel>(Configuration configuration, Buffer`
`71`	`71`
`72`	`72`	`for (int y = 0; y < height; y++)`
`73`	`73`	`{`
`74`		`- if (stream.Read(rowSpan) == 0)`
	`74`	`+ if (stream.Read(rowSpan) < rowSpan.Length)`
`75`	`75`	`{`
`76`	`76`	`return;`
`77`	`77`	`}`
`@@ -97,7 +97,7 @@ private static void ProcessWideGrayscale<TPixel>(Configuration configuration, Bu`
`97`	`97`
`98`	`98`	`for (int y = 0; y < height; y++)`
`99`	`99`	`{`
`100`		`- if (stream.Read(rowSpan) == 0)`
	`100`	`+ if (stream.Read(rowSpan) < rowSpan.Length)`
`101`	`101`	`{`
`102`	`102`	`return;`
`103`	`103`	`}`
`@@ -123,7 +123,7 @@ private static void ProcessRgb<TPixel>(Configuration configuration, Buffer2D<TPi`
`123`	`123`
`124`	`124`	`for (int y = 0; y < height; y++)`
`125`	`125`	`{`
`126`		`- if (stream.Read(rowSpan) == 0)`
	`126`	`+ if (stream.Read(rowSpan) < rowSpan.Length)`
`127`	`127`	`{`
`128`	`128`	`return;`
`129`	`129`	`}`
`@@ -149,7 +149,7 @@ private static void ProcessWideRgb<TPixel>(Configuration configuration, Buffer2D`
`149`	`149`
`150`	`150`	`for (int y = 0; y < height; y++)`
`151`	`151`	`{`
`152`		`- if (stream.Read(rowSpan) == 0)`
	`152`	`+ if (stream.Read(rowSpan) < rowSpan.Length)`
`153`	`153`	`{`
`154`	`154`	`return;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,18 +146,18 @@ private void ProcessHeader(BufferedReadStream stream)`
`146`	`146`	`throw new InvalidImageContentException("Unknown of not implemented image type encountered.");`
`147`	`147`	`}`
`148`	`148`
`149`		`- if (!stream.TrySkipWhitespaceAndComments() \|\|`
`150`		`- !stream.TryReadDecimal(out int width) \|\|`
`151`		`- !stream.TrySkipWhitespaceAndComments() \|\|`
`152`		`- !stream.TryReadDecimal(out int height) \|\|`
`153`		`- !stream.TrySkipWhitespaceAndComments())`
	`149`	`+ if (!stream.SkipWhitespaceAndComments() \|\|`
	`150`	`+ !stream.ReadDecimal(out int width) \|\|`
	`151`	`+ !stream.SkipWhitespaceAndComments() \|\|`
	`152`	`+ !stream.ReadDecimal(out int height) \|\|`
	`153`	`+ !stream.SkipWhitespaceAndComments())`
`154`	`154`	`{`
`155`	`155`	`ThrowPrematureEof();`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if (this.colorType != PbmColorType.BlackAndWhite)`
`159`	`159`	`{`
`160`		`- if (!stream.TryReadDecimal(out this.maxPixelValue))`
	`160`	`+ if (!stream.ReadDecimal(out this.maxPixelValue))`
`161`	`161`	`{`
`162`	`162`	`ThrowPrematureEof();`
`163`	`163`	`}`
`@@ -171,7 +171,7 @@ private void ProcessHeader(BufferedReadStream stream)`
`171`	`171`	`this.componentType = PbmComponentType.Byte;`
`172`	`172`	`}`
`173`	`173`
`174`		`- stream.TrySkipWhitespaceAndComments();`
	`174`	`+ stream.SkipWhitespaceAndComments();`
`175`	`175`	`}`
`176`	`176`	`else`
`177`	`177`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ private static void ProcessGrayscale<TPixel>(Configuration configuration, Buffer`
`70`	`70`	`{`
`71`	`71`	`for (int x = 0; x < width; x++)`
`72`	`72`	`{`
`73`		`- stream.TryReadDecimal(out int value);`
	`73`	`+ stream.ReadDecimal(out int value);`
`74`	`74`	`rowSpan[x] = new L8((byte)value);`
`75`		`- eofReached = !stream.TrySkipWhitespaceAndComments();`
	`75`	`+ eofReached = !stream.SkipWhitespaceAndComments();`
`76`	`76`	`if (eofReached)`
`77`	`77`	`{`
`78`	`78`	`break;`
`@@ -106,9 +106,9 @@ private static void ProcessWideGrayscale<TPixel>(Configuration configuration, Bu`
`106`	`106`	`{`
`107`	`107`	`for (int x = 0; x < width; x++)`
`108`	`108`	`{`
`109`		`- stream.TryReadDecimal(out int value);`
	`109`	`+ stream.ReadDecimal(out int value);`
`110`	`110`	`rowSpan[x] = new L16((ushort)value);`
`111`		`- eofReached = !stream.TrySkipWhitespaceAndComments();`
	`111`	`+ eofReached = !stream.SkipWhitespaceAndComments();`
`112`	`112`	`if (eofReached)`
`113`	`113`	`{`
`114`	`114`	`break;`
`@@ -142,20 +142,20 @@ private static void ProcessRgb<TPixel>(Configuration configuration, Buffer2D<TPi`
`142`	`142`	`{`
`143`	`143`	`for (int x = 0; x < width; x++)`
`144`	`144`	`{`
`145`		`- if (!stream.TryReadDecimal(out int red) \|\|`
`146`		`- !stream.TrySkipWhitespaceAndComments() \|\|`
`147`		`- !stream.TryReadDecimal(out int green) \|\|`
`148`		`- !stream.TrySkipWhitespaceAndComments())`
	`145`	`+ if (!stream.ReadDecimal(out int red) \|\|`
	`146`	`+ !stream.SkipWhitespaceAndComments() \|\|`
	`147`	`+ !stream.ReadDecimal(out int green) \|\|`
	`148`	`+ !stream.SkipWhitespaceAndComments())`
`149`	`149`	`{`
`150`	`150`	`// Reached EOF before reading a full RGB value`
`151`	`151`	`eofReached = true;`
`152`	`152`	`break;`
`153`	`153`	`}`
`154`	`154`
`155`		`- stream.TryReadDecimal(out int blue);`
	`155`	`+ stream.ReadDecimal(out int blue);`
`156`	`156`
`157`	`157`	`rowSpan[x] = new Rgb24((byte)red, (byte)green, (byte)blue);`
`158`		`- eofReached = !stream.TrySkipWhitespaceAndComments();`
	`158`	`+ eofReached = !stream.SkipWhitespaceAndComments();`
`159`	`159`	`if (eofReached)`
`160`	`160`	`{`
`161`	`161`	`break;`
`@@ -189,20 +189,20 @@ private static void ProcessWideRgb<TPixel>(Configuration configuration, Buffer2D`
`189`	`189`	`{`
`190`	`190`	`for (int x = 0; x < width; x++)`
`191`	`191`	`{`
`192`		`- if (!stream.TryReadDecimal(out int red) \|\|`
`193`		`- !stream.TrySkipWhitespaceAndComments() \|\|`
`194`		`- !stream.TryReadDecimal(out int green) \|\|`
`195`		`- !stream.TrySkipWhitespaceAndComments())`
	`192`	`+ if (!stream.ReadDecimal(out int red) \|\|`
	`193`	`+ !stream.SkipWhitespaceAndComments() \|\|`
	`194`	`+ !stream.ReadDecimal(out int green) \|\|`
	`195`	`+ !stream.SkipWhitespaceAndComments())`
`196`	`196`	`{`
`197`	`197`	`// Reached EOF before reading a full RGB value`
`198`	`198`	`eofReached = true;`
`199`	`199`	`break;`
`200`	`200`	`}`
`201`	`201`
`202`		`- stream.TryReadDecimal(out int blue);`
	`202`	`+ stream.ReadDecimal(out int blue);`
`203`	`203`
`204`	`204`	`rowSpan[x] = new Rgb48((ushort)red, (ushort)green, (ushort)blue);`
`205`		`- eofReached = !stream.TrySkipWhitespaceAndComments();`
	`205`	`+ eofReached = !stream.SkipWhitespaceAndComments();`
`206`	`206`	`if (eofReached)`
`207`	`207`	`{`
`208`	`208`	`break;`
`@@ -236,10 +236,10 @@ private static void ProcessBlackAndWhite<TPixel>(Configuration configuration, Bu`
`236`	`236`	`{`
`237`	`237`	`for (int x = 0; x < width; x++)`
`238`	`238`	`{`
`239`		`- stream.TryReadDecimal(out int value);`
	`239`	`+ stream.ReadDecimal(out int value);`
`240`	`240`
`241`	`241`	`rowSpan[x] = value == 0 ? White : Black;`
`242`		`- eofReached = !stream.TrySkipWhitespaceAndComments();`
	`242`	`+ eofReached = !stream.SkipWhitespaceAndComments();`
`243`	`243`	`if (eofReached)`
`244`	`244`	`{`
`245`	`245`	`break;`