[v3] ui/cocoa: Use kCGColorSpaceSRGB

Commit Message

Akihiko Odaki Feb. 20, 2021, 4:29 a.m. UTC

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 <[e-mail]>
---
 ui/cocoa.m | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Gerd Hoffmann Feb. 22, 2021, 10:36 a.m. UTC | #1

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

Patch

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