From f4ec026d283fce669a95866c57a09bf977a41c1d Mon Sep 17 00:00:00 2001
From: Paul Elder <paul.elder@ideasonboard.com>
Date: Tue, 23 Nov 2021 15:23:31 +0900
Subject: 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>
---
 src/android/camera_capabilities.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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_);
-- 
cgit v1.2.1