DarthAffe/HPPH
1
0
Fork 0
mirror of https://github.com/DarthAffe/HPPH.git synced 2025-12-12 13:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong color format for System.Drawing bitmaps

Browse Source
This commit is contained in:
Darth Affe 2024-07-14 23:58:00 +02:00
parent 0c7770d42d
commit 2c401f0eb1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HPPH.System.Drawing/ImageExtension.cs
View File

@ -16,10 +16,10 @@ public static class ImageExtension
Bitmap bitmap = new(image.Width, image.Height, PixelFormat.Format24bppRgb); Bitmap bitmap = new(image.Width, image.Height, PixelFormat.Format24bppRgb);
BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.WriteOnly, bitmap.PixelFormat); BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.WriteOnly, bitmap.PixelFormat);
IImage<ColorRGB> convertedImage = image.ConvertTo<ColorRGB>(); IImage<ColorBGR> convertedImage = image.ConvertTo<ColorBGR>();
nint ptr = bmpData.Scan0; nint ptr = bmpData.Scan0;
foreach (ImageRow<ColorRGB> row in convertedImage.Rows) foreach (ImageRow<ColorBGR> row in convertedImage.Rows)
{ {
row.CopyTo(new Span<byte>((void*)ptr, bmpData.Stride)); row.CopyTo(new Span<byte>((void*)ptr, bmpData.Stride));
ptr += bmpData.Stride; ptr += bmpData.Stride;
@ -35,10 +35,10 @@ public static class ImageExtension
Bitmap bitmap = new(image.Width, image.Height, PixelFormat.Format32bppArgb); Bitmap bitmap = new(image.Width, image.Height, PixelFormat.Format32bppArgb);
BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.WriteOnly, bitmap.PixelFormat); BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.WriteOnly, bitmap.PixelFormat);
IImage<ColorRGBA> convertedImage = image.ConvertTo<ColorRGBA>(); IImage<ColorBGRA> convertedImage = image.ConvertTo<ColorBGRA>();
nint ptr = bmpData.Scan0; nint ptr = bmpData.Scan0;
foreach (ImageRow<ColorRGBA> row in convertedImage.Rows) foreach (ImageRow<ColorBGRA> row in convertedImage.Rows)
{ {
row.CopyTo(new Span<byte>((void*)ptr, bmpData.Stride)); row.CopyTo(new Span<byte>((void*)ptr, bmpData.Stride));
ptr += bmpData.Stride; ptr += bmpData.Stride;
@ -73,9 +73,9 @@ public static class ImageExtension
IImage image; IImage image;
if (data.PixelFormat.HasFlag(PixelFormat.Format24bppRgb)) if (data.PixelFormat.HasFlag(PixelFormat.Format24bppRgb))
image = Image<ColorRGB>.Create(buffer, data.Width, data.Height, data.Stride); image = Image<ColorBGR>.Create(buffer, data.Width, data.Height, data.Stride);
else if (data.PixelFormat.HasFlag(PixelFormat.Format32bppArgb)) else if (data.PixelFormat.HasFlag(PixelFormat.Format32bppArgb))
image = Image<ColorRGBA>.Create(buffer, data.Width, data.Height, data.Stride); image = Image<ColorBGRA>.Create(buffer, data.Width, data.Height, data.Stride);
else throw new NotSupportedException($"Unsupported pixel format '{bitmap.PixelFormat}'."); else throw new NotSupportedException($"Unsupported pixel format '{bitmap.PixelFormat}'.");
bitmap.UnlockBits(data); bitmap.UnlockBits(data);