diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-28 16:41:39 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-28 16:41:39 +0200 |
| commit | fdfa292676f3c7419b98a524f3a99b16b36099f9 (patch) | |
| tree | b6fcf129361e6c1bf25b28ffe7d305d5de61d951 /src/mbgl/text | |
| parent | b44302af2aac3aa8ad7ee13be7c44fd1334cc81c (diff) | |
| download | qtlocation-mapboxgl-fdfa292676f3c7419b98a524f3a99b16b36099f9.tar.gz | |
Bump Mapbox GL Native
mapbox-gl-native @ 5da5ba7706eb28b359b5d781bd2c769e336ca5ca
Diffstat (limited to 'src/mbgl/text')
| -rw-r--r-- | src/mbgl/text/placement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index 9284e213c2..e363d7bc03 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -15,7 +15,7 @@ OpacityState::OpacityState(bool placed_, bool offscreen) } OpacityState::OpacityState(const OpacityState& prevState, float increment, bool placed_) : - opacity(std::fmax(0, std::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))), + opacity(::fmax(0, ::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))), placed(placed_) {} bool OpacityState::isHidden() const { |