diff --git a/HPPH.System.Drawing/HPPH.System.Drawing.csproj b/HPPH.System.Drawing/HPPH.System.Drawing.csproj new file mode 100644 index 0000000..8502cac --- /dev/null +++ b/HPPH.System.Drawing/HPPH.System.Drawing.csproj @@ -0,0 +1,18 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + diff --git a/HPPH.System.Drawing/ImageExtension.cs b/HPPH.System.Drawing/ImageExtension.cs new file mode 100644 index 0000000..c98f412 --- /dev/null +++ b/HPPH.System.Drawing/ImageExtension.cs @@ -0,0 +1,32 @@ +using System.Drawing; +using System.Drawing.Imaging; +using System.Runtime.Versioning; + +namespace HPPH.System.Drawing; + +public static class ImageExtension +{ + public static Bitmap ToBitmap(this IImage image) + { + throw new NotImplementedException(); + } + + [SupportedOSPlatform("windows")] + public static unsafe IImage ToImage(this Bitmap bitmap) + { + BitmapData data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, bitmap.PixelFormat); + ReadOnlySpan buffer = new(data.Scan0.ToPointer(), data.Stride * data.Height); + + IImage image; + + if (data.PixelFormat.HasFlag(PixelFormat.Format24bppRgb)) + image = Image.Create(buffer, data.Width, data.Height, data.Stride); + else if (data.PixelFormat.HasFlag(PixelFormat.Format32bppArgb)) + image = Image.Create(buffer, data.Width, data.Height, data.Stride); + else throw new NotSupportedException($"Unsupported pixel format '{bitmap.PixelFormat}'."); + + bitmap.UnlockBits(data); + + return image; + } +} \ No newline at end of file diff --git a/HPPH.System.Drawing/ImageHelper.cs b/HPPH.System.Drawing/ImageHelper.cs new file mode 100644 index 0000000..b29bfc4 --- /dev/null +++ b/HPPH.System.Drawing/ImageHelper.cs @@ -0,0 +1,21 @@ +using System.Drawing; +using System.Runtime.Versioning; + +namespace HPPH.System.Drawing; + +public static class ImageHelper +{ + [SupportedOSPlatform("windows")] + public static IImage LoadImage(string path) + { + using Bitmap bmp = new(path); + return bmp.ToImage(); + } + + [SupportedOSPlatform("windows")] + public static IImage LoadImage(Stream stream) + { + using Bitmap bmp = new(stream); + return bmp.ToImage(); + } +} \ No newline at end of file diff --git a/HPPH.sln b/HPPH.sln index 67c72eb..88cae5d 100644 --- a/HPPH.sln +++ b/HPPH.sln @@ -11,7 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HPPH.Benchmark", "HPPH.Benc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HPPH.Reference", "HPPH.Reference\HPPH.Reference.csproj", "{1675FE68-1F51-4202-9567-BB46215B2BBD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HPPH.Generators", "HPPH.Generators\HPPH.Generators.csproj", "{C247512B-E6D2-4591-8AFA-F2268F1AEAB2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HPPH.Generators", "HPPH.Generators\HPPH.Generators.csproj", "{C247512B-E6D2-4591-8AFA-F2268F1AEAB2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HPPH.System.Drawing", "HPPH.System.Drawing\HPPH.System.Drawing.csproj", "{16EC37E4-3EF1-47AF-B257-465334B36571}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {C247512B-E6D2-4591-8AFA-F2268F1AEAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {C247512B-E6D2-4591-8AFA-F2268F1AEAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {C247512B-E6D2-4591-8AFA-F2268F1AEAB2}.Release|Any CPU.Build.0 = Release|Any CPU + {16EC37E4-3EF1-47AF-B257-465334B36571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16EC37E4-3EF1-47AF-B257-465334B36571}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16EC37E4-3EF1-47AF-B257-465334B36571}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16EC37E4-3EF1-47AF-B257-465334B36571}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE