From 62b56b799a7d4fcd1a8f151eed878054b862da5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 26 Oct 2016 15:22:31 -0700 Subject: [core] change std::array to mbgl::Size --- include/mbgl/map/map.hpp | 8 +++--- include/mbgl/platform/default/glfw_view.hpp | 4 +-- include/mbgl/platform/default/offscreen_view.hpp | 6 ++-- include/mbgl/sprite/sprite_image.hpp | 4 +-- include/mbgl/util/image.hpp | 36 ++++++++++++------------ include/mbgl/util/size.hpp | 32 +++++++++++++++++++++ 6 files changed, 61 insertions(+), 29 deletions(-) create mode 100644 include/mbgl/util/size.hpp (limited to 'include/mbgl') diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index b1c840e68d..6656bccd51 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -33,7 +34,7 @@ class Layer; class Map : private util::noncopyable { public: explicit Map(Backend&, - std::array size, + Size size, float pixelRatio, FileSource&, Scheduler&, @@ -136,9 +137,8 @@ public: ViewportMode getViewportMode() const; // Size - void setSize(const std::array&); - uint16_t getWidth() const; - uint16_t getHeight() const; + void setSize(Size); + Size getSize() const; // Projection double getMetersPerPixelAtLatitude(double lat, double zoom) const; diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index e832cd70d1..c640f188f9 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -34,8 +34,8 @@ public: // mbgl::View implementation void updateViewBinding(); void bind() override; - std::array getSize() const; - std::array getFramebufferSize() const; + mbgl::Size getSize() const; + mbgl::Size getFramebufferSize() const; // mbgl::Backend implementation void activate() override; diff --git a/include/mbgl/platform/default/offscreen_view.hpp b/include/mbgl/platform/default/offscreen_view.hpp index 034aa3aaf3..0e839e14cc 100644 --- a/include/mbgl/platform/default/offscreen_view.hpp +++ b/include/mbgl/platform/default/offscreen_view.hpp @@ -14,17 +14,17 @@ class Context; class OffscreenView : public View { public: - OffscreenView(gl::Context&, std::array size = {{ 256, 256 }}); + OffscreenView(gl::Context&, Size size = { 256, 256 }); void bind() override; PremultipliedImage readStillImage(); - std::array getSize() const; +public: + const Size size; private: gl::Context& context; - std::array size; optional framebuffer; optional> color; optional> depthStencil; diff --git a/include/mbgl/sprite/sprite_image.hpp b/include/mbgl/sprite/sprite_image.hpp index 7900b90b66..05d9871bf9 100644 --- a/include/mbgl/sprite/sprite_image.hpp +++ b/include/mbgl/sprite/sprite_image.hpp @@ -22,8 +22,8 @@ public: // Whether this image should be interpreted as a signed distance field icon. const bool sdf; - float getWidth() const { return image.width / pixelRatio; } - float getHeight() const { return image.height / pixelRatio; } + float getWidth() const { return image.size.width / pixelRatio; } + float getHeight() const { return image.size.height / pixelRatio; } }; } // namespace mbgl diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index 795d1f9d1a..3dbab27f41 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include @@ -18,39 +19,38 @@ class Image : private util::noncopyable { public: Image() = default; - Image(uint16_t w, uint16_t h) - : width(w), - height(h), - data(std::make_unique(size())) {} + Image(Size size_) + : size(std::move(size_)), + data(std::make_unique(bytes())) {} - Image(uint16_t w, uint16_t h, std::unique_ptr data_) - : width(w), - height(h), + Image(Size size_, std::unique_ptr data_) + : size(std::move(size_)), data(std::move(data_)) {} Image(Image&& o) - : width(o.width), - height(o.height), + : size(o.size), data(std::move(o.data)) {} Image& operator=(Image&& o) { - width = o.width; - height = o.height; + size = o.size; data = std::move(o.data); return *this; } bool operator==(const Image& rhs) const { - return width == rhs.width && height == rhs.height && - std::equal(data.get(), data.get() + size(), rhs.data.get(), - rhs.data.get() + rhs.size()); + return size == rhs.size && + std::equal(data.get(), data.get() + bytes(), rhs.data.get(), + rhs.data.get() + rhs.bytes()); } - size_t stride() const { return static_cast(width) * 4; } - size_t size() const { return static_cast(width) * height * 4; } + bool valid() const { + return size && data.get() != nullptr; + } + + size_t stride() const { return static_cast(size.width) * 4; } + size_t bytes() const { return stride() * size.height; } - uint16_t width = 0; - uint16_t height = 0; + Size size; std::unique_ptr data; }; diff --git a/include/mbgl/util/size.hpp b/include/mbgl/util/size.hpp new file mode 100644 index 0000000000..c0e2fd8180 --- /dev/null +++ b/include/mbgl/util/size.hpp @@ -0,0 +1,32 @@ +#pragma once + +#include +#include + +namespace mbgl { + +class Size { +public: + constexpr Size() : width(0), height(0) { + } + + constexpr Size(const uint32_t width_, const uint32_t height_) : width(width_), height(height_) { + } + + constexpr operator bool() const { + return width > 0 && height > 0; + } + + uint32_t width; + uint32_t height; +}; + +constexpr inline bool operator==(const Size& a, const Size& b) { + return a.width == b.width && a.height == b.height; +} + +constexpr inline bool operator!=(const Size& a, const Size& b) { + return !(a == b); +} + +} // namespace mbgl -- cgit v1.2.1