libcamera: geometry: Construct SizeRange from Size

The SizeRange constructors take minimum and maximum width and height
values as separate arguments. We have a Size class to convey size
information, use it in the constructors, and update the callers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
index 52f4d010..7f1b29fe 100644
--- a/include/libcamera/geometry.h
+++ b/include/libcamera/geometry.h
@@ -74,21 +74,19 @@ public:
 	{
 	}
 
-	SizeRange(unsigned int width, unsigned int height)
-		: min(width, height), max(width, height), hStep(1), vStep(1)
+	SizeRange(const Size &size)
+		: min(size), max(size), hStep(1), vStep(1)
 	{
 	}
 
-	SizeRange(unsigned int minW, unsigned int minH,
-		  unsigned int maxW, unsigned int maxH)
-		: min(minW, minH), max(maxW, maxH), hStep(1), vStep(1)
+	SizeRange(const Size &minSize, const Size &maxSize)
+		: min(minSize), max(maxSize), hStep(1), vStep(1)
 	{
 	}
 
-	SizeRange(unsigned int minW, unsigned int minH,
-		  unsigned int maxW, unsigned int maxH,
+	SizeRange(const Size &minSize, const Size &maxSize,
 		  unsigned int hstep, unsigned int vstep)
-		: min(minW, minH), max(maxW, maxH), hStep(hstep), vStep(vstep)
+		: min(minSize), max(maxSize), hStep(hstep), vStep(vstep)
 	{
 	}