Fix BitmapEncoder dp to 96

Change OpenReadAsync to OpenStreamForReadAsync
SharpAdb · Jan 5, 2024 · a0bf4f1 · a0bf4f1
1 parent d647124
commit a0bf4f1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/AdvancedSharpAdbClient/DeviceCommands/PackageManager.Async.cs b/AdvancedSharpAdbClient/DeviceCommands/PackageManager.Async.cs
@@ -484,7 +484,7 @@ public virtual async Task<VersionInfo> GetVersionInfoAsync(string packageName, C
         /// <returns>A <see cref="Task{Stream}"/> which returns a read-only <see cref="Stream"/> on the specified path.</returns>
         protected virtual Task<Stream> GetFileStreamAsync(string path, CancellationToken cancellationToken = default) =>
 #if WINDOWS_UWP
-            StorageFile.GetFileFromPathAsync(path).AsTask(cancellationToken).ContinueWith(x => x.Result.OpenReadAsync().AsTask(cancellationToken)).Unwrap().ContinueWith(x => x.Result.AsStream());
+            StorageFile.GetFileFromPathAsync(path).AsTask(cancellationToken).ContinueWith(x => x.Result.OpenStreamForReadAsync()).Unwrap();
 #else
             TaskExExtensions.FromResult<Stream>(File.OpenRead(path));
 #endif

diff --git a/AdvancedSharpAdbClient/DeviceCommands/PackageManager.cs b/AdvancedSharpAdbClient/DeviceCommands/PackageManager.cs
@@ -520,7 +520,7 @@ protected void ValidateDevice()
         /// <returns>A read-only <see cref="Stream"/> on the specified path.</returns>
         protected virtual Stream GetFileStream(string path) =>
 #if WINDOWS_UWP
-            StorageFile.GetFileFromPathAsync(path).AwaitByTaskCompleteSource().OpenReadAsync().AwaitByTaskCompleteSource().AsStream();
+            StorageFile.GetFileFromPathAsync(path).AwaitByTaskCompleteSource().OpenStreamForReadAsync().AwaitByTaskCompleteSource();
 #else
             File.OpenRead(path);
 #endif

diff --git a/AdvancedSharpAdbClient/Models/FramebufferHeader.cs b/AdvancedSharpAdbClient/Models/FramebufferHeader.cs
@@ -9,7 +9,6 @@
 using System.Runtime.InteropServices;
 
 #if WINDOWS_UWP
-using System.IO;
 using System.Threading;
 #endif
 
@@ -432,22 +431,19 @@ private PixelFormat StandardizePixelFormat(byte[] buffer)
             else
             {
                 FramebufferHeader self = this;
-
                 TaskCompletionSource<WriteableBitmap?> taskCompletionSource = new();
-
                 _ = dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
                 {
                     try
                     {
                         WriteableBitmap? result = await self.ToBitmapAsync(buffer, cancellationToken).ConfigureAwait(false);
-                        taskCompletionSource.SetResult(result);
+                        _ = taskCompletionSource.TrySetResult(result);
                     }
                     catch (Exception e)
                     {
-                        taskCompletionSource.SetException(e);
+                        _ = taskCompletionSource.TrySetException(e);
                     }
                 });
-
                 return taskCompletionSource.Task;
             }
         }
@@ -470,25 +466,22 @@ private PixelFormat StandardizePixelFormat(byte[] buffer)
             else
             {
                 FramebufferHeader self = this;
-
                 TaskCompletionSource<WriteableBitmap?> taskCompletionSource = new();
-
                 if (!dispatcher.TryEnqueue(async () =>
                 {
                     try
                     {
                         WriteableBitmap? result = await self.ToBitmapAsync(buffer, cancellationToken).ConfigureAwait(false);
-                        taskCompletionSource.SetResult(result);
+                        _ = taskCompletionSource.TrySetResult(result);
                     }
                     catch (Exception e)
                     {
-                        taskCompletionSource.SetException(e);
+                        _ = taskCompletionSource.TrySetException(e);
                     }
                 }))
                 {
-                    taskCompletionSource.SetException(new InvalidOperationException("Failed to enqueue the operation"));
+                    _ = taskCompletionSource.TrySetException(new InvalidOperationException("Failed to enqueue the operation"));
                 }
-
                 return taskCompletionSource.Task;
             }
         }
@@ -519,7 +512,7 @@ private PixelFormat StandardizePixelFormat(byte[] buffer)
 
             using InMemoryRandomAccessStream random = new();
             BitmapEncoder encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, random).AsTask(cancellationToken);
-            encoder.SetPixelData(bitmapPixelFormat, alphaMode, Width, Height, 960, 960, buffer);
+            encoder.SetPixelData(bitmapPixelFormat, alphaMode, Width, Height, 96, 96, buffer);
             await encoder.FlushAsync().AsTask(cancellationToken);
             WriteableBitmap WriteableImage = new((int)Width, (int)Height);
             await WriteableImage.SetSourceAsync(random).AsTask(cancellationToken).ConfigureAwait(false);

diff --git a/AdvancedSharpAdbClient/Polyfills/Extensions/TaskExExtensions.cs b/AdvancedSharpAdbClient/Polyfills/Extensions/TaskExExtensions.cs
@@ -117,11 +117,11 @@ public static TResult AwaitByTaskCompleteSource<TResult>(this IAsyncOperation<TR
                 try
                 {
                     TResult result = await function.AsTask(cancellationToken).ConfigureAwait(false);
-                    taskCompletionSource.SetResult(result);
+                    _ = taskCompletionSource.TrySetResult(result);
                 }
                 catch (Exception e)
                 {
-                    taskCompletionSource.SetException(e);
+                    _ = taskCompletionSource.TrySetException(e);
                 }
             }, cancellationToken);
             TResult taskResult = task.Result;
@@ -143,11 +143,11 @@ public static void AwaitByTaskCompleteSource(this Task function, CancellationTok
                 try
                 {
                     await function.ConfigureAwait(false);
-                    taskCompletionSource.SetResult(null);
+                    _ = taskCompletionSource.TrySetResult(null);
                 }
                 catch (Exception e)
                 {
-                    taskCompletionSource.SetException(e);
+                    _ = taskCompletionSource.TrySetException(e);
                 }
             }, cancellationToken);
             _ = task.Result;
@@ -169,11 +169,11 @@ public static TResult AwaitByTaskCompleteSource<TResult>(this Task<TResult> func
                 try
                 {
                     TResult result = await function.ConfigureAwait(false);
-                    taskCompletionSource.SetResult(result);
+                    _ = taskCompletionSource.TrySetResult(result);
                 }
                 catch (Exception e)
                 {
-                    taskCompletionSource.SetException(e);
+                    _ = taskCompletionSource.TrySetException(e);
                 }
             }, cancellationToken);
             TResult taskResult = task.Result;

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -24,7 +24,7 @@
     <RepositoryUrl>https://github.com/SharpAdb/AdvancedSharpAdbClient</RepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <Title>.NET client for adb, Android Debug Bridge (AdvancedSharpAdbClient)</Title>
-    <VersionPrefix>3.0.9</VersionPrefix>
+    <VersionPrefix>3.0.10</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup>