[libcamera-devel] [PATCH 04/17] libcamera: geometry: SizeRange: Add toString()
Jacopo Mondi
jacopo at jmondi.org
Mon May 27 11:36:34 CEST 2019
Hi Niklas,
On Mon, May 27, 2019 at 02:15:30AM +0200, Niklas Söderlund wrote:
> It's useful to be able to print a string representation of a SizeRange
> to the log or console, add a toString() method. While at it turn the
> structure into a class as it contains functions as well as data.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
> include/libcamera/geometry.h | 6 +++++-
> src/libcamera/geometry.cpp | 22 ++++++++++++++++++++++
> 2 files changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
> index 1c9267b14274cb5d..ca920a1e16817860 100644
> --- a/include/libcamera/geometry.h
> +++ b/include/libcamera/geometry.h
> @@ -67,7 +67,9 @@ static inline bool operator>=(const Size &lhs, const Size &rhs)
> return !(lhs < rhs);
> }
>
> -struct SizeRange {
> +class SizeRange
> +{
> +public:
> SizeRange()
> {
> }
> @@ -90,6 +92,8 @@ struct SizeRange {
> {
> }
>
> + const std::string toString() const;
> +
do we want the below fields private, now that SizeRange is a class?
Otherwise:
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
Thanks
j
> Size min;
> Size max;
> unsigned int hStep;
> diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
> index e7f1bafd40e944f5..337f2efa828ba996 100644
> --- a/src/libcamera/geometry.cpp
> +++ b/src/libcamera/geometry.cpp
> @@ -259,6 +259,28 @@ bool operator<(const Size &lhs, const Size &rhs)
> * \brief The vertical step
> */
>
> +/**
> + * \brief Assemble and return a string describing the size range
> + * \return A string describing the SizeRange
> + */
> +const std::string SizeRange::toString() const
> +{
> + std::stringstream ss;
> +
> + if (min == max)
> + ss << "Width: " << min.width
> + << " Height: " << min.height
> + << " hStep: " << hStep
> + << " vStep: " << vStep;
> + else
> + ss << "Width: " << min.width << "-" << max.width
> + << " Height: " << min.height << "-" << max.height
> + << " hStep: " << hStep
> + << " vStep: " << vStep;
> +
> + return ss.str();
> +}
> +
> /**
> * \brief Compare size ranges for equality
> * \return True if the two size ranges are equal, false otherwise
> --
> 2.21.0
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.libcamera.org/pipermail/libcamera-devel/attachments/20190527/eaed76eb/attachment.sig>
More information about the libcamera-devel
mailing list