NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: geometry: Provide in-place versions of the Size helpers

Browse source 
Add alignDownTo(), alignUpTo(), boundTo() and expandTo() helper
functions to the Size class. These are in-place versions of the existing
alignedDownTo(), alignedUpTo(), boundedTo() and expandedTo() functions.

The new helpers return a reference to the size, to allow chaining the
functions. One can thus write

	size.alignDownTo(16, 16).alignUpTo(32, 32)
	    .boundTo({ 40, 80 }).expandTo({ 16, 80 });

instead of

	size.alignDownTo(16, 16);
	size.alignUpTo(32, 32);
	size.boundTo({ 40, 80 });
	size.expandTo({ 16, 80 });

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-07-15 12:55:17 +03:00
parent b5f3b9915c
commit d5446e9f32
3 changed files with 108 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
test/geometry.cpp
View file

@ -46,6 +46,40 @@ protected:
return TestFail;
}
/* Test alignDownTo(), alignUpTo(), boundTo() and expandTo() */
Size s(50, 50);
s.alignDownTo(16, 16);
if (s != Size(48, 48)) {
cout << "Size::alignDownTo() test failed" << endl;
return TestFail;
}
s.alignUpTo(32, 32);
if (s != Size(64, 64)) {
cout << "Size::alignUpTo() test failed" << endl;
return TestFail;
}
s.boundTo({ 40, 40 });
if (s != Size(40, 40)) {
cout << "Size::boundTo() test failed" << endl;
return TestFail;
}
s.expandTo({ 50, 50 });
if (s != Size(50, 50)) {
cout << "Size::expandTo() test failed" << endl;
return TestFail;
}
s.alignDownTo(16, 16).alignUpTo(32, 32)
.boundTo({ 40, 80 }).expandTo({ 16, 80 });
if (s != Size(40, 80)) {
cout << "Size chained in-place modifiers test failed" << endl;
return TestFail;
}
/* Test alignedDownTo(), alignedUpTo(), boundedTo() and expandedTo() */
if (Size(0, 0).alignedDownTo(16, 8) != Size(0, 0) ||
Size(1, 1).alignedDownTo(16, 8) != Size(0, 0) ||