PR Feedback

Author: jfversluis

src/Essentials/src/MediaPicker/ImageProcessor.android.cs

@@ -14,12 +14,16 @@ internal static partial class ImageProcessor
 {
 	public static partial async Task<Stream> RotateImageAsync(Stream inputStream, string? originalFileName)
 	{
-		if (inputStream == null)
+		if (inputStream is null)
+		{
 			return new MemoryStream();
+		}
 
 		// Reset stream position
 		if (inputStream.CanSeek)
+		{
 			inputStream.Position = 0;
+		}
 
 		// Read the input stream into a byte array
 		byte[] bytes;
@@ -32,9 +36,11 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 		try
 		{
 			// Load the bitmap from bytes
-			var originalBitmap = await Task.Run(() => BitmapFactory.DecodeByteArray(bytes, 0, bytes.Length));
-			if (originalBitmap == null)
+			using var originalBitmap = await Task.Run(() => BitmapFactory.DecodeByteArray(bytes, 0, bytes.Length));
+			if (originalBitmap is null)
+			{
 				return new MemoryStream(bytes);
+			}
 
 			// Get EXIF orientation
 			int orientation = GetExifOrientation(bytes);
@@ -47,19 +53,21 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 
 			// Apply EXIF orientation correction using SetRotate(0) to preserve original EXIF behavior
 			Bitmap? rotatedBitmap = ApplyExifOrientation(originalBitmap);
-			if (rotatedBitmap == null)
+			if (rotatedBitmap is null)
 			{
 				return new MemoryStream(bytes);
 			}
 
 			// Clean up the original bitmap if we created a new one
 			if (rotatedBitmap != originalBitmap)
+			{
 				originalBitmap.Recycle();
+			}
 
 			// Convert the rotated bitmap back to a stream
 			var resultStream = new MemoryStream();
 			bool usePng = !string.IsNullOrEmpty(originalFileName) && 
-						  Path.GetExtension(originalFileName).ToLowerInvariant() == ".png";
+						  Path.GetExtension(originalFileName).Equals(".png", StringComparison.OrdinalIgnoreCase);
 
 			var compressResult = await Task.Run(() =>
 			{
@@ -86,7 +94,9 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 			});
 
 			if (!compressResult)
+			{
 				return new MemoryStream(bytes);
+			}
 
 			resultStream.Position = 0;
 			return resultStream;

src/Essentials/src/MediaPicker/ImageProcessor.windows.cs

@@ -23,7 +23,7 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 			var decoder = await BitmapDecoder.CreateAsync(randomAccessStream);
 
 			// Check if rotation is needed
-			var orientation = GetImageOrientation(decoder);
+			var orientation = await GetImageOrientation(decoder);
 			if (orientation == BitmapRotation.None)
 			{
 				inputStream.Position = 0;
@@ -34,7 +34,14 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 			var outputStream = new InMemoryRandomAccessStream();
 
 			// Create encoder
-			var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.JpegEncoderId, outputStream);
+			Guid encoderId = BitmapEncoder.JpegEncoderId;
+
+			if (Path.GetExtension(originalFileName).Equals(".png", StringComparison.OrdinalIgnoreCase))
+			{
+				encoderId = BitmapEncoder.PngEncoderId;
+			}
+
+			var encoder = await BitmapEncoder.CreateAsync(encoderId, outputStream);
 
 			// Set the transform with rotation
 			encoder.BitmapTransform.Rotation = orientation;
@@ -65,13 +72,13 @@ public static partial async Task<Stream> RotateImageAsync(Stream inputStream, st
 		}
 	}
 
-	static BitmapRotation GetImageOrientation(BitmapDecoder decoder)
+	static async Task<BitmapRotation> GetImageOrientation(BitmapDecoder decoder)
 	{
 		try
 		{
 			// Try to get the EXIF orientation
 			var properties = decoder.BitmapProperties;
-			var orientationProperty = properties.GetPropertiesAsync(new[] { "System.Photo.Orientation" }).GetAwaiter().GetResult();
+			var orientationProperty = await properties.GetPropertiesAsync(new[] { "System.Photo.Orientation" });
 
 			if (orientationProperty.TryGetValue("System.Photo.Orientation", out var orientationValue) && 
 				orientationValue.Value is ushort orientation)