From a2dddf7c26df3307b9d4554c25387a00687a6234 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 30 Apr 2019 21:16:28 +0300 Subject: libcamera: Use the Size class through libcamera MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several of our structures include width and height fields that model a size while we have a Size class for that purpose. Use the Size class through libcamera, and give it a toString() method like other geometry and format classes. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- test/v4l2_device/formats.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/v4l2_device') diff --git a/test/v4l2_device/formats.cpp b/test/v4l2_device/formats.cpp index 30b8b5c3..007e7e94 100644 --- a/test/v4l2_device/formats.cpp +++ b/test/v4l2_device/formats.cpp @@ -31,8 +31,7 @@ int Format::run() return TestFail; } - format.width = UINT_MAX; - format.height = UINT_MAX; + format.size = { UINT_MAX, UINT_MAX }; ret = capture_->setFormat(&format); if (ret) { cerr << "Failed to set format: image resolution is invalid: " @@ -41,7 +40,8 @@ int Format::run() return TestFail; } - if (format.width == UINT_MAX || format.height == UINT_MAX) { + if (format.size.width == UINT_MAX || + format.size.height == UINT_MAX) { cerr << "Failed to update image format = (UINT_MAX x UINT_MAX)" << endl; return TestFail; -- cgit v1.2.1