diff options
Diffstat (limited to 'src/mbgl/geometry/text_buffer.cpp')
| -rw-r--r-- | src/mbgl/geometry/text_buffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/geometry/text_buffer.cpp b/src/mbgl/geometry/text_buffer.cpp index e3f7117eb0..8f312c9faf 100644 --- a/src/mbgl/geometry/text_buffer.cpp +++ b/src/mbgl/geometry/text_buffer.cpp @@ -13,8 +13,8 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t int16_t *shorts = static_cast<int16_t *>(data); shorts[0] /* pos */ = x; shorts[1] /* pos */ = y; - shorts[2] /* offset */ = std::round(ox * 64); // use 1/64 pixels for placement - shorts[3] /* offset */ = std::round(oy * 64); + shorts[2] /* offset */ = ::round(ox * 64); // use 1/64 pixels for placement + shorts[3] /* offset */ = ::round(oy * 64); uint8_t *ubytes = static_cast<uint8_t *>(data); // a_data1 @@ -24,7 +24,7 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t // a_data2 ubytes[12] /* minzoom */ = minzoom * 10; // 1/10 zoom levels: z16 == 160. - ubytes[13] /* maxzoom */ = std::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160. + ubytes[13] /* maxzoom */ = ::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160. return idx; } |