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 --- test/stream/stream_formats.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/stream/stream_formats.cpp b/test/stream/stream_formats.cpp index 92f1574b..9353d008 100644 --- a/test/stream/stream_formats.cpp +++ b/test/stream/stream_formats.cpp @@ -55,8 +55,8 @@ protected: { /* Test discrete sizes */ StreamFormats discrete({ - { PixelFormat(1), { SizeRange(100, 100), SizeRange(200, 200) } }, - { PixelFormat(2), { SizeRange(300, 300), SizeRange(400, 400) } }, + { PixelFormat(1), { SizeRange({ 100, 100 }), SizeRange({ 200, 200 }) } }, + { PixelFormat(2), { SizeRange({ 300, 300 }), SizeRange({ 400, 400 }) } }, }); if (testSizes("discrete 1", discrete.sizes(PixelFormat(1)), @@ -68,10 +68,10 @@ protected: /* Test range sizes */ StreamFormats range({ - { PixelFormat(1), { SizeRange(640, 480, 640, 480) } }, - { PixelFormat(2), { SizeRange(640, 480, 800, 600, 8, 8) } }, - { PixelFormat(3), { SizeRange(640, 480, 800, 600, 16, 16) } }, - { PixelFormat(4), { SizeRange(128, 128, 4096, 4096, 128, 128) } }, + { PixelFormat(1), { SizeRange({ 640, 480 }, { 640, 480 }) } }, + { PixelFormat(2), { SizeRange({ 640, 480 }, { 800, 600 }, 8, 8) } }, + { PixelFormat(3), { SizeRange({ 640, 480 }, { 800, 600 }, 16, 16) } }, + { PixelFormat(4), { SizeRange({ 128, 128 }, { 4096, 4096 }, 128, 128) } }, }); if (testSizes("range 1", range.sizes(PixelFormat(1)), { Size(640, 480) })) -- cgit v1.2.1