From 5dd11da30ee685e7e2d4a834bb38ac653229c408 Mon Sep 17 00:00:00 2001
From: primo-ppcg <mike.tryczak@gmail.com>
Date: Tue, 23 Apr 2024 13:23:04 +0700
Subject: [PATCH] Bump Dependencies

Bump ImageSharp and SkiaSharp dependencies.
---
 src/BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj     | 2 +-
 .../BinaryKits.Zpl.Protocol.csproj                       | 2 +-
 .../ImageConverters/ImageSharpImageConverter.cs          | 9 +++------
 .../BinaryKits.Zpl.Viewer.WebApi.csproj                  | 2 +-
 src/BinaryKits.Zpl.Viewer/BinaryKits.Zpl.Viewer.csproj   | 8 ++++----
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj b/src/BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj
index 4b0d6e6b..4fdef396 100644
--- a/src/BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj
+++ b/src/BinaryKits.Zpl.Label/BinaryKits.Zpl.Label.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="SixLabors.ImageSharp">
-      <Version>2.1.3</Version>
+      <Version>2.1.8</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/src/BinaryKits.Zpl.Protocol/BinaryKits.Zpl.Protocol.csproj b/src/BinaryKits.Zpl.Protocol/BinaryKits.Zpl.Protocol.csproj
index 7ffbca2b..ba853ad0 100644
--- a/src/BinaryKits.Zpl.Protocol/BinaryKits.Zpl.Protocol.csproj
+++ b/src/BinaryKits.Zpl.Protocol/BinaryKits.Zpl.Protocol.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="SixLabors.ImageSharp">
-      <Version>1.0.4</Version>
+      <Version>2.1.8</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/src/BinaryKits.Zpl.Protocol/ImageConverters/ImageSharpImageConverter.cs b/src/BinaryKits.Zpl.Protocol/ImageConverters/ImageSharpImageConverter.cs
index 960a92ab..57be227a 100644
--- a/src/BinaryKits.Zpl.Protocol/ImageConverters/ImageSharpImageConverter.cs
+++ b/src/BinaryKits.Zpl.Protocol/ImageConverters/ImageSharpImageConverter.cs
@@ -17,7 +17,7 @@ public ImageResult ConvertImage(byte[] imageData)
         {
             var zplBuilder = new StringBuilder();
 
-            using (Image<Rgba32> image = Image.Load(imageData))
+            using (Image<Rgba32> image = Image.Load(imageData).CloneAs<Rgba32>())
             {
                 var bytesPerRow = image.Width % 8 > 0
                     ? image.Width / 8 + 1
@@ -30,11 +30,9 @@ public ImageResult ConvertImage(byte[] imageData)
 
                 for (var y = 0; y < image.Height; y++)
                 {
-                    var row = image.GetPixelRowSpan(y);
-
                     for (var x = 0; x < image.Width; x++)
                     {
-                        var pixel = row[x];
+                        var pixel = image[x, y];
 
                         var isBlackPixel = ((pixel.R + pixel.G + pixel.B) / 3) < 128;
                         if (isBlackPixel)
@@ -88,14 +86,13 @@ public byte[] ConvertImage(byte[] imageData, int bytesPerRow)
             {
                 for (var y = 0; y < image.Height; y++)
                 {
-                    var row = image.GetPixelRowSpan(y);
                     var bits = new BitArray(imageData.Skip(bytesPerRow * y).Take(bytesPerRow).ToArray());
 
                     for (var x = 0 ; x < image.Width; x++)
                     {
                         if (bits[x])
                         {
-                            row[x].A = 255;
+                            image[x, y] = new Rgba32(0, 0, 0, 255);
                         }
                     }
                 }
diff --git a/src/BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj b/src/BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj
index 7c9e11eb..a356bd39 100644
--- a/src/BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj
+++ b/src/BinaryKits.Zpl.Viewer.WebApi/BinaryKits.Zpl.Viewer.WebApi.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
   </ItemGroup>
 
diff --git a/src/BinaryKits.Zpl.Viewer/BinaryKits.Zpl.Viewer.csproj b/src/BinaryKits.Zpl.Viewer/BinaryKits.Zpl.Viewer.csproj
index 4debec17..da5b76d4 100644
--- a/src/BinaryKits.Zpl.Viewer/BinaryKits.Zpl.Viewer.csproj
+++ b/src/BinaryKits.Zpl.Viewer/BinaryKits.Zpl.Viewer.csproj
@@ -23,14 +23,14 @@
 
   <ItemGroup>
     <PackageReference Include="BarcodeLib" Version="2.4.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.8" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
     <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.3" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
+    <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
   </ItemGroup>
 
   <ItemGroup>