diff options
| -rw-r--r-- | include/mbgl/util/token.hpp | 2 | ||||
| -rw-r--r-- | src/renderer/painter_symbol.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/mbgl/util/token.hpp b/include/mbgl/util/token.hpp index a794e0489c..786654133a 100644 --- a/include/mbgl/util/token.hpp +++ b/include/mbgl/util/token.hpp @@ -15,7 +15,7 @@ namespace mbgl { namespace util { namespace detail { -const regex_impl::regex tokenRegex("\\{(\\w+)\\}"); +const regex_impl::regex tokenRegex("\\{([\\w-]+)\\}"); const regex_impl::sregex_token_iterator tokensEnd = regex_impl::sregex_token_iterator(); } diff --git a/src/renderer/painter_symbol.cpp b/src/renderer/painter_symbol.cpp index 2b7eef323f..a2238a3544 100644 --- a/src/renderer/painter_symbol.cpp +++ b/src/renderer/painter_symbol.cpp @@ -81,8 +81,8 @@ void Painter::renderSymbol(SymbolBucket &bucket, std::shared_ptr<StyleLayer> lay float fadedist = zoomDiff / (timeDiff / duration); #if defined(DEBUG) - if (std::isnan(fadedist)) - fprintf(stderr, "fadedist should never be NaN\n"); +// if (std::isnan(fadedist)) +// fprintf(stderr, "fadedist should never be NaN\n"); #endif // At end of a zoom when the zoom stops changing continue pretending to zoom at that speed |