diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2015-08-17 12:22:41 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-08-17 12:22:41 -0700 |
commit | d3160ca4dbd561f45677d12598aafe2f1781ba72 (patch) | |
tree | 957b1b0e24c2cd241c0844c7786d72a81c7ed7c0 | |
parent | e1291fe094acfc93c4582ac6ae98703cc3dcb80c (diff) | |
download | qtlocation-mapboxgl-d3160ca4dbd561f45677d12598aafe2f1781ba72.tar.gz |
fixes #1907: skip MGLPolyline/MGLPolygons with zero points
-rw-r--r-- | platform/ios/MGLMapView.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index db18ea0128..53f60a9518 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -1828,6 +1828,10 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) if ([annotation isKindOfClass:[MGLMultiPoint class]]) { + NSUInteger count = [(MGLMultiPoint *)annotation pointCount]; + + if (count == 0) break; + CGFloat alpha = (delegateImplementsAlphaForShape ? [self.delegate mapView:self alphaForShapeAnnotation:annotation] : 1.0); @@ -1881,8 +1885,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) userInfo:nil] raise]; } - NSUInteger count = [(MGLMultiPoint *)annotation pointCount]; - CLLocationCoordinate2D *coordinates = (CLLocationCoordinate2D *)malloc(count * sizeof(CLLocationCoordinate2D)); [(MGLMultiPoint *)annotation getCoordinates:coordinates range:NSMakeRange(0, count)]; |