Compilation fixes

maplibre · Oct 2, 2022 · 99b4d08 · 99b4d08
1 parent b979fdb
commit 99b4d08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/platform/ios/platform/darwin/src/MGLReachability.m b/platform/ios/platform/darwin/src/MGLReachability.m
@@ -466,7 +466,7 @@ -(void)reachabilityChanged:(SCNetworkReachabilityFlags)flags
 - (NSString *) description
 {
     NSString *description = [NSString stringWithFormat:@"<%@: %p (%@)>",
-                             NSStringFromClass([self class]), (void *) self, [self currentReachabilityFlags]];
+                             NSStringFromClass([self class]), self, [self currentReachabilityFlags]];
     return description;
 }
 

diff --git a/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/ios/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1291,7 +1291,7 @@ - (id)mgl_jsonExpressionObject {
                 }
 
                 return self.arguments.mgl_jsonExpressionObject;
-            } else if (op == (NSString *) [MGLColor class] && [function isEqualToString:@"colorWithRed:green:blue:alpha:"]) {
+            } else if ([function isEqualToString:@"colorWithRed:green:blue:alpha:"]) {
                 NSArray *arguments = self.arguments.mgl_jsonExpressionObject;
                 return [@[@"rgba"] arrayByAddingObjectsFromArray:arguments];
             } else if ([function isEqualToString:@"median:"] ||

diff --git a/platform/ios/platform/ios/src/MGLMapView.mm b/platform/ios/platform/ios/src/MGLMapView.mm
@@ -1381,21 +1381,7 @@ - (void)updateDisplayLinkPreferredFramesPerSecond
         newFrameRate = _preferredFramesPerSecond;
     }
 
-    if (@available(iOS 10.0, *))
-    {
-        _displayLink.preferredFramesPerSecond = newFrameRate;
-    }
-    else
-    {
-        // CADisplayLink.frameInterval does not support more than 60 FPS (and
-        // no device that supports >60 FPS ever supported iOS 9).
-        NSInteger maximumFrameRate = 60;
-
-        // `0` is an alias for maximum frame rate.
-        newFrameRate = newFrameRate ?: maximumFrameRate;
-
-        _displayLink.preferredFramesPerSecond = maximumFrameRate / MIN(newFrameRate, maximumFrameRate);
-    }
+    _displayLink.preferredFramesPerSecond = newFrameRate;
 }
 
 - (void)setPreferredFramesPerSecond:(MGLMapViewPreferredFramesPerSecond)preferredFramesPerSecond