summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-07-15 12:55:17 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-07-15 17:33:54 +0300
commitd5446e9f327ab4eaef38249b0907f11fbf52be45 (patch)
treeb04b44b87a90f260e536d6b655ef82ca03f5427d /include
parentb5f3b9915ca8bc049e1eec3e918c234330991a0e (diff)
libcamera: geometry: Provide in-place versions of the Size helpers
Add alignDownTo(), alignUpTo(), boundTo() and expandTo() helper functions to the Size class. These are in-place versions of the existing alignedDownTo(), alignedUpTo(), boundedTo() and expandedTo() functions. The new helpers return a reference to the size, to allow chaining the functions. One can thus write size.alignDownTo(16, 16).alignUpTo(32, 32) .boundTo({ 40, 80 }).expandTo({ 16, 80 }); instead of size.alignDownTo(16, 16); size.alignUpTo(32, 32); size.boundTo({ 40, 80 }); size.expandTo({ 16, 80 }); Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/geometry.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
index 30aaa7a3..d858f85c 100644
--- a/include/libcamera/geometry.h
+++ b/include/libcamera/geometry.h
@@ -32,6 +32,34 @@ public:
bool isNull() const { return !width && !height; }
const std::string toString() const;
+ Size &alignDownTo(unsigned int hAlignment, unsigned int vAlignment)
+ {
+ width = width / hAlignment * hAlignment;
+ height = height / vAlignment * vAlignment;
+ return *this;
+ }
+
+ Size &alignUpTo(unsigned int hAlignment, unsigned int vAlignment)
+ {
+ width = (width + hAlignment - 1) / hAlignment * hAlignment;
+ height = (height + vAlignment - 1) / vAlignment * vAlignment;
+ return *this;
+ }
+
+ Size &boundTo(const Size &bound)
+ {
+ width = std::min(width, bound.width);
+ height = std::min(height, bound.height);
+ return *this;
+ }
+
+ Size &expandTo(const Size &expand)
+ {
+ width = std::max(width, expand.width);
+ height = std::max(height, expand.height);
+ return *this;
+ }
+
constexpr Size alignedDownTo(unsigned int hAlignment,
unsigned int vAlignment) const
{