| Message ID | 20200424215304.558317-2-jacopo@jmondi.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Jacopo, Thank you for the patch. On Fri, Apr 24, 2020 at 11:52:52PM +0200, Jacopo Mondi wrote: > 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. > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > include/libcamera/geometry.h | 4 ++-- > src/libcamera/geometry.cpp | 8 ++++---- > src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++-- > src/libcamera/v4l2_subdevice.cpp | 8 ++++---- > src/libcamera/v4l2_videodevice.cpp | 8 ++++---- > 5 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h > index 7f1b29fe8c19..2d364891858c 100644 > --- a/include/libcamera/geometry.h > +++ b/include/libcamera/geometry.h > @@ -15,8 +15,8 @@ namespace libcamera { > struct Rectangle { > int x; > int y; > - unsigned int w; > - unsigned int h; > + unsigned int width; > + unsigned int height; > > const std::string toString() const; > }; > diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp > index 13f642be526f..fd78cf2c0ab7 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; > } > > /** > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp > index 36ac571a0b06..b45900159d06 100644 > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp > @@ -1132,8 +1132,8 @@ int ImgUDevice::configureInput(const Size &size, > Rectangle rect = { > .x = 0, > .y = 0, > - .w = inputFormat->size.width, > - .h = inputFormat->size.height, > + .width = inputFormat->size.width, > + .height = inputFormat->size.height, > }; > ret = imgu_->setCrop(PAD_INPUT, &rect); > if (ret) > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp > index c28e591ba51a..5a479a96b795 100644 > --- a/src/libcamera/v4l2_subdevice.cpp > +++ b/src/libcamera/v4l2_subdevice.cpp > @@ -355,8 +355,8 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target, > > sel.r.left = rect->x; > sel.r.top = rect->y; > - sel.r.width = rect->w; > - sel.r.height = rect->h; > + sel.r.width = rect->width; > + sel.r.height = rect->height; > > int ret = ioctl(VIDIOC_SUBDEV_S_SELECTION, &sel); > if (ret < 0) { > @@ -368,8 +368,8 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target, > > rect->x = sel.r.left; > rect->y = sel.r.top; > - rect->w = sel.r.width; > - rect->h = sel.r.height; > + rect->width = sel.r.width; > + rect->height = sel.r.height; > > return 0; > } > diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp > index a959cfe65c43..beeec3ebe869 100644 > --- a/src/libcamera/v4l2_videodevice.cpp > +++ b/src/libcamera/v4l2_videodevice.cpp > @@ -1121,8 +1121,8 @@ int V4L2VideoDevice::setSelection(unsigned int target, Rectangle *rect) > > sel.r.left = rect->x; > sel.r.top = rect->y; > - sel.r.width = rect->w; > - sel.r.height = rect->h; > + sel.r.width = rect->width; > + sel.r.height = rect->height; > > int ret = ioctl(VIDIOC_S_SELECTION, &sel); > if (ret < 0) { > @@ -1133,8 +1133,8 @@ int V4L2VideoDevice::setSelection(unsigned int target, Rectangle *rect) > > rect->x = sel.r.left; > rect->y = sel.r.top; > - rect->w = sel.r.width; > - rect->h = sel.r.height; > + rect->width = sel.r.width; > + rect->height = sel.r.height; > > return 0; > }
diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h index 7f1b29fe8c19..2d364891858c 100644 --- a/include/libcamera/geometry.h +++ b/include/libcamera/geometry.h @@ -15,8 +15,8 @@ namespace libcamera { struct Rectangle { int x; int y; - unsigned int w; - unsigned int h; + unsigned int width; + unsigned int height; const std::string toString() const; }; diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 13f642be526f..fd78cf2c0ab7 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; } /** diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 36ac571a0b06..b45900159d06 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -1132,8 +1132,8 @@ int ImgUDevice::configureInput(const Size &size, Rectangle rect = { .x = 0, .y = 0, - .w = inputFormat->size.width, - .h = inputFormat->size.height, + .width = inputFormat->size.width, + .height = inputFormat->size.height, }; ret = imgu_->setCrop(PAD_INPUT, &rect); if (ret) diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index c28e591ba51a..5a479a96b795 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -355,8 +355,8 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target, sel.r.left = rect->x; sel.r.top = rect->y; - sel.r.width = rect->w; - sel.r.height = rect->h; + sel.r.width = rect->width; + sel.r.height = rect->height; int ret = ioctl(VIDIOC_SUBDEV_S_SELECTION, &sel); if (ret < 0) { @@ -368,8 +368,8 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target, rect->x = sel.r.left; rect->y = sel.r.top; - rect->w = sel.r.width; - rect->h = sel.r.height; + rect->width = sel.r.width; + rect->height = sel.r.height; return 0; } diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index a959cfe65c43..beeec3ebe869 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1121,8 +1121,8 @@ int V4L2VideoDevice::setSelection(unsigned int target, Rectangle *rect) sel.r.left = rect->x; sel.r.top = rect->y; - sel.r.width = rect->w; - sel.r.height = rect->h; + sel.r.width = rect->width; + sel.r.height = rect->height; int ret = ioctl(VIDIOC_S_SELECTION, &sel); if (ret < 0) { @@ -1133,8 +1133,8 @@ int V4L2VideoDevice::setSelection(unsigned int target, Rectangle *rect) rect->x = sel.r.left; rect->y = sel.r.top; - rect->w = sel.r.width; - rect->h = sel.r.height; + rect->width = sel.r.width; + rect->height = sel.r.height; return 0; }
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. Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> --- include/libcamera/geometry.h | 4 ++-- src/libcamera/geometry.cpp | 8 ++++---- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++-- src/libcamera/v4l2_subdevice.cpp | 8 ++++---- src/libcamera/v4l2_videodevice.cpp | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-)