diff options
-rw-r--r-- | common/headless_view.cpp | 2 | ||||
-rw-r--r-- | include/mbgl/text/collision.hpp | 1 | ||||
m--------- | ios/mapbox-gl-cocoa | 0 | ||||
-rw-r--r-- | src/map/map.cpp | 5 | ||||
-rw-r--r-- | src/style/style_parser.cpp | 1 | ||||
-rw-r--r-- | src/text/glyph_store.cpp | 2 | ||||
-rw-r--r-- | src/util/filesource.cpp | 2 | ||||
-rw-r--r-- | test/style_parser.cpp | 2 |
8 files changed, 6 insertions, 9 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp index 6a7d75d754..3fb090f2b5 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -153,7 +153,7 @@ HeadlessView::~HeadlessView() { #endif } -void HeadlessView::notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) { +void HeadlessView::notify_map_change(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) { // no-op } diff --git a/include/mbgl/text/collision.hpp b/include/mbgl/text/collision.hpp index e2e2414ba7..7e65e979da 100644 --- a/include/mbgl/text/collision.hpp +++ b/include/mbgl/text/collision.hpp @@ -5,6 +5,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wdeprecated-register" #ifndef __clang__ #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa -Subproject b237437ef04b59d5bde59f7e06d3ec4a6481b19 +Subproject 3289cb9bd7528279d01ea81a2342205210c6832 diff --git a/src/map/map.cpp b/src/map/map.cpp index dfac1ae6c7..6aa9071a4f 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -532,13 +532,8 @@ void Map::prepare() { transform.updateTransitions(animationTime); } - const TransformState oldState = state; state = transform.currentState(); - bool pixelRatioChanged = oldState.getPixelRatio() != state.getPixelRatio(); - bool dimensionsChanged = oldState.getFramebufferWidth() != state.getFramebufferWidth() || - oldState.getFramebufferHeight() != state.getFramebufferHeight(); - animationTime = util::now(); updateSources(); style->updateProperties(state.getNormalizedZoom(), animationTime); diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index 0c0636695e..c2689162e2 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -465,6 +465,7 @@ std::unique_ptr<StyleLayerGroup> StyleParser::createLayers(JSVal value) { return group; } else { Log::Warning(Event::ParseStyle, "layers must be an array"); + return nullptr; } } diff --git a/src/text/glyph_store.cpp b/src/text/glyph_store.cpp index c32e1642e5..09f2fbc7b3 100644 --- a/src/text/glyph_store.cpp +++ b/src/text/glyph_store.cpp @@ -132,7 +132,7 @@ void FontStack::lineWrap(Shaping &shaping, const float lineHeight, const float m maxLineLength = maxLineLength || shaping.back().x; - justifyLine(shaping, metrics, lineStartIndex, shaping.size() - 1, justify); + justifyLine(shaping, metrics, lineStartIndex, uint32_t(shaping.size()) - 1, justify); align(shaping, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, line); } diff --git a/src/util/filesource.cpp b/src/util/filesource.cpp index 2bbf146b0c..503d4dfb1d 100644 --- a/src/util/filesource.cpp +++ b/src/util/filesource.cpp @@ -17,7 +17,7 @@ const std::string &FileSource::getBase() const { return base; } -void FileSource::load(ResourceType type, const std::string &url, std::function<void(platform::Response *)> callback, const std::shared_ptr<uv::loop> loop) { +void FileSource::load(ResourceType /*type*/, const std::string &url, std::function<void(platform::Response *)> callback, const std::shared_ptr<uv::loop> loop) { // convert relative URLs to absolute URLs const std::string absoluteURL = [&]() -> std::string { diff --git a/test/style_parser.cpp b/test/style_parser.cpp index 53113ad53e..d530fe1f8b 100644 --- a/test/style_parser.cpp +++ b/test/style_parser.cpp @@ -75,7 +75,7 @@ TEST_P(StyleParserTest, ParseStyle) { std::cerr << "Unchecked Log Messages (" << base << "/" << name << "): " << std::endl << unchecked; } - ASSERT_EQ(0, unchecked.size()); + ASSERT_EQ(0ul, unchecked.size()); } } |