Update NuGet packages and remove workaround (#99)

sungaila · Oct 25, 2024 · c059474 · c059474
1 parent 1409472
commit c059474
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 72 deletions.
diff --git a/src/FrameworkTests/MauiApp/Platforms/iOS/Program.cs b/src/FrameworkTests/MauiApp/Platforms/iOS/Program.cs
@@ -1,5 +1,4 @@
-using ObjCRuntime;
-using UIKit;
+using UIKit;
 
 namespace PDFtoImage.FrameworkTests.MauiApp
 {

diff --git a/src/PDFtoImage/Conversion.Base64.cs b/src/PDFtoImage/Conversion.Base64.cs
@@ -1,10 +1,8 @@
-using PDFtoImage.Internals;
-using SkiaSharp;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-
 #if NET6_0_OR_GREATER
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
@@ -296,7 +294,7 @@ internal static void SaveImpl(Stream imageStream, SKEncodedImageFormat format, s
                 throw new ArgumentNullException(nameof(imageStream));
 
             using var bitmap = ToImage(pdfAsBase64String, page, password, options);
-            bitmap.EncodeExt(imageStream, format, 100);
+            bitmap.Encode(imageStream, format, 100);
         }
 #endif
     }

diff --git a/src/PDFtoImage/Conversion.ByteArray.cs b/src/PDFtoImage/Conversion.ByteArray.cs
@@ -1,5 +1,4 @@
-using PDFtoImage.Internals;
-using SkiaSharp;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -326,7 +325,7 @@ internal static void SaveImpl(Stream imageStream, SKEncodedImageFormat format, b
                 throw new ArgumentNullException(nameof(imageStream));
 
             using var bitmap = ToImage(pdfAsByteArray, page, password, options);
-            bitmap.EncodeExt(imageStream, format, 100);
+            bitmap.Encode(imageStream, format, 100);
         }
 #endif
     }

diff --git a/src/PDFtoImage/Conversion.Deprecated.cs b/src/PDFtoImage/Conversion.Deprecated.cs
@@ -457,7 +457,7 @@ internal static void SaveImpl(string filename, SKEncodedImageFormat format, Stre
         internal static void SaveImpl(Stream stream, SKEncodedImageFormat format, Stream pdfStream, bool leaveOpen = false, string? password = null, int page = 0, RenderOptions options = default)
         {
             using var bitmap = ToImage(pdfStream, leaveOpen, password, page, options);
-            bitmap.EncodeExt(stream, format, 100);
+            bitmap.Encode(stream, format, 100);
         }
 
 #if NET6_0_OR_GREATER
@@ -481,7 +481,7 @@ internal static void SaveImpl(Stream imageStream, SKEncodedImageFormat format, b
                 throw new ArgumentNullException(nameof(imageStream));
 
             using var bitmap = ToImage(pdfAsByteArray, password, page, options);
-            bitmap.EncodeExt(imageStream, format, 100);
+            bitmap.Encode(imageStream, format, 100);
         }
 
 #if NET6_0_OR_GREATER
@@ -505,7 +505,7 @@ internal static void SaveImpl(Stream imageStream, SKEncodedImageFormat format, s
                 throw new ArgumentNullException(nameof(imageStream));
 
             using var bitmap = ToImage(pdfAsBase64String, password, page, options);
-            bitmap.EncodeExt(imageStream, format, 100);
+            bitmap.Encode(imageStream, format, 100);
         }
     }
 }
diff --git a/src/PDFtoImage/Conversion.Stream.cs b/src/PDFtoImage/Conversion.Stream.cs
@@ -356,7 +356,7 @@ internal static void SaveImpl(string filename, SKEncodedImageFormat format, Stre
         internal static void SaveImpl(Stream stream, SKEncodedImageFormat format, Stream pdfStream, Index page, bool leaveOpen = false, string? password = null, RenderOptions options = default)
         {
             using var bitmap = ToImage(pdfStream, page, leaveOpen, password, options);
-            bitmap.EncodeExt(stream, format, 100);
+            bitmap.Encode(stream, format, 100);
         }
 #endif
     }

