PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: geometry: Make Size and Rectangle usable as constexpr

Browse Source 
There are use cases for declaring constexpr Size and Rectangle
instances. Make it possible.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2020-07-15 02:00:37 +03:00
parent 945eedaf2f
commit b5f3b9915c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/libcamera/geometry.h
View File

@@ -16,12 +16,12 @@ namespace libcamera {
class Size
{
public:
Size()
constexpr Size()
: Size(0, 0)
{
}
Size(unsigned int w, unsigned int h)
constexpr Size(unsigned int w, unsigned int h)
: width(w), height(h)
{
}
@@ -32,7 +32,8 @@ public:
bool isNull() const { return !width && !height; }
const std::string toString() const;
Size alignedDownTo(unsigned int hAlignment, unsigned int vAlignment) const
constexpr Size alignedDownTo(unsigned int hAlignment,
unsigned int vAlignment) const
{
return {
width / hAlignment * hAlignment,
@@ -40,7 +41,8 @@ public:
};
}
Size alignedUpTo(unsigned int hAlignment, unsigned int vAlignment) const
constexpr Size alignedUpTo(unsigned int hAlignment,
unsigned int vAlignment) const
{
return {
(width + hAlignment - 1) / hAlignment * hAlignment,
@@ -48,7 +50,7 @@ public:
};
}
Size boundedTo(const Size &bound) const
constexpr Size boundedTo(const Size &bound) const
{
return {
std::min(width, bound.width),
@@ -56,7 +58,7 @@ public:
};
}
Size expandedTo(const Size &expand) const
constexpr Size expandedTo(const Size &expand) const
{
return {
std::max(width, expand.width),
@@ -131,17 +133,17 @@ static inline bool operator!=(const SizeRange &lhs, const SizeRange &rhs)
class Rectangle
{
public:
Rectangle()
constexpr Rectangle()
: Rectangle(0, 0, 0, 0)
{
}
Rectangle(int xpos, int ypos, const Size &size)
constexpr Rectangle(int xpos, int ypos, const Size &size)
: x(xpos), y(ypos), width(size.width), height(size.height)
{
}
Rectangle(int xpos, int ypos, unsigned int w, unsigned int h)
constexpr Rectangle(int xpos, int ypos, unsigned int w, unsigned int h)
: x(xpos), y(ypos), width(w), height(h)
{
}