sync back changes

Author: LoneWandererProductions

Imaging/ImageStreamMedia.cs

@@ -94,7 +94,6 @@ public static BitmapImage GetBitmapImageFileStream(string path, int width = 0, i
         {
             using var flStream = new FileStream(path, FileMode.Open, FileAccess.Read);
             bmp.BeginInit();
-            bmp.Freeze();
             bmp.CacheOption = BitmapCacheOption.OnLoad;
 
             if (width > 0 && height > 0)
@@ -139,7 +138,7 @@ internal static Bitmap BitmapImageToBitmap(BitmapImage image)
         enc.Save(outStream);
         var bitmap = new Bitmap(outStream);
 
-        return bitmap;
+        return new Bitmap(bitmap);
     }
 
     /// <summary>
@@ -148,9 +147,7 @@ internal static Bitmap BitmapImageToBitmap(BitmapImage image)
     /// </summary>
     /// <param name="image">The bitmap.</param>
     /// <param name="lossless">if set to <c>true</c> [lossless].</param>
-    /// <returns>
-    /// BitmpaImage from Bitmap
-    /// </returns>
+    /// <returns>BitmpaImage from Bitmap</returns>
     /// <exception cref="ArgumentNullException">if Image is null</exception>
     /// The Image as
     /// <see cref="BitmapImage" />
@@ -201,77 +198,66 @@ internal static BitmapImage BitmapToBitmapImage(Bitmap image, bool lossless = fa
     /// Fasts the convert.
     /// </summary>
     /// <param name="bmp">The BMP.</param>
-    /// <returns>
-    /// BitmapImage from Bitmap.
-    /// </returns>
+    /// <returns>BitmapImage from Bitmap.</returns>
     private static BitmapImage FastConvert(Bitmap bmp)
     {
-        // Ensure correct format for WPF
+        // Ensure 32bpp ARGB
         if (bmp.PixelFormat != System.Drawing.Imaging.PixelFormat.Format32bppArgb)
         {
             var converted = new Bitmap(bmp.Width, bmp.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-            using (var g = Graphics.FromImage(converted))
-            {
-                g.DrawImage(bmp, 0, 0);
-            }
-
-            bmp.Dispose();   // replace original
+            using var g = Graphics.FromImage(converted);
+            g.DrawImage(bmp, 0, 0);
             bmp = converted;
         }
 
         var rect = new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height);
-        var data = bmp.LockBits(rect, ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+        var bmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 
         try
         {
-            var stride = Math.Abs(data.Stride);
-            var bufferSize = stride * bmp.Height;
+            // WPF erwartet Int32Rect und PixelFormats.Bgra32
+            var wbRect = new Int32Rect(0, 0, bmp.Width, bmp.Height);
 
             var wb = new WriteableBitmap(
                 bmp.Width,
                 bmp.Height,
-                96,
-                96,
+                96, 96,
                 PixelFormats.Bgra32,
                 null);
 
-            wb.WritePixels(
-                new Int32Rect(0, 0, bmp.Width, bmp.Height),
-                data.Scan0,
-                bufferSize,
-                stride);
-
+            // Verwende die IntPtr-Überladung: WritePixels(Int32Rect, IntPtr buffer, int bufferSize, int stride)
+            wb.WritePixels(wbRect, bmpData.Scan0, Math.Abs(bmpData.Stride) * bmp.Height, Math.Abs(bmpData.Stride));
             wb.Freeze();
 
             return WriteableBitmapToBitmapImage(wb);
         }
         finally
         {
-            bmp.UnlockBits(data);
+            bmp.UnlockBits(bmpData);
         }
     }
 
     /// <summary>
     /// Writeables the bitmap to bitmap image.
     /// </summary>
     /// <param name="wb">The wb.</param>
-    /// <returns>
-    /// BitmapImage from Bitmap.
-    /// </returns>
+    /// <returns>BitmapImage from Bitmap.</returns>
     private static BitmapImage WriteableBitmapToBitmapImage(WriteableBitmap wb)
     {
+        var encoder = new JpegBitmapEncoder(); // MUCH faster than PNG
+        encoder.QualityLevel = 100;            // visually lossless
+
         using var ms = new MemoryStream();
-        var enc = new BmpBitmapEncoder();
-        enc.Frames.Add(BitmapFrame.Create(wb));
-        enc.Save(ms);
+        encoder.Frames.Add(BitmapFrame.Create(wb));
+        encoder.Save(ms);
         ms.Position = 0;
 
-        var img = new BitmapImage();
-        img.BeginInit();
-        img.CacheOption = BitmapCacheOption.OnLoad;
-        img.StreamSource = ms;
-        img.EndInit();
-        img.Freeze();
-        return img;
+        var bmp = new BitmapImage();
+        bmp.BeginInit();
+        bmp.CacheOption = BitmapCacheOption.OnLoad;
+        bmp.StreamSource = ms;
+        bmp.EndInit();
+        bmp.Freeze();
+        return bmp;
     }
-}
+}