From b470a655825ae3b805734aae3e1d49b9014a7be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 28 Sep 2016 12:52:41 +0200 Subject: [build] add back -Werror --- src/mbgl/geometry/buffer.hpp | 14 +++++++------- src/mbgl/geometry/collision_box_buffer.cpp | 4 ++-- src/mbgl/geometry/collision_box_buffer.hpp | 2 +- src/mbgl/geometry/elements_buffer.hpp | 8 ++++---- src/mbgl/geometry/icon_buffer.cpp | 4 ++-- src/mbgl/geometry/icon_buffer.hpp | 2 +- src/mbgl/geometry/line_buffer.cpp | 4 ++-- src/mbgl/geometry/line_buffer.hpp | 2 +- src/mbgl/geometry/text_buffer.cpp | 4 ++-- src/mbgl/geometry/text_buffer.hpp | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/mbgl/geometry') diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp index 5e1591f098..2d010e39ac 100644 --- a/src/mbgl/geometry/buffer.hpp +++ b/src/mbgl/geometry/buffer.hpp @@ -12,9 +12,9 @@ namespace mbgl { -template class Buffer : private util::noncopyable { static_assert(target == gl::BufferType::Vertex || target == gl::BufferType::Element, @@ -27,8 +27,8 @@ public: // Returns the number of elements in this buffer. This is not the number of // bytes, but rather the number of coordinates with associated information. - size_t index() const { - return static_cast(pos / itemSize); + uint32_t index() const { + return pos / itemSize; } bool empty() const { @@ -96,17 +96,17 @@ protected: } public: - static const size_t itemSize = item_size; + static constexpr const uint32_t itemSize = item_size; private: // CPU buffer void* array = nullptr; // Byte position where we are writing. - size_t pos = 0; + uint32_t pos = 0; // Number of bytes that are valid in this buffer. - size_t length = 0; + uint32_t length = 0; // GL buffer object handle. mbgl::optional buffer; diff --git a/src/mbgl/geometry/collision_box_buffer.cpp b/src/mbgl/geometry/collision_box_buffer.cpp index 291c5234e6..ae58cf7bca 100644 --- a/src/mbgl/geometry/collision_box_buffer.cpp +++ b/src/mbgl/geometry/collision_box_buffer.cpp @@ -6,8 +6,8 @@ namespace mbgl { -size_t CollisionBoxVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, float maxzoom, float placementZoom) { - const size_t idx = index(); +uint32_t CollisionBoxVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, float maxzoom, float placementZoom) { + const uint32_t idx = index(); void *data = addElement(); int16_t *shorts = static_cast(data); diff --git a/src/mbgl/geometry/collision_box_buffer.hpp b/src/mbgl/geometry/collision_box_buffer.hpp index 3e4cdb99d2..5360ac3f4c 100644 --- a/src/mbgl/geometry/collision_box_buffer.hpp +++ b/src/mbgl/geometry/collision_box_buffer.hpp @@ -13,7 +13,7 @@ class CollisionBoxVertexBuffer : public Buffer < public: typedef int16_t vertex_type; - size_t add(int16_t x, int16_t y, float ex, float ey, float maxzoom, float placementZoom); + uint32_t add(int16_t x, int16_t y, float ex, float ey, float maxzoom, float placementZoom); }; diff --git a/src/mbgl/geometry/elements_buffer.hpp b/src/mbgl/geometry/elements_buffer.hpp index d955d4a8af..f995229c9d 100644 --- a/src/mbgl/geometry/elements_buffer.hpp +++ b/src/mbgl/geometry/elements_buffer.hpp @@ -9,13 +9,13 @@ namespace mbgl { -template +template struct ElementGroup : public util::noncopyable { std::array array; - size_t vertex_length; - size_t elements_length; + uint32_t vertex_length; + uint32_t elements_length; - ElementGroup(size_t vertex_length_ = 0, size_t elements_length_ = 0) + ElementGroup(uint32_t vertex_length_ = 0, uint32_t elements_length_ = 0) : vertex_length(vertex_length_) , elements_length(elements_length_) { diff --git a/src/mbgl/geometry/icon_buffer.cpp b/src/mbgl/geometry/icon_buffer.cpp index 2895ca5c3b..745003a548 100644 --- a/src/mbgl/geometry/icon_buffer.cpp +++ b/src/mbgl/geometry/icon_buffer.cpp @@ -6,8 +6,8 @@ namespace mbgl { -size_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle) { - const size_t idx = index(); +uint32_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle) { + const uint32_t idx = index(); void *data = addElement(); int16_t *shorts = static_cast(data); diff --git a/src/mbgl/geometry/icon_buffer.hpp b/src/mbgl/geometry/icon_buffer.hpp index 3a1d57ccd7..81e17df495 100644 --- a/src/mbgl/geometry/icon_buffer.hpp +++ b/src/mbgl/geometry/icon_buffer.hpp @@ -10,7 +10,7 @@ namespace mbgl { 16 > { public: - size_t add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle); + uint32_t add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle); }; diff --git a/src/mbgl/geometry/line_buffer.cpp b/src/mbgl/geometry/line_buffer.cpp index 523b767e25..0eabf8e1e9 100644 --- a/src/mbgl/geometry/line_buffer.cpp +++ b/src/mbgl/geometry/line_buffer.cpp @@ -4,8 +4,8 @@ namespace mbgl { -size_t LineVertexBuffer::add(vertex_type x, vertex_type y, float ex, float ey, bool tx, bool ty, int8_t dir, int32_t linesofar) { - size_t idx = index(); +uint32_t LineVertexBuffer::add(vertex_type x, vertex_type y, float ex, float ey, bool tx, bool ty, int8_t dir, int32_t linesofar) { + uint32_t idx = index(); void *data = addElement(); int16_t *coords = static_cast(data); diff --git a/src/mbgl/geometry/line_buffer.hpp b/src/mbgl/geometry/line_buffer.hpp index 756e6cfebc..bfa9a55021 100644 --- a/src/mbgl/geometry/line_buffer.hpp +++ b/src/mbgl/geometry/line_buffer.hpp @@ -30,7 +30,7 @@ public: * @param {number} ty texture normal * @param {number} dir direction of the line cap (-1/0/1) */ - size_t add(vertex_type x, vertex_type y, float ex, float ey, bool tx, bool ty, int8_t dir, int32_t linesofar = 0); + uint32_t add(vertex_type x, vertex_type y, float ex, float ey, bool tx, bool ty, int8_t dir, int32_t linesofar = 0); }; diff --git a/src/mbgl/geometry/text_buffer.cpp b/src/mbgl/geometry/text_buffer.cpp index 56f1c402da..8fed7a71d1 100644 --- a/src/mbgl/geometry/text_buffer.cpp +++ b/src/mbgl/geometry/text_buffer.cpp @@ -6,8 +6,8 @@ namespace mbgl { -size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle) { - const size_t idx = index(); +uint32_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle) { + const uint32_t idx = index(); void *data = addElement(); int16_t *shorts = static_cast(data); diff --git a/src/mbgl/geometry/text_buffer.hpp b/src/mbgl/geometry/text_buffer.hpp index 6f5a89bc69..4b46a38770 100644 --- a/src/mbgl/geometry/text_buffer.hpp +++ b/src/mbgl/geometry/text_buffer.hpp @@ -13,7 +13,7 @@ class TextVertexBuffer : public Buffer < public: typedef int16_t vertex_type; - size_t add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle); + uint32_t add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float minzoom, float maxzoom, float labelminzoom, uint8_t labelangle); }; -- cgit v1.2.1