Merge pull request #2812 from kasperk81/refactor

cleanup projects and environment variables

.github/workflows/build-and-test.yml

@@ -19,6 +19,31 @@ jobs:
         isARM:
           - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
+          - os: ubuntu-latest
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: windows-latest
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: buildjet-4vcpu-ubuntu-2204-arm
+            framework: net9.0
+            sdk: 9.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+
           - os: ubuntu-latest
             framework: net8.0
             sdk: 8.0.x
@@ -100,7 +125,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            8.0.x
+            9.0.x
 
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}

src/ImageSharp.ruleset

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="ImageSharp" ToolsVersion="17.0">
   <Include Path="..\shared-infrastructure\sixlabors.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
+    <Rule Id="CA2022" Action="Info" />
+  </Rules>
 </RuleSet>

src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs

@@ -16,7 +16,6 @@
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 using SixLabors.ImageSharp.Metadata.Profiles.Iptc;
 using SixLabors.ImageSharp.Metadata.Profiles.Xmp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg;
 
@@ -1473,7 +1472,7 @@ private void ProcessStartOfScanMarker(BufferedReadStream stream, int remaining)
 
             this.Frame.ComponentOrder[i / 2] = (byte)componentIndex;
 
-            IJpegComponent component = this.Frame.Components[componentIndex];
+            JpegComponent component = this.Frame.Components[componentIndex];
 
             // 1 byte: Huffman table selectors.
             // 4 bits - dc

src/ImageSharp/Formats/Webp/Lossy/Vp8Encoding.cs

