[PATCH] ui/cocoa: Use kCGColorSpaceSRGB

[PATCH] ui/cocoa: Use kCGColorSpaceSRGB

[Akihiko Odaki]

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)
-- 
2.24.3 (Apple Git-128)

Re: [PATCH] ui/cocoa: Use kCGColorSpaceSRGB

[Peter Maydell]

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

[PATCH v2] ui/cocoa: Use kCGColorSpaceSRGB

[Akihiko Odaki]

kCGColorSpaceGenericRGB | Apple Developer Documentation
https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> Deprecated
> Use kCGColorSpaceSRGB instead.

This change also removes the legacy color space specification for
PowerPC.

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

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 13fba8103e1..7710835c4c1 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -436,13 +436,8 @@ - (void) drawRect:(NSRect) rect
             screen.bitsPerComponent, //bitsPerComponent
             screen.bitsPerPixel, //bitsPerPixel
             (screen.width * (screen.bitsPerComponent/2)), //bytesPerRow
-#ifdef __LITTLE_ENDIAN__
-            CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB), //colorspace for OS X >= 10.4
-            kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,
-#else
-            CGColorSpaceCreateDeviceRGB(), //colorspace for OS X < 10.4 (actually ppc)
-            kCGImageAlphaNoneSkipFirst, //bitmapInfo
-#endif
+            CGColorSpaceCreateWithName(kCGColorSpaceSRGB), //colorspace
+            kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst, //bitmapInfo
             dataProviderRef, //provider
             NULL, //decode
             0, //interpolate
-- 
2.24.3 (Apple Git-128)

Re: [PATCH v2] ui/cocoa: Use kCGColorSpaceSRGB

[Peter Maydell]

On Fri, 19 Feb 2021 at 11:28, Akihiko Odaki <akihiko.odaki@gmail.com> wrote:
>
> kCGColorSpaceGenericRGB | Apple Developer Documentation
> https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> > Deprecated
> > Use kCGColorSpaceSRGB instead.
>
> This change also removes the legacy color space specification for
> PowerPC.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH v2] ui/cocoa: Use kCGColorSpaceSRGB

[Gerd Hoffmann]

On Fri, Feb 19, 2021 at 08:28:41PM +0900, Akihiko Odaki wrote:
> kCGColorSpaceGenericRGB | Apple Developer Documentation
> https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> > Deprecated
> > Use kCGColorSpaceSRGB instead.
> 
> This change also removes the legacy color space specification for
> PowerPC.
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>

Doesn't apply cleanly against git master branch, please rebase & resend.

take care,
  Gerd

[PATCH v3] ui/cocoa: Use kCGColorSpaceSRGB

[Akihiko Odaki]

kCGColorSpaceGenericRGB | Apple Developer Documentation
https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> Deprecated
> Use kCGColorSpaceSRGB instead.

This change also removes the legacy color space specification for
PowerPC.

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

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 13fba8103e1..7710835c4c1 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -436,13 +436,8 @@ - (void) drawRect:(NSRect) rect
             screen.bitsPerComponent, //bitsPerComponent
             screen.bitsPerPixel, //bitsPerPixel
             (screen.width * (screen.bitsPerComponent/2)), //bytesPerRow
-#ifdef __LITTLE_ENDIAN__
-            CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB), //colorspace for OS X >= 10.4
-            kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst,
-#else
-            CGColorSpaceCreateDeviceRGB(), //colorspace for OS X < 10.4 (actually ppc)
-            kCGImageAlphaNoneSkipFirst, //bitmapInfo
-#endif
+            CGColorSpaceCreateWithName(kCGColorSpaceSRGB), //colorspace
+            kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst, //bitmapInfo
             dataProviderRef, //provider
             NULL, //decode
             0, //interpolate
-- 
2.24.3 (Apple Git-128)

Re: [PATCH v3] ui/cocoa: Use kCGColorSpaceSRGB

[Gerd Hoffmann]

On Sat, Feb 20, 2021 at 01:29:29PM +0900, Akihiko Odaki wrote:
> kCGColorSpaceGenericRGB | Apple Developer Documentation
> https://developer.apple.com/documentation/coregraphics/kcgcolorspacegenericrgb
> > Deprecated
> > Use kCGColorSpaceSRGB instead.
> 
> This change also removes the legacy color space specification for
> PowerPC.

Still doesn't apply, looks like a conflict with one of your other
(meanwhile merger) patches.  Those kind of changes are best submitted
as patch series.

take care,
  Gerd