diff options
| author | Julian Rex <julian.rex@mapbox.com> | 2019-04-13 01:05:37 -0400 |
|---|---|---|
| committer | Julian Rex <julian.rex@mapbox.com> | 2019-04-17 16:21:41 -0400 |
| commit | 7e1ca02bb7f901cfc03888d54793aee138a4ebdf (patch) | |
| tree | 1c226b6639d31af222c43695be11d99608047789 | |
| parent | 42c3387550c61a98c44aa96e59dc1402b6e065a4 (diff) | |
| download | qtlocation-mapboxgl-7e1ca02bb7f901cfc03888d54793aee138a4ebdf.tar.gz | |
[ios] iosapp analysis warnings
| -rw-r--r-- | platform/ios/app/MBXCustomLocationViewController.m | 1 | ||||
| -rw-r--r-- | platform/ios/app/MBXFrameTimeGraphView.m | 7 | ||||
| -rw-r--r-- | platform/ios/app/MBXOrnamentsViewController.m | 2 | ||||
| -rw-r--r-- | platform/ios/app/MBXViewController.m | 16 |
4 files changed, 17 insertions, 9 deletions
diff --git a/platform/ios/app/MBXCustomLocationViewController.m b/platform/ios/app/MBXCustomLocationViewController.m index 34887c5736..0473f8c2ef 100644 --- a/platform/ios/app/MBXCustomLocationViewController.m +++ b/platform/ios/app/MBXCustomLocationViewController.m @@ -168,6 +168,7 @@ } - (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; self.mapView.showsUserLocation = NO; } diff --git a/platform/ios/app/MBXFrameTimeGraphView.m b/platform/ios/app/MBXFrameTimeGraphView.m index f689768818..e881eb9f48 100644 --- a/platform/ios/app/MBXFrameTimeGraphView.m +++ b/platform/ios/app/MBXFrameTimeGraphView.m @@ -59,7 +59,12 @@ const CGFloat MBXFrameTimeBarWidth = 4.f; self.scrollLayer.frame = self.bounds; CGRect thresholdLineRect = CGRectMake(0, self.frame.size.height - [self renderDurationTargetMilliseconds], self.frame.size.width, 1); - self.thresholdLayer.path = CGPathCreateWithRect(thresholdLineRect, nil); + + { + CGPathRef path = CGPathCreateWithRect(thresholdLineRect, nil); + self.thresholdLayer.path = path; + CGPathRelease(path); + } } } diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m index 5c7aac7f88..861d5d7678 100644 --- a/platform/ios/app/MBXOrnamentsViewController.m +++ b/platform/ios/app/MBXOrnamentsViewController.m @@ -72,11 +72,13 @@ } - (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; [self.timer invalidate]; self.timer = nil; } - (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; self.timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(onTimerTick) diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 8d936d6a25..1bd2b2f5b3 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -155,13 +155,13 @@ CLLocationCoordinate2D randomWorldCoordinate() { {{ 12.966246, 77.586505 }, 19000 } // Bengaluru }; - NSInteger index = drand48() * (sizeof(landmasses)/sizeof(landmasses[0])); + NSInteger index = arc4random_uniform(sizeof(landmasses)/sizeof(landmasses[0])); CLLocationCoordinate2D coordinate = landmasses[index].coordinate; CLLocationDistance radius = landmasses[index].radius; // Now create a world coord - CLLocationDegrees heading = drand48()*360.0; - CLLocationDistance distance = drand48()*radius; + CLLocationDegrees heading = (CLLocationDegrees)arc4random_uniform(360); + CLLocationDistance distance = (CLLocationDistance)arc4random_uniform(radius); CLLocationCoordinate2D newLocation = coordinateCentered(coordinate, heading, distance); return newLocation; } @@ -1775,8 +1775,8 @@ CLLocationCoordinate2D randomWorldCoordinate() { NSMutableArray *annotations = [[NSMutableArray alloc] initWithCapacity:numAnnotations]; for (NSInteger i = 0; i<numAnnotations; i++) { - CLLocationDegrees heading = drand48()*360.0; - CLLocationDistance distance = drand48()*radius; + CLLocationDegrees heading = (CLLocationDegrees)arc4random_uniform(360); + CLLocationDistance distance = (CLLocationDistance)arc4random_uniform(radius); CLLocationCoordinate2D newLocation = coordinateCentered(coordinate, heading, distance); MBXDroppedPinAnnotation *annotation = [[MBXDroppedPinAnnotation alloc] init]; @@ -1814,12 +1814,12 @@ CLLocationCoordinate2D randomWorldCoordinate() { [self.mapView addAnnotation:annotation]; // Add annotations around that coord - [self addAnnotations:50 aroundCoordinate:annotation.coordinate radius:100000.0]; // 100km + [self addAnnotations:50 aroundCoordinate:annotation.coordinate radius:100000]; // 100km MGLMapCamera *camera = [MGLMapCamera cameraLookingAtCenterCoordinate:annotation.coordinate altitude:10000.0 - pitch:drand48()*60.0 - heading:drand48()*360]; + pitch:(CLLocationDegrees)arc4random_uniform(60) + heading:(CLLocationDegrees)arc4random_uniform(360)]; [self.mapView flyToCamera:camera withDuration:duration peakAltitude:2000000.0 |