libcamera: controls: Use explicit 32-bit integer types

Make the control API more explicit when dealing with integer controls by
specifying the size. We already do so for 64-bit integers, using int64_t
and ControlTypeInteger64, do the same for 32-bit integers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2019-10-04 19:33:08 +03:00
parent 224ef9776a
commit dd37ef784e
7 changed files with 46 additions and 44 deletions
+8 -8
View File
@@ -96,7 +96,7 @@ protected:
return TestFail;
}
if (list[Brightness].get<int>() != 255) {
if (list[Brightness].get<int32_t>() != 255) {
cout << "Incorrest Brightness control value" << endl;
return TestFail;
}
@@ -125,8 +125,8 @@ protected:
/*
* Test control value retrieval and update through ControlInfo.
*/
if (list[brightness].get<int>() != 64 ||
list[contrast].get<int>() != 128) {
if (list[brightness].get<int32_t>() != 64 ||
list[contrast].get<int32_t>() != 128) {
cout << "Failed to retrieve control value" << endl;
return TestFail;
}
@@ -134,8 +134,8 @@ protected:
list[brightness] = 10;
list[contrast] = 20;
if (list[brightness].get<int>() != 10 ||
list[contrast].get<int>() != 20) {
if (list[brightness].get<int32_t>() != 10 ||
list[contrast].get<int32_t>() != 20) {
cout << "Failed to update control value" << endl;
return TestFail;
}
@@ -185,9 +185,9 @@ protected:
return TestFail;
}
if (newList[Brightness].get<int>() != 10 ||
newList[Contrast].get<int>() != 20 ||
newList[Saturation].get<int>() != 255) {
if (newList[Brightness].get<int32_t>() != 10 ||
newList[Contrast].get<int32_t>() != 20 ||
newList[Saturation].get<int32_t>() != 255) {
cout << "New list contains incorrect values" << endl;
return TestFail;
}