From a69414529f463ba1d2f0fa4a9e80538193f9b099 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 15 Mar 2020 02:56:20 +0200 Subject: libcamera: geometry: Construct SizeRange from Size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- src/libcamera/v4l2_videodevice.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/libcamera/v4l2_videodevice.cpp') diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index fde8bd88..56251a46 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -971,20 +971,20 @@ std::vector V4L2VideoDevice::enumSizes(unsigned int pixelFormat) switch (frameSize.type) { case V4L2_FRMSIZE_TYPE_DISCRETE: - sizes.emplace_back(frameSize.discrete.width, - frameSize.discrete.height); + sizes.emplace_back(Size{ frameSize.discrete.width, + frameSize.discrete.height }); break; case V4L2_FRMSIZE_TYPE_CONTINUOUS: - sizes.emplace_back(frameSize.stepwise.min_width, - frameSize.stepwise.min_height, - frameSize.stepwise.max_width, - frameSize.stepwise.max_height); + sizes.emplace_back(Size{ frameSize.stepwise.min_width, + frameSize.stepwise.min_height }, + Size{ frameSize.stepwise.max_width, + frameSize.stepwise.max_height }); break; case V4L2_FRMSIZE_TYPE_STEPWISE: - sizes.emplace_back(frameSize.stepwise.min_width, - frameSize.stepwise.min_height, - frameSize.stepwise.max_width, - frameSize.stepwise.max_height, + sizes.emplace_back(Size{ frameSize.stepwise.min_width, + frameSize.stepwise.min_height }, + Size{ frameSize.stepwise.max_width, + frameSize.stepwise.max_height }, frameSize.stepwise.step_width, frameSize.stepwise.step_height); break; -- cgit v1.2.1