summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauren Budorick <lauren@mapbox.com>2014-10-27 16:47:08 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2014-11-04 12:26:14 -0800
commitf25cf706891edd2db63b0ea34918cc87bb631c20 (patch)
tree64f31ebeeb1e54125eba29171fe830fb987dff31
parentdc834aec914cc0afaf31dffd0064d54dee05b751 (diff)
downloadqtlocation-mapboxgl-f25cf706891edd2db63b0ea34918cc87bb631c20.tar.gz
Reinstate 16px line width limit
-rw-r--r--src/renderer/painter_line.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/renderer/painter_line.cpp b/src/renderer/painter_line.cpp
index d2094f0836..4bf50569ac 100644
--- a/src/renderer/painter_line.cpp
+++ b/src/renderer/painter_line.cpp
@@ -20,8 +20,8 @@ void Painter::renderLine(LineBucket& bucket, util::ptr<StyleLayer> layer_desc, c
float offset = properties.gap_width == 0 ? 0 : (properties.gap_width + width) / 2;
float blur = properties.blur + antialiasing;
- float inset = std::fmax(-1, offset - width / 2 - antialiasing / 2) + 1;
- float outset = offset + width / 2 + antialiasing / 2;
+ float inset = std::fmin((std::fmax(-1, offset - width / 2 - antialiasing / 2) + 1), 16.0f);
+ float outset = std::fmin(offset + width / 2 + antialiasing / 2, 16.0f);
Color color = properties.color;
color[0] *= properties.opacity;