[libcamera-devel] [PATCH v2 04/16] libcamera: geometry: SizeRange: Add contains()

[Jacopo Mondi]

Hi Niklas,

On Wed, Jun 12, 2019 at 02:43:47AM +0200, Niklas Söderlund wrote:
> Add a method to check if a Size can fit inside a SizeRange. When
> determining if a size is containable take step values into account if
> they are not set to 0.

Now they're initialized to 1 by default

>
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
>  include/libcamera/geometry.h |  2 ++
>  src/libcamera/geometry.cpp   | 17 +++++++++++++++++
>  2 files changed, 19 insertions(+)
>
> diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
> index 03962d7d09fac2b0..52f4d010de76f840 100644
> --- a/include/libcamera/geometry.h
> +++ b/include/libcamera/geometry.h
> @@ -92,6 +92,8 @@ public:
>  	{
>  	}
>
> +	bool contains(const Size &size) const;
> +
>  	std::string toString() const;
>
>  	Size min;
> diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
> index 6a1d1d78870b23ec..a4d472d9fce2e226 100644
> --- a/src/libcamera/geometry.cpp
> +++ b/src/libcamera/geometry.cpp
> @@ -107,6 +107,7 @@ bool operator==(const Rectangle &lhs, const Rectangle &rhs)
>   * \brief The Size height
>   */
>
> +

Ups

>  /**
>   * \brief Assemble and return a string describing the size
>   * \return A string describing the size
> @@ -261,6 +262,22 @@ bool operator<(const Size &lhs, const Size &rhs)
>   * \brief The vertical step
>   */
>
> +/**
> + * \brief Test if a size can be contained in the range

s/can be/is

> + * \param[in] size Size to check
> + * \returns True if \a size can be contained
> + */
> +bool SizeRange::contains(const Size &size) const
> +{
> +	if (size.width < min.width || size.width > max.width ||
> +	    size.height < min.height || size.height > max.height ||
> +	    (hStep && (size.width - min.width) % hStep) ||
> +	    (vStep && (size.height - min.height) % vStep))

This returns false for ranges that describes a single size, which is
fine (even if we could decide that a size is "contained" in a range if
both width and height are minor). In any case, I would document that.

Apart from this
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>


> +		return false;
> +
> +	return true;
> +}
> +
>  /**
>   * \brief Assemble and return a string describing the size range
>   * \return A string describing the SizeRange
> --
> 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/20190613/1002767f/attachment.sig>