diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index a83fcdb93..70f345dd9 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -646,7 +646,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; // constrain to +/-30 degrees when merely rotating like Apple does // - if ( ! self.isRotationAllowed && fabsf(self.pinch.scale) < 10) + if ( ! self.isRotationAllowed && std::abs(self.pinch.scale) < 10) { newDegrees = fminf(newDegrees, 30); newDegrees = fmaxf(newDegrees, -30); diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 087f2a33c..c2833e5c9 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -43,7 +43,6 @@ TileParser::TileParser(const std::string &data, VectorTileData &tile_, spriteAtlas(spriteAtlas_), sprite(sprite_), collision(util::make_unique(tile.id.z, 4096, tile.source.tile_size, tile.depth)) { - assert(&tile != nullptr); assert(style); assert(sprite); assert(collision);