From e5aa4d70cd7b39302ddf1ec4df240a14accfb474 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Mon, 3 Apr 2017 17:07:17 +0300
Subject: [core] Updated Size::isEmpty and TransformState::valid checks

---
 include/mbgl/util/image.hpp |  2 +-
 include/mbgl/util/size.hpp  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'include/mbgl')

diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp
index 5d1462e7c4..c019bb949c 100644
--- a/include/mbgl/util/image.hpp
+++ b/include/mbgl/util/image.hpp
@@ -58,7 +58,7 @@ public:
     }
 
     bool valid() const {
-        return size && data.get() != nullptr;
+        return !size.isEmpty() && data.get() != nullptr;
     }
 
     template <typename T = Image>
diff --git a/include/mbgl/util/size.hpp b/include/mbgl/util/size.hpp
index 79679a92fb..45c303969c 100644
--- a/include/mbgl/util/size.hpp
+++ b/include/mbgl/util/size.hpp
@@ -7,8 +7,7 @@ namespace mbgl {
 
 class Size {
 public:
-    constexpr Size() : width(0), height(0) {
-    }
+    constexpr Size() = default;
 
     constexpr Size(const uint32_t width_, const uint32_t height_) : width(width_), height(height_) {
     }
@@ -17,12 +16,12 @@ public:
         return width * height;
     }
 
-    constexpr explicit operator bool() const {
-        return width > 0 && height > 0;
+    constexpr bool isEmpty() const {
+        return width == 0 || height == 0;
     }
 
-    uint32_t width;
-    uint32_t height;
+    uint32_t width = 0;
+    uint32_t height = 0;
 };
 
 constexpr inline bool operator==(const Size& a, const Size& b) {
-- 
cgit v1.2.1