summaryrefslogtreecommitdiff
path: root/src/android/camera_capabilities.cpp
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2021-11-23 15:23:31 +0900
committerPaul Elder <paul.elder@ideasonboard.com>2021-12-22 16:10:10 -0600
commitf4ec026d283fce669a95866c57a09bf977a41c1d (patch)
tree8471ba76390309421423a7f27951b3722fd30339 /src/android/camera_capabilities.cpp
parent86ab84677fff4e4c903453c846adc06524fa79d5 (diff)
android: camera_capabilities: Fix the type of the capability vector
The type of elements of the capability vector that is set in the static metadata must be uint8_t. The enum will not suffice, as it is int32_t. Fix this. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android/camera_capabilities.cpp')
-rw-r--r--src/android/camera_capabilities.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index e6a2c9ea..55d651f3 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -1388,8 +1388,8 @@ int CameraCapabilities::initializeStaticMetadata()
/* Check capabilities */
capabilities_ = computeCapabilities();
- std::vector<camera_metadata_enum_android_request_available_capabilities>
- capsVec(capabilities_.begin(), capabilities_.end());
+ /* This *must* be uint8_t. */
+ std::vector<uint8_t> capsVec(capabilities_.begin(), capabilities_.end());
staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES, capsVec);
computeHwLevel(capabilities_);