diff mbox series

ui/cocoa: Use kCGColorSpaceSRGB

Message ID 20210219084518.90246-1-akihiko.odaki@gmail.com (mailing list archive)
State New, archived
Headers show
Series ui/cocoa: Use kCGColorSpaceSRGB | expand

Commit Message

Akihiko Odaki Feb. 19, 2021, 8:45 a.m. UTC
kCGColorSpaceGenericRGB | Apple Developer Documentation
https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> Deprecated
> Use kCGColorSpaceSRGB instead.

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
 ui/cocoa.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Maydell Feb. 19, 2021, 10:25 a.m. UTC | #1
On Fri, 19 Feb 2021 at 08:45, Akihiko Odaki <akihiko.odaki@gmail.com> wrote:
>
> kCGColorSpaceGenericRGB | Apple Developer Documentation
> https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> > Deprecated
> > Use kCGColorSpaceSRGB instead.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
> ---
>  ui/cocoa.m | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 13fba8103e1..686fbb1b457 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -437,7 +437,7 @@ - (void) drawRect:(NSRect) rect
>              screen.bitsPerPixel, //bitsPerPixel
>              (screen.width * (screen.bitsPerComponent/2)), //bytesPerRow
>  #ifdef __LITTLE_ENDIAN__
> -            CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB), //colorspace for OS X >= 10.4
> +            CGColorSpaceCreateWithName(kCGColorSpaceSRGB), //colorspace for OS X >= 10.5
>              kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,
>  #else
>              CGColorSpaceCreateDeviceRGB(), //colorspace for OS X < 10.4 (actually ppc)
> --

The comment change here looks a little odd, because previously
it was a matched pair with the one in the other half of the #ifdef:
one side is "for OS X >= 10.4" and the other "for < 10.4". After
this change we have a mismatch. In fact it doesn't matter because
we don't support any OSX version that old any more anyway.

I think we should delete the whole #ifdef...#else...#endif block
here, and replace it with just the
              CGColorSpaceCreateWithName(kCGColorSpaceSRGB),
              kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,

lines, because we dropped PPC support a long long time ago.
(And we don't need any comment about OSX version if we do that.)

thanks
-- PMM
diff mbox series

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 13fba8103e1..686fbb1b457 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -437,7 +437,7 @@  - (void) drawRect:(NSRect) rect
             screen.bitsPerPixel, //bitsPerPixel
             (screen.width * (screen.bitsPerComponent/2)), //bytesPerRow
 #ifdef __LITTLE_ENDIAN__
-            CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB), //colorspace for OS X >= 10.4
+            CGColorSpaceCreateWithName(kCGColorSpaceSRGB), //colorspace for OS X >= 10.5
             kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,
 #else
             CGColorSpaceCreateDeviceRGB(), //colorspace for OS X < 10.4 (actually ppc)