diff options
author | Jason Wray <jason@mapbox.com> | 2018-07-19 14:30:53 -0400 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2018-07-24 18:14:32 -0400 |
commit | 14dc94e65fc5e549b5bdc8a9138d5d3512b469be (patch) | |
tree | 1adbad240c92731509cb2b5601cebff81e33b579 /platform/darwin | |
parent | 08b08878d3619077438fb2728cf616fb63d414c3 (diff) | |
download | qtlocation-mapboxgl-14dc94e65fc5e549b5bdc8a9138d5d3512b469be.tar.gz |
[ios] Simplify and (internally) document MGLPointRounded()
`UIScreen.nativeScale` is available beginning in iOS 8, so the conditional is no longer necessary.
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/src/MGLGeometry.mm | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLGeometry_Private.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLGeometry.mm b/platform/darwin/src/MGLGeometry.mm index 44d1c0749b..c6fb5a5fc2 100644 --- a/platform/darwin/src/MGLGeometry.mm +++ b/platform/darwin/src/MGLGeometry.mm @@ -98,7 +98,7 @@ CLLocationDirection MGLDirectionBetweenCoordinates(CLLocationCoordinate2D firstC CGPoint MGLPointRounded(CGPoint point) { #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR - CGFloat scaleFactor = [UIScreen instancesRespondToSelector:@selector(nativeScale)] ? [UIScreen mainScreen].nativeScale : [UIScreen mainScreen].scale; + CGFloat scaleFactor = [UIScreen mainScreen].nativeScale; #elif TARGET_OS_MAC CGFloat scaleFactor = [NSScreen mainScreen].backingScaleFactor; #endif diff --git a/platform/darwin/src/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h index e48ed19d78..4ea3dfe6e3 100644 --- a/platform/darwin/src/MGLGeometry_Private.h +++ b/platform/darwin/src/MGLGeometry_Private.h @@ -138,6 +138,9 @@ MGLRadianCoordinate2D MGLRadianCoordinateAtDistanceFacingDirection(MGLRadianCoor */ CLLocationDirection MGLDirectionBetweenCoordinates(CLLocationCoordinate2D firstCoordinate, CLLocationCoordinate2D secondCoordinate); +/** + Returns a point with coordinates rounded to the nearest logical pixel. + */ CGPoint MGLPointRounded(CGPoint point); MGLMatrix4 MGLMatrix4Make(std::array<double, 16> mat); |