From 605083a88c1a978ed9308c40a02ede8defaca1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Fri, 30 Mar 2018 04:02:31 -0700 Subject: [ios, macos] Fixed color conversion on Sierra --- platform/macos/src/NSColor+MGLAdditions.mm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/platform/macos/src/NSColor+MGLAdditions.mm b/platform/macos/src/NSColor+MGLAdditions.mm index 6244ee396f..8c9086ccf7 100644 --- a/platform/macos/src/NSColor+MGLAdditions.mm +++ b/platform/macos/src/NSColor+MGLAdditions.mm @@ -82,15 +82,18 @@ // Alpha components.back() *= 255.0; - // The Mapbox Style Specification does not specify a color space, but it is - // assumed to be sRGB for consistency with CSS. - NSColor *color = [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] - components:&components[0] - count:components.size()]; + // macOS 10.12 Sierra and below uses calibrated RGB by default. if ([NSColor redColor].colorSpaceName == NSCalibratedRGBColorSpace) { - color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + return [NSColor colorWithCalibratedRed:components[0] + green:components[1] + blue:components[2] + alpha:components[3]]; } - return color; + // The Mapbox Style Specification does not specify a color space, but it is + // assumed to be sRGB for consistency with CSS. + return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] + components:&components[0] + count:components.size()]; } @end -- cgit v1.2.1