NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: geometry: Provide in-place versions of the Size helpers

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2020-07-15 12:55:17 +03:00
parent b5f3b9915c
commit d5446e9f32
3 changed files with 108 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
include/libcamera/geometry.h
View file

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