diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2018-03-30 04:02:31 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2018-03-30 04:02:31 -0700 |
commit | 605083a88c1a978ed9308c40a02ede8defaca1f6 (patch) | |
tree | d140137a5ce8839ccf15ec07740501c729d59e4c | |
parent | 2960f8cf778c749de273bb45e161c5caa41e178e (diff) | |
download | qtlocation-mapboxgl-605083a88c1a978ed9308c40a02ede8defaca1f6.tar.gz |
[ios, macos] Fixed color conversion on Sierraupstream/1ec5-mbgl-expression-json-foundation-11254
-rw-r--r-- | platform/macos/src/NSColor+MGLAdditions.mm | 17 |
1 files 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 |