Skip to content

Mac: use sRGB with Bitmap.GetPixel and Lock() #2877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwensley merged 1 commit into from
Dec 10, 2025
+6 −11
Merged

Mac: use sRGB with Bitmap.GetPixel and Lock() #2877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/Eto.Mac/Drawing/BitmapHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,8 @@ public Color GetPixel(int x, int y)
if (bmprep == null)
throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Cannot get pixel data for this type of bitmap ({0})", rep?.GetType()));

// don't convert colorspace here otherwise we get incorrect data.. why?
var nscolor = bmprep.ColorAt(x, y);
if (nscolor.ComponentCount >= 3)
{
nscolor.GetRgba(out var red, out var green, out var blue, out var alpha);
return new Color(nscolor, (float)red, (float)green, (float)blue, (float)alpha);
}

// always convert to sRGB
return nscolor.ToEto();
}

Expand Down Expand Up @@ -334,7 +328,7 @@ protected void EnsureRep()
{
bmprep = rep as NSBitmapImageRep ?? GetBestRepresentation() as NSBitmapImageRep;
}

if (bmprep != null)
return;

Expand All @@ -358,9 +352,10 @@ protected void EnsureRep()
int bitsPerPixel = numComponents * bitsPerComponent;
int bytesPerPixel = bitsPerPixel / 8;
int bytesPerRow = bytesPerPixel * size.Width;
#pragma warning disable CA1422 // Validate platform compatibility - no alternative right now.
bmprep = new NSBitmapImageRep(IntPtr.Zero, size.Width, size.Height, bitsPerComponent, numComponents, rep.HasAlpha, false, rep.ColorSpaceName, bytesPerRow, bitsPerPixel);
#pragma warning restore CA1422 // Validate platform compatibility
CGBitmapFlags flags = rep.HasAlpha ? CGBitmapFlags.PremultipliedLast : CGBitmapFlags.NoneSkipLast;
var cgimage = new CGBitmapContext(IntPtr.Zero, size.Width, size.Height, bitsPerComponent, bytesPerRow, CGColorSpace.CreateSrgb(), flags).ToImage();
bmprep = new NSBitmapImageRep(cgimage);

var graphicsContext = NSGraphicsContext.FromBitmap(bmprep);
NSGraphicsContext.GlobalSaveGraphicsState();
NSGraphicsContext.CurrentContext = graphicsContext;
Expand Down
Loading