From 4cd95a97c65074207e8ede9667484f9390167245 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <brammanis@gmail.com>
Date: Thu, 28 May 2015 17:14:46 -0400
Subject: [PATCH] fix clipping lines for labeling

---
 src/mbgl/util/clip_lines.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mbgl/util/clip_lines.cpp b/src/mbgl/util/clip_lines.cpp
index 47f04618a..407db01fe 100644
--- a/src/mbgl/util/clip_lines.cpp
+++ b/src/mbgl/util/clip_lines.cpp
@@ -21,33 +21,33 @@ std::vector<std::vector<Coordinate>> clipLines(const std::vector<std::vector<Coo
             if (p0.x < x1 && p1.x < x1) {
                 continue;
             } else if (p0.x < x1) {
-                p0 = { x1, static_cast<int16_t>(p0.y + static_cast<float>(p1.y - p0.y) * ((x1 - p0.x) / (p1.x - p0.x))) };
+                p0 = { x1, static_cast<int16_t>(p0.y + (p1.y - p0.y) * ((float)(x1 - p0.x) / (p1.x - p0.x))) };
             } else if (p1.x < x1) {
-                p1 = { x1, static_cast<int16_t>(p0.y + static_cast<float>(p1.y - p0.y) * ((x1 - p0.x) / (p1.x - p0.x))) };
+                p1 = { x1, static_cast<int16_t>(p0.y + (p1.y - p0.y) * ((float)(x1 - p0.x) / (p1.x - p0.x))) };
             }
 
             if (p0.y < y1 && p1.y < y1) {
                 continue;
             } else if (p0.y < y1) {
-                p0 = { static_cast<int16_t>(p0.x + static_cast<float>(p1.x - p0.x) * ((y1 - p0.y) / (p1.y - p0.y))), y1 };
+                p0 = { static_cast<int16_t>(p0.x + (p1.x - p0.x) * ((float)(y1 - p0.y) / (p1.y - p0.y))), y1 };
             } else if (p1.y < y1) {
-                p1 = { static_cast<int16_t>(p0.x + static_cast<float>(p1.x - p0.x) * ((y1 - p0.y) / (p1.y - p0.y))), y1 };
+                p1 = { static_cast<int16_t>(p0.x + (p1.x - p0.x) * ((float)(y1 - p0.y) / (p1.y - p0.y))), y1 };
             }
 
             if (p0.x >= x2 && p1.x >= x2) {
                 continue;
             } else if (p0.x >= x2) {
-                p0 = { x2, static_cast<int16_t>(p0.y + static_cast<float>(p1.y - p0.y) * ((x2 - p0.x) / (p1.x - p0.x))) };
+                p0 = { x2, static_cast<int16_t>(p0.y + (p1.y - p0.y) * ((float)(x2 - p0.x) / (p1.x - p0.x))) };
             } else if (p1.x >= x2) {
-                p1 = { x2, static_cast<int16_t>(p0.y + static_cast<float>(p1.y - p0.y) * ((x2 - p0.x) / (p1.x - p0.x))) };
+                p1 = { x2, static_cast<int16_t>(p0.y + (p1.y - p0.y) * ((float)(x2 - p0.x) / (p1.x - p0.x))) };
             }
 
             if (p0.y >= y2 && p1.y >= y2) {
                 continue;
             } else if (p0.y >= y2) {
-                p0 = { static_cast<int16_t>(p0.x + static_cast<float>(p1.x - p0.x) * ((y2 - p0.y) / (p1.y - p0.y))), y2 };
+                p0 = { static_cast<int16_t>(p0.x + (p1.x - p0.x) * ((float)(y2 - p0.y) / (p1.y - p0.y))), y2 };
             } else if (p1.y >= y2) {
-                p1 = { static_cast<int16_t>(p0.x + static_cast<float>(p1.x - p0.x) * ((y2 - p0.y) / (p1.y - p0.y))), y2 };
+                p1 = { static_cast<int16_t>(p0.x + (p1.x - p0.x) * ((float)(y2 - p0.y) / (p1.y - p0.y))), y2 };
             }
 
             if (!clippedLines.size() || (clippedLines.back().size() && !(p0 == clippedLines.back().back()))) {