diff options
| author | jmkiley <jordan.kiley@mapbox.com> | 2017-04-14 11:42:20 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2017-04-14 11:42:20 -0700 |
| commit | 21fffa6a13be5592d4194f3711e7ebc323fd75e7 (patch) | |
| tree | f748ad23d704ebdd30ec98914f46bf47dcfcd540 | |
| parent | 58ac4e92b36aca1e46ccaa6b1eb8c0aaf9b1bc87 (diff) | |
| download | qtlocation-mapboxgl-21fffa6a13be5592d4194f3711e7ebc323fd75e7.tar.gz | |
[ios] changed check
| -rw-r--r-- | platform/ios/src/UIColor+MGLAdditions.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/src/UIColor+MGLAdditions.mm index 54698fae2a..33c690ae1a 100644 --- a/platform/ios/src/UIColor+MGLAdditions.mm +++ b/platform/ios/src/UIColor+MGLAdditions.mm @@ -7,6 +7,7 @@ CGFloat r, g, b, a; [self getRed:&r green:&g blue:&b alpha:&a]; + return { (float)[self cap_rgba:r], (float)[self cap_rgba:g], (float)[self cap_rgba:b], (float)[self cap_rgba:a] }; } @@ -18,7 +19,7 @@ - (CGFloat)cap_rgba:(CGFloat)num { - return (num > 1.0) ? 1.0 : (num < 0.0) ? 0.0 : num; + return MAX(MIN(num, 1), 0); } + (UIColor *)mgl_colorWithColor:(mbgl::Color)color |