@@ -667,12 +667,12 @@ public static void EncPredChroma8(Span<byte> dst, Span<byte> left, Span<byte> to
 
         // V block.
         dst = dst[8..];
-        if (top != default)
+        if (!top.IsEmpty)
         {
             top = top[8..];
         }
 
-        if (left != default)
+        if (!left.IsEmpty)
         {
             left = left[16..];
         }
@@ -701,7 +701,7 @@ public static void EncPredLuma4(Span<byte> dst, Span<byte> top, int topOffset, S
 
     private static void VerticalPred(Span<byte> dst, Span<byte> top, int size)
     {
-        if (top != default)
+        if (!top.IsEmpty)
         {
             for (int j = 0; j < size; j++)
             {
@@ -716,7 +716,7 @@ private static void VerticalPred(Span<byte> dst, Span<byte> top, int size)
 
     public static void HorizontalPred(Span<byte> dst, Span<byte> left, int size)
     {
-        if (left != default)
+        if (!left.IsEmpty)
         {
             left = left[1..]; // in the reference implementation, left starts at - 1.
             for (int j = 0; j < size; j++)
@@ -732,9 +732,9 @@ public static void HorizontalPred(Span<byte> dst, Span<byte> left, int size)
 
     public static void TrueMotion(Span<byte> dst, Span<byte> left, Span<byte> top, int size)
     {
-        if (left != default)
+        if (!left.IsEmpty)
         {
-            if (top != default)
+            if (!top.IsEmpty)
             {
                 Span<byte> clip = Clip1.AsSpan(255 - left[0]); // left [0] instead of left[-1], original left starts at -1
                 for (int y = 0; y < size; y++)
@@ -759,7 +759,7 @@ public static void TrueMotion(Span<byte> dst, Span<byte> left, Span<byte> top, i
             // is equivalent to VE prediction where you just copy the top samples.
             // Note that if top samples are not available, the default value is
             // then 129, and not 127 as in the VerticalPred case.
-            if (top != default)
+            if (!top.IsEmpty)
             {
                 VerticalPred(dst, top, size);
             }
@@ -774,14 +774,14 @@ private static void DcMode(Span<byte> dst, Span<byte> left, Span<byte> top, int
     {
         int dc = 0;
         int j;
-        if (top != default)
+        if (!top.IsEmpty)
         {
             for (j = 0; j < size; j++)
             {
                 dc += top[j];
             }
 
-            if (left != default)
+            if (!left.IsEmpty)
             {
                 // top and left present.
                 left = left[1..]; // in the reference implementation, left starts at -1.
@@ -798,7 +798,7 @@ private static void DcMode(Span<byte> dst, Span<byte> left, Span<byte> top, int
 
             dc = (dc + round) >> shift;
         }
-        else if (left != default)
+        else if (!left.IsEmpty)
         {
             // left but no top.
             left = left[1..]; // in the reference implementation, left starts at -1.

src/ImageSharp/Formats/Webp/Lossy/YuvConversion.cs

@@ -48,7 +48,7 @@ private static void UpSampleScalar(Span<byte> topY, Span<byte> bottomY, Span<byt
         uint uv0 = ((3 * tluv) + luv + 0x00020002u) >> 2;
         YuvToBgr(topY[0], (int)(uv0 & 0xff), (int)(uv0 >> 16), topDst);
 
-        if (bottomY != default)
+        if (!bottomY.IsEmpty)
         {
             uv0 = ((3 * luv) + tluv + 0x00020002u) >> 2;
             YuvToBgr(bottomY[0], (int)uv0 & 0xff, (int)(uv0 >> 16), bottomDst);
@@ -69,7 +69,7 @@ private static void UpSampleScalar(Span<byte> topY, Span<byte> bottomY, Span<byt
             YuvToBgr(topY[xMul2 - 1], (int)(uv0 & 0xff), (int)(uv0 >> 16), topDst[((xMul2 - 1) * xStep)..]);
             YuvToBgr(topY[xMul2 - 0], (int)(uv1 & 0xff), (int)(uv1 >> 16), topDst[((xMul2 - 0) * xStep)..]);
 
-            if (bottomY != default)
+            if (!bottomY.IsEmpty)
             {
                 uv0 = (diag03 + luv) >> 1;
                 uv1 = (diag12 + uv) >> 1;
@@ -85,7 +85,7 @@ private static void UpSampleScalar(Span<byte> topY, Span<byte> bottomY, Span<byt
         {
             uv0 = ((3 * tluv) + luv + 0x00020002u) >> 2;
             YuvToBgr(topY[len - 1], (int)(uv0 & 0xff), (int)(uv0 >> 16), topDst[((len - 1) * xStep)..]);
-            if (bottomY != default)
+            if (!bottomY.IsEmpty)
             {
                 uv0 = ((3 * luv) + tluv + 0x00020002u) >> 2;
                 YuvToBgr(bottomY[len - 1], (int)(uv0 & 0xff), (int)(uv0 >> 16), bottomDst[((len - 1) * xStep)..]);
@@ -120,7 +120,7 @@ private static void UpSampleSse41(Span<byte> topY, Span<byte> bottomY, Span<byte
         int u0t = (topU[0] + uDiag) >> 1;
         int v0t = (topV[0] + vDiag) >> 1;
         YuvToBgr(topY[0], u0t, v0t, topDst);
-        if (bottomY != default)
+        if (!bottomY.IsEmpty)
         {
             int u0b = (curU[0] + uDiag) >> 1;
             int v0b = (curV[0] + vDiag) >> 1;
@@ -134,7 +134,7 @@ private static void UpSampleSse41(Span<byte> topY, Span<byte> bottomY, Span<byte
         ref byte topVRef = ref MemoryMarshal.GetReference(topV);
         ref byte curURef = ref MemoryMarshal.GetReference(curU);
         ref byte curVRef = ref MemoryMarshal.GetReference(curV);
-        if (bottomY != default)
+        if (!bottomY.IsEmpty)
         {
             for (pos = 1, uvPos = 0; pos + 32 + 1 <= len; pos += 32, uvPos += 16)
             {
@@ -160,12 +160,12 @@ private static void UpSampleSse41(Span<byte> topY, Span<byte> bottomY, Span<byte
             Span<byte> tmpTopDst = ru[(4 * 32)..];
             Span<byte> tmpBottomDst = tmpTopDst[(4 * 32)..];
             Span<byte> tmpTop = tmpBottomDst[(4 * 32)..];
-            Span<byte> tmpBottom = (bottomY == default) ? null : tmpTop[32..];
+            Span<byte> tmpBottom = bottomY.IsEmpty ? null : tmpTop[32..];
             UpSampleLastBlock(topU[uvPos..], curU[uvPos..], leftOver, ru);
             UpSampleLastBlock(topV[uvPos..], curV[uvPos..], leftOver, rv);
 
             topY[pos..len].CopyTo(tmpTop);
-            if (bottomY != default)
+            if (!bottomY.IsEmpty)
             {
                 bottomY[pos..len].CopyTo(tmpBottom);
                 ConvertYuvToBgrWithBottomYSse41(tmpTop, tmpBottom, tmpTopDst, tmpBottomDst, ru, rv, 0, xStep);
@@ -176,7 +176,7 @@ private static void UpSampleSse41(Span<byte> topY, Span<byte> bottomY, Span<byte
             }
 
             tmpTopDst[..((len - pos) * xStep)].CopyTo(topDst[(pos * xStep)..]);
-            if (bottomY != default)
+            if (!bottomY.IsEmpty)
             {
                 tmpBottomDst[..((len - pos) * xStep)].CopyTo(bottomDst[(pos * xStep)..]);
             }

src/ImageSharp/ImageSharp.csproj

@@ -13,6 +13,7 @@
     <PackageTags>Image Resize Crop Gif Jpg Jpeg Bitmap Pbm Png Tga Tiff WebP NetCore</PackageTags>
     <Description>A new, fully featured, fully managed, cross-platform, 2D graphics API for .NET</Description>
     <Configurations>Debug;Release</Configurations>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <!--  This enables the nullable analysis and treats all nullable warnings as error-->
@@ -29,14 +30,12 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-        <IsTrimmable>true</IsTrimmable>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
         <TargetFrameworks>net8.0</TargetFrameworks>
-        <IsTrimmable>true</IsTrimmable>
       </PropertyGroup>
     </Otherwise>
   </Choose>

src/ImageSharp/Image{TPixel}.cs

@@ -160,7 +160,7 @@ internal Image(Configuration configuration, ImageMetadata metadata, IEnumerable<
     /// <summary>
     /// Gets the root frame.
     /// </summary>
-    private IPixelSource<TPixel> PixelSourceUnsafe => this.frames.RootFrameUnsafe;
+    private ImageFrame<TPixel> PixelSourceUnsafe => this.frames.RootFrameUnsafe;
 
     /// <summary>
     /// Gets or sets the pixel at the specified position.
@@ -324,7 +324,7 @@ public bool DangerousTryGetSinglePixelMemory(out Memory<TPixel> memory)
     }
 
     /// <summary>
-    /// Clones the current image
+    /// Clones the current image.
     /// </summary>
     /// <returns>Returns a new image with all the same metadata as the original.</returns>
     public Image<TPixel> Clone() => this.Clone(this.Configuration);

src/ImageSharp/Metadata/Profiles/Exif/ExifWriter.cs

@@ -241,7 +241,7 @@ private static bool HasValue(IExifValue exifValue)
         return true;
     }
 
-    private static uint GetLength(IList<IExifValue> values)
+    private static uint GetLength(List<IExifValue> values)
     {
         if (values.Count == 0)
         {

src/ImageSharp/Metadata/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

@@ -144,7 +144,7 @@ public IccChromaticityTagDataEntry ReadChromaticityTagDataEntry()
         ushort channelCount = this.ReadUInt16();
         var colorant = (IccColorantEncoding)this.ReadUInt16();
 
-        if (Enum.IsDefined(typeof(IccColorantEncoding), colorant) && colorant != IccColorantEncoding.Unknown)
+        if (Enum.IsDefined(colorant) && colorant != IccColorantEncoding.Unknown)
         {
             // The type is known and so are the values (they are constant)
             // channelCount should always be 3 but it doesn't really matter if it's not

src/ImageSharp/Metadata/Profiles/ICC/IccProfile.cs

@@ -155,9 +155,9 @@ public bool CheckIsValid()
         }
 
         return arrayValid &&
-               Enum.IsDefined(typeof(IccColorSpaceType), this.Header.DataColorSpace) &&
-               Enum.IsDefined(typeof(IccColorSpaceType), this.Header.ProfileConnectionSpace) &&
-               Enum.IsDefined(typeof(IccRenderingIntent), this.Header.RenderingIntent) &&
+               Enum.IsDefined(this.Header.DataColorSpace) &&
+               Enum.IsDefined(this.Header.ProfileConnectionSpace) &&
+               Enum.IsDefined(this.Header.RenderingIntent) &&
                this.Header.Size is >= minSize and < maxSize;
     }
 

src/ImageSharp/Processing/Processors/Convolution/Parameters/BokehBlurKernelDataProvider.cs

@@ -21,12 +21,12 @@ internal static class BokehBlurKernelDataProvider
     /// <summary>
     /// Gets the kernel scales to adjust the component values in each kernel
     /// </summary>
-    private static IReadOnlyList<float> KernelScales { get; } = new[] { 1.4f, 1.2f, 1.2f, 1.2f, 1.2f, 1.2f };
+    private static float[] KernelScales { get; } = new[] { 1.4f, 1.2f, 1.2f, 1.2f, 1.2f, 1.2f };
 
     /// <summary>
     /// Gets the available bokeh blur kernel parameters
     /// </summary>
-    private static IReadOnlyList<Vector4[]> KernelComponents { get; } = new[]
+    private static Vector4[][] KernelComponents { get; } = new[]
     {
         // 1 component
         new[] { new Vector4(0.862325f, 1.624835f, 0.767583f, 1.862321f) },
@@ -112,7 +112,7 @@ public static BokehBlurKernelData GetBokehBlurKernelData(
     private static (Vector4[] Parameters, float Scale) GetParameters(int componentsCount)
     {
         // Prepare the kernel components
-        int index = Math.Max(0, Math.Min(componentsCount - 1, KernelComponents.Count));
+        int index = Math.Max(0, Math.Min(componentsCount - 1, KernelComponents.Length));
 
         return (KernelComponents[index], KernelScales[index]);
     }