summaryrefslogtreecommitdiff
path: root/src/libcamera/geometry.cpp
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2020-04-20 10:32:45 +0200
committerJacopo Mondi <jacopo@jmondi.org>2020-04-26 17:12:42 +0200
commit96653be72831e9d26e5d6076ebb6be98a51a3124 (patch)
tree4a14e2efb82c703c0db676cb73b384991a7aca55 /src/libcamera/geometry.cpp
parent66a1928a0a7a14c19f10d8fd09980258912f515e (diff)
libcamera: geometry: Rename Rectangle fields
The Rectangle class members that represents the rectangle horizontal and vertical sizes are named 'w' and 'h', in contrast with the Size and SizeRange classes which use 'width' and 'height', resulting in having to look at class definition every time to know which names to use. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/libcamera/geometry.cpp')
-rw-r--r--src/libcamera/geometry.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
index 13f642be..fd78cf2c 100644
--- a/src/libcamera/geometry.cpp
+++ b/src/libcamera/geometry.cpp
@@ -40,12 +40,12 @@ namespace libcamera {
*/
/**
- * \var Rectangle::w
+ * \var Rectangle::width
* \brief The distance between the left and right sides
*/
/**
- * \var Rectangle::h
+ * \var Rectangle::height
* \brief The distance between the top and bottom sides
*/
@@ -57,7 +57,7 @@ const std::string Rectangle::toString() const
{
std::stringstream ss;
- ss << "(" << x << "x" << y << ")/" << w << "x" << h;
+ ss << "(" << x << "x" << y << ")/" << width << "x" << height;
return ss.str();
}
@@ -69,7 +69,7 @@ const std::string Rectangle::toString() const
bool operator==(const Rectangle &lhs, const Rectangle &rhs)
{
return lhs.x == rhs.x && lhs.y == rhs.y &&
- lhs.w == rhs.w && lhs.h == rhs.h;
+ lhs.width == rhs.width && lhs.height == rhs.height;
}
/**