diff --git a/src/PDFtoImage/Internals/SKBitmapExtensions.cs b/src/PDFtoImage/Internals/SKBitmapExtensions.cs
diff --git a/src/PDFtoImage/PDFtoImage.csproj b/src/PDFtoImage/PDFtoImage.csproj
@@ -74,7 +74,7 @@
 
   <!-- SourceLink build steps and NuGet packages -->
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="all" />
   </ItemGroup>
 
@@ -83,9 +83,9 @@
     <PackageReference Include="bblanchon.PDFium.Linux" Version="130.0.6721" PrivateAssets="analyzers" />
     <PackageReference Include="bblanchon.PDFium.macOS" Version="130.0.6721" PrivateAssets="analyzers" />
     <PackageReference Include="bblanchon.PDFium.Win32" Version="130.0.6721" PrivateAssets="analyzers" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
-    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
   </ItemGroup>
 
   <!-- .NET Framework packages -->
@@ -102,18 +102,18 @@
   <!-- Android packages -->
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0-android' or '$(TargetFramework)'=='net9.0-android'">
     <PackageReference Include="bblanchon.PDFium.Android" Version="130.0.6721" PrivateAssets="analyzers" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Android" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Android" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
   </ItemGroup>
 
   <!-- iOS packages -->
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0-ios' or '$(TargetFramework)'=='net9.0-ios'">
     <PackageReference Include="bblanchon.PDFium.iOS" Version="130.0.6721" PrivateAssets="analyzers" />
-    <PackageReference Include="SkiaSharp.NativeAssets.iOS" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.iOS" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
   </ItemGroup>  
 
   <!-- Blazor WebAssembly stuff -->
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0' or '$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.0.0-preview.4.1" PrivateAssets="analyzers" />
+    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.0.0-preview.5.4" PrivateAssets="analyzers" />
     <PackageReference Include="Sungaila.PDFium.BlazorWebAssembly" Version="131.0.6728" PrivateAssets="analyzers" />
   </ItemGroup>
 

diff --git a/src/Tests/AspectRatioTests.cs b/src/Tests/AspectRatioTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PDFtoImage.Internals;
 using PDFtoImage.Tests;
 using System.IO;
 using static PDFtoImage.Conversion;
@@ -353,7 +352,7 @@ public void IgnoreDpi(string fileName, int? width = null, int? height = null, bo
             {
                 using var outputStream = CreateOutputStream(expectedPath);
 
-                ToImage(inputStream, true, options: new(Dpi: i, Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: withAspectRatio)).EncodeExt(outputStream, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+                ToImage(inputStream, true, options: new(Dpi: i, Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: withAspectRatio)).Encode(outputStream, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
                 CompareStreams(expectedPath, outputStream);
             }
         }
@@ -376,8 +375,8 @@ public void IgnoreAspectRatio(string fileName, int width, int height)
             using var outputStream1 = CreateOutputStream(expectedPath);
             using var outputStream2 = CreateOutputStream(expectedPath);
 
-            ToImage(inputStream, true, options: new(Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: false)).EncodeExt(outputStream1, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
-            ToImage(inputStream, true, options: new(Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: true)).EncodeExt(outputStream2, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+            ToImage(inputStream, true, options: new(Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: false)).Encode(outputStream1, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+            ToImage(inputStream, true, options: new(Width: width, Height: height, WithAnnotations: true, WithFormFill: true, WithAspectRatio: true)).Encode(outputStream2, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
 
             CompareStreams(expectedPath, outputStream1);
             CompareStreams(expectedPath, outputStream2);
@@ -401,8 +400,8 @@ public void IgnoreAspectRatioWithDpi(string fileName, int dpi)
             using var outputStream1 = CreateOutputStream(expectedPath);
             using var outputStream2 = CreateOutputStream(expectedPath);
 
-            ToImage(inputStream, true, options: new(Dpi: dpi, WithAnnotations: true, WithFormFill: true, WithAspectRatio: false)).EncodeExt(outputStream1, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
-            ToImage(inputStream, true, options: new(Dpi: dpi, WithAnnotations: true, WithFormFill: true, WithAspectRatio: true)).EncodeExt(outputStream2, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+            ToImage(inputStream, true, options: new(Dpi: dpi, WithAnnotations: true, WithFormFill: true, WithAspectRatio: false)).Encode(outputStream1, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+            ToImage(inputStream, true, options: new(Dpi: dpi, WithAnnotations: true, WithFormFill: true, WithAspectRatio: true)).Encode(outputStream2, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
 
             CompareStreams(expectedPath, outputStream1);
             CompareStreams(expectedPath, outputStream2);

diff --git a/src/Tests/BatchingTests.cs b/src/Tests/BatchingTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PDFtoImage.Internals;
 using PDFtoImage.Tests;
 using SkiaSharp;
 using System;
@@ -63,7 +62,7 @@ public void ToImagesWithSelectionOdd()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{selection[i]}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -151,7 +150,7 @@ public void ToImagesWithRangeAll()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{i}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -171,7 +170,7 @@ public void ToImagesWithRangeSecondHalf()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{i}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -191,7 +190,7 @@ public void ToImagesWithSelectionEven()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{selection[i]}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -211,7 +210,7 @@ public async Task ToImagesWithRangeAllAsync()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{i}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -231,7 +230,7 @@ public async Task ToImagesWithRangeSecondHalfAsync()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{i}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -251,7 +250,7 @@ public async Task ToImagesWithSelectionEvenAsync()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{selection[i]}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;
@@ -271,7 +270,7 @@ public async Task ToImagesWithSelectionOddAsync()
             {
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{selection[i]}.png");
                 using var outputStream = CreateOutputStream(expectedPath);
-                bitmap.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                bitmap.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
                 i++;

diff --git a/src/Tests/ComparisonTests.cs b/src/Tests/ComparisonTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PDFtoImage.Internals;
 using PDFtoImage.Tests;
 using SkiaSharp;
 using System;
@@ -83,7 +82,7 @@ public void SaveWebpPages(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.webp");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Webp, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Webp, 100);
 
                 CompareStreams(expectedPath, outputStream);
 
@@ -106,7 +105,7 @@ public async Task SaveWebpPagesAsync(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.webp");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Webp, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Webp, 100);
 
                 CompareStreams(expectedPath, outputStream);
 
@@ -182,7 +181,7 @@ public void SavePngPages(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.png");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
 
@@ -205,7 +204,7 @@ public async Task SavePngPagesAsync(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.png");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Png, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Png, 100);
 
                 CompareStreams(expectedPath, outputStream);
 
@@ -281,7 +280,7 @@ public void SaveJpegPages(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.jpg");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Jpeg, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Jpeg, 100);
 
                 CompareStreams(expectedPath, outputStream);
 
@@ -304,7 +303,7 @@ public async Task SaveJpegPagesAsync(bool withAnnotations = false)
                 var expectedPath = Path.Combine("..", "Assets", "Expected", GetPlatformAsString(), $"Wikimedia_Commons_web_{page}{(withAnnotations ? "_ANNOT" : string.Empty)}.jpg");
 
                 using var outputStream = CreateOutputStream(expectedPath);
-                image.EncodeExt(outputStream, SKEncodedImageFormat.Jpeg, 100);
+                image.Encode(outputStream, SKEncodedImageFormat.Jpeg, 100);
 
                 CompareStreams(expectedPath, outputStream);
 

diff --git a/src/WebConverter/Pages/Index.razor.cs b/src/WebConverter/Pages/Index.razor.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Logging;
 using Microsoft.JSInterop;
-using PDFtoImage.Internals;
 using PDFtoImage.WebConverter.Models;
 using SkiaSharp;
 using System;
@@ -183,7 +182,7 @@ await Task.Factory.StartNew(() =>
                             DpiRelativeToBounds: Model.DpiRelativeToBounds
                         )
                     );
-                    encodeSuccess = bitmap!.EncodeExt(Model.Output, Model.Format, Model.Quality);
+                    encodeSuccess = bitmap!.Encode(Model.Output, Model.Format, Model.Quality);
                 }, TaskCreationOptions.LongRunning);
 
                 if (!encodeSuccess)