From 43547f25a5b324b3c60b6f7f26b9c92722c32502 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Thu, 19 Jul 2018 14:30:53 -0400 Subject: [ios] Simplify and (internally) document MGLPointRounded() `UIScreen.nativeScale` is available beginning in iOS 8, so the conditional is no longer necessay. --- platform/darwin/src/MGLGeometry.mm | 2 +- platform/darwin/src/MGLGeometry_Private.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 mat); -- cgit v1.2.1