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

libcamera: geometry: Add two-point Rectangle constructor

Browse source 
Add a constructor to the Rectangle class that accepts two points.

The constructed Rectangle spans all the space between the two given
points.

Signed-off-by: Yudhistira Erlandinata <yerlandinata@chromium.org>
Co-developed-by: Harvey Yang <chenghaoyang@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Harvey Yang <chenghaoyang@chromium.org>
This commit is contained in:
Yudhistira Erlandinata 2024-09-25 08:12:24 +00:00 • committed by Jacopo Mondi
parent 2f621920ea
commit 724bbf7d25
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/libcamera/geometry.h
View file

@ -262,6 +262,15 @@ public:
{
}
constexpr Rectangle(const Point &point1, const Point &point2)
: Rectangle(std::min(point1.x, point2.x), std::min(point1.y, point2.y),
static_cast<unsigned int>(std::max(point1.x, point2.x)) -
static_cast<unsigned int>(std::min(point1.x, point2.x)),
static_cast<unsigned int>(std::max(point1.y, point2.y)) -
static_cast<unsigned int>(std::min(point1.y, point2.y)))
{
}
int x;
int y;
unsigned int width;

7
src/libcamera/geometry.cpp
View file

@ -635,6 +635,13 @@ std::ostream &operator<<(std::ostream &out, const SizeRange &sr)
* \param[in] size The desired Rectangle size
*/
/**
* \fn Rectangle::Rectangle(const Point &point1, const Point &point2)
* \brief Construct a Rectangle from two opposite corners
* \param[in] point1 One of corners of the rectangle
* \param[in] point2 The opposite corner of \a point1
*/
/**
* \var Rectangle::x
* \brief The horizontal coordinate of the rectangle's top-left corner

14
test/geometry.cpp
View file

@ -481,6 +481,20 @@ protected:
return TestFail;
}
Point topLeft(3, 3);
Point bottomRight(30, 30);
Point topRight(30, 3);
Point bottomLeft(3, 30);
Rectangle rect1(topLeft, bottomRight);
Rectangle rect2(topRight, bottomLeft);
Rectangle rect3(bottomRight, topLeft);
Rectangle rect4(bottomLeft, topRight);
if (rect1 != rect2 || rect1 != rect3 || rect1 != rect4) {
cout << "Point-to-point construction failed" << endl;
return TestFail;
}
return TestPass;
}
};