Determ build

Author: sebgod

CSharpFITS/CSharpFITS.csproj

@@ -11,13 +11,13 @@
     <LangVersion>9.0</LangVersion>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>license.txt</PackageLicenseFile>
-    <AssemblyVersion>2.1.8.2</AssemblyVersion>
-    <FileVersion>2.1.8.2</FileVersion>
+    <AssemblyVersion>3.1.8.2</AssemblyVersion>
+    <FileVersion>3.1.8.2</FileVersion>
     <PackageTags>Astronomy,FITS,Image</PackageTags>
     <RepositoryUrl>https://github.com/SharpAstro/FITS.Lib</RepositoryUrl>
     <PackageProjectUrl>https://github.com/SharpAstro/FITS.Lib</PackageProjectUrl>
     <Description>Supports reading and writing FITS files</Description>
-    <Version>2.1.8</Version>
+    <Version>3.1.8</Version>
     <Authors>Virtual Observatory - India</Authors>
     <PackageId>FITS.Lib</PackageId>
     <RootNamespace>nom.tam</RootNamespace>

CSharpFITS/image/ImageTiler.cs

@@ -279,6 +279,7 @@ protected internal virtual void FillFileData(Array output, int delta, int output
         {
             f.Seek(fileOffset + delta, SeekOrigin.Begin);
 
+            // CA2022: Underlying ArrayDataIO.Read uses exact read logic (see BufferedDataStream.ReadBytesExactly)
             if (base_Renamed == typeof(float))
             {
                 f.Read((float[])output, outputOffset, segment);

CSharpFITS/packages.lock.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "dependencies": {
+    ".NETStandard,Version=v2.0": {
+      "NETStandard.Library": {
+        "type": "Direct",
+        "requested": "[2.0.3, )",
+        "resolved": "2.0.3",
+        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.1.0"
+        }
+      },
+      "Microsoft.NETCore.Platforms": {
+        "type": "Transitive",
+        "resolved": "1.1.0",
+        "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
+      }
+    },
+    "net10.0": {}
+  }
+}

CSharpFITS/util/BufferedDataStream.cs

@@ -296,7 +296,7 @@ public override int Read(byte[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(size);
+                byte[] tbuf = ReadBytesExactly(size);
                 Buffer.BlockCopy(tbuf, 0, buf, offset, tbuf.Length);
                 result = tbuf.Length;
             }
@@ -314,7 +314,7 @@ public override int Read(sbyte[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(size);
+                byte[] tbuf = ReadBytesExactly(size);
                 for (int i = 0; i < tbuf.Length; ++i)
                 {
                     buf[i + offset] = (sbyte)tbuf[i];
@@ -326,7 +326,7 @@ public override int Read(sbyte[] buf, int offset, int size)
                 result = 0;
             }
 
-            return 0;
+            return result;
         }
 
         public override int Read(bool[] buf, int offset, int size)
@@ -335,7 +335,7 @@ public override int Read(bool[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(boolByteStride * size);
+                byte[] tbuf = ReadBytesExactly(boolByteStride * size);
                 for (int b = 0; b < tbuf.Length; ++nRead, b += boolByteStride)
                 {
                     buf[nRead + offset] = BitConverter.ToBoolean(tbuf, b);
@@ -358,7 +358,7 @@ public override int Read(char[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(charByteStride * size);
+                byte[] tbuf = ReadBytesExactly(charByteStride * size);
                 for (int b = 0; b < tbuf.Length; ++nRead, b += charByteStride)
                 {
                     buf[nRead + offset] = (char)((tbuf[b] << 8) | tbuf[b + 1]);
@@ -378,7 +378,7 @@ public override int Read(short[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(shortByteStride * size);
+                byte[] tbuf = ReadBytesExactly(shortByteStride * size);
 #if NETSTANDARD2_0
                 for (int b = 0; b < tbuf.Length; ++nRead, b += shortByteStride)
                 {
@@ -405,7 +405,7 @@ public override int Read(int[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(intByteStride * size);
+                byte[] tbuf = ReadBytesExactly(intByteStride * size);
 #if NETSTANDARD2_0
                 for (int b = 0; b < tbuf.Length; ++nRead, b += intByteStride)
                 {
@@ -432,7 +432,7 @@ public override int Read(long[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(longByteStride * size);
+                byte[] tbuf = ReadBytesExactly(longByteStride * size);
 #if NETSTANDARD2_0
                 for (int b = 0; b < tbuf.Length; ++nRead, b += longByteStride)
                 {
@@ -460,7 +460,7 @@ public override int Read(float[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(floatByteStride * size);
+                byte[] tbuf = ReadBytesExactly(floatByteStride * size);
 #if NETSTANDARD2_0
                 for (int b = 0; b < tbuf.Length; ++nRead, b += floatByteStride)
                 {
@@ -488,7 +488,7 @@ public override int Read(double[] buf, int offset, int size)
 
             try
             {
-                byte[] tbuf = _in.ReadBytes(doubleByteStride * size);
+                byte[] tbuf = ReadBytesExactly(doubleByteStride * size);
 #if NETSTANDARD2_0
                 for (int b = 0; b < tbuf.Length; ++nRead, b += doubleByteStride)
                 {
@@ -1049,5 +1049,33 @@ public override void Close()
         protected byte[] _garbageBuf;
         protected int primitiveArrayCount;
         #endregion
+
+        #region Helper Methods
+        /// <summary>
+        /// Reads exactly the specified number of bytes from the underlying stream.
+        /// Throws EndOfStreamException if fewer bytes are available.
+        /// </summary>
+        /// <param name="count">The number of bytes to read.</param>
+        /// <returns>A byte array containing exactly count bytes.</returns>
+        private byte[] ReadBytesExactly(int count)
+        {
+            byte[] buffer = new byte[count];
+#if NETSTANDARD2_0
+            int totalRead = 0;
+            while (totalRead < count)
+            {
+                int bytesRead = _s.Read(buffer, totalRead, count - totalRead);
+                if (bytesRead == 0)
+                {
+                    throw new EndOfStreamException($"Unable to read {count} bytes from stream. Only {totalRead} bytes were available.");
+                }
+                totalRead += bytesRead;
+            }
+#else
+            _s.ReadExactly(buffer);
+#endif
+            return buffer;
+        }
+        #endregion
     }
 }