[core] Updated Size::isEmpty and TransformState::valid checks

This commit is contained in:
Bruno de Oliveira Abinader
2017-04-03 17:07:17 +03:00
parent 76edc6ee69
commit e5aa4d70cd
10 changed files with 87 additions and 42 deletions

View File

@@ -58,7 +58,7 @@ public:
}
bool valid() const {
return size && data.get() != nullptr;
return !size.isEmpty() && data.get() != nullptr;
}
template <typename T = Image>

View File

@@ -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) {