Merge branch 'master' into Release

Author: mee-ironsoftware

IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/Data/partial_valid.tif

@@ -655,6 +655,73 @@ public void Redact_ShouldRedactRegionWithColor()
             }
         }
 
+        [FactWithAutomaticDisplayName]
+        public void TestGetRGBBuffer()
+        {
+            string imagePath = GetRelativeFilePath("checkmark.jpg");
+            using var bitmap = new AnyBitmap(imagePath);
+            var expectedSize = bitmap.Width * bitmap.Height * 3; // 3 bytes per pixel (RGB)
+
+            byte[] buffer = bitmap.GetRGBBuffer();
+
+            Assert.Equal(expectedSize, buffer.Length);
+
+            // Verify the first pixel's RGB values
+            var firstPixel = bitmap.GetPixel(0, 0);
+            Assert.Equal(firstPixel.R, buffer[0]);
+            Assert.Equal(firstPixel.G, buffer[1]);
+            Assert.Equal(firstPixel.B, buffer[2]);
+        }
+
+        [FactWithAutomaticDisplayName]
+        public void Test_LoadFromRGBBuffer()
+        {
+            // Arrange
+            int width = 2;
+            int height = 2;
+            byte[] buffer = new byte[]
+            {
+                255, 0, 0, // red
+                0, 255, 0, // green
+                0, 0, 255, // blue
+                255, 255, 255, // white
+            };
+
+            // Act
+            AnyBitmap result = AnyBitmap.LoadAnyBitmapFromRGBBuffer(buffer, width, height);
+
+            // Assert
+            byte[] resultData = result.GetRGBBuffer();
+            Assert.Equal(buffer, resultData);
+        }
+
+        [FactWithAutomaticDisplayName]
+        public void TestLoadAnyBitmapFromRGBBuffer()
+        {
+            string imagePath = GetRelativeFilePath("checkmark.jpg");
+
+            using var bitmap = SixLabors.ImageSharp.Image.Load<Rgb24>(imagePath);
+            var width = bitmap.Width;
+            var height = bitmap.Height;
+
+            var buffer = GetRGBBuffer(imagePath);
+
+            AnyBitmap result = AnyBitmap.LoadAnyBitmapFromRGBBuffer(buffer, width, height);
+
+            for (int y = 0; y < height; y++)
+            {
+                for (int x = 0; x < width; x++)
+                {
+                    var expectedColor = bitmap[x, y];
+                    var actualColor = result.GetPixel(x, y);
+
+                    Assert.Equal(expectedColor.R, actualColor.R);
+                    Assert.Equal(expectedColor.G, actualColor.G);
+                    Assert.Equal(expectedColor.B, actualColor.B);
+                }
+            }
+        }
+
 #if !NETFRAMEWORK
         [FactWithAutomaticDisplayName]
         public void CastMaui_to_AnyBitmap()
@@ -683,5 +750,13 @@ public void CastMaui_from_AnyBitmap()
         }
 #endif
 
+        [FactWithAutomaticDisplayName]
+        public void Should_Read_Tiff_With_Zero_Width_or_Height()
+        {
+            string imagePath = GetRelativeFilePath("partial_valid.tif");
+            var anyBitmap = AnyBitmap.FromFile(imagePath);
+            anyBitmap.FrameCount.Should().BeGreaterThan(0);
+        }
+
     }
 }

IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs

@@ -1,4 +1,5 @@
-using System;
+using SixLabors.ImageSharp.PixelFormats;
+using System;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -156,5 +157,35 @@ protected static bool IsGrayScale(SkiaSharp.SKBitmap image)
 
             return res;
         }
+
+        protected byte[] GetRGBBuffer(string imagePath)
+        {
+            using var image = SixLabors.ImageSharp.Image.Load<Rgb24>(imagePath); // Load image from file
+
+            int width = image.Width;
+            int height = image.Height;
+
+            byte[] rgbBuffer = new byte[width * height * 3]; // 3 bytes per pixel (RGB)
+
+            image.ProcessPixelRows(accessor =>
+            {
+                for (int y = 0; y < accessor.Height; y++)
+                {
+                    Span<Rgb24> pixelRow = accessor.GetRowSpan(y);
+
+                    for (int x = 0; x < accessor.Width; x++)
+                    {
+                        ref Rgb24 pixel = ref pixelRow[x];
+
+                        int bufferIndex = (y * width + x) * 3;
+                        rgbBuffer[bufferIndex] = pixel.R;
+                        rgbBuffer[bufferIndex + 1] = pixel.G;
+                        rgbBuffer[bufferIndex + 2] = pixel.B;
+                    }
+                }
+            });
+
+            return rgbBuffer;
+        }
     }
 }