summaryrefslogtreecommitdiff
path: root/include/minikin/MinikinExtent.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/minikin/MinikinExtent.h')
-rw-r--r--include/minikin/MinikinExtent.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/include/minikin/MinikinExtent.h b/include/minikin/MinikinExtent.h
index ac9b49f..baa56ff 100644
--- a/include/minikin/MinikinExtent.h
+++ b/include/minikin/MinikinExtent.h
@@ -25,24 +25,29 @@ namespace minikin {
struct MinikinExtent {
MinikinExtent() : ascent(0), descent(0) {}
MinikinExtent(float ascent, float descent) : ascent(ascent), descent(descent) {}
- bool operator==(const MinikinExtent& o) const {
- return ascent == o.ascent && descent == o.descent;
- }
- float ascent; // negative
- float descent; // positive
-
- void reset() { ascent = descent = 0.0; }
void extendBy(const MinikinExtent& e) {
ascent = std::min(ascent, e.ascent);
descent = std::max(descent, e.descent);
}
+
+ float ascent; // negative
+ float descent; // positive
};
// For gtest output
inline std::ostream& operator<<(std::ostream& os, const MinikinExtent& e) {
- return os << e.ascent << ", " << e.descent;
+ return os << "(ascent = " << e.ascent << ", descent = " << e.descent << ")";
+}
+
+inline bool operator==(const MinikinExtent& l, const MinikinExtent& r) {
+ return l.ascent == r.ascent && l.descent == r.descent;
}
+
+inline bool operator!=(const MinikinExtent& l, const MinikinExtent& r) {
+ return !(l == r);
+}
+
} // namespace minikin
#endif // MINIKIN_MINIKIN_EXTENT_H