From 8f1dbd6a92381e38ba4bf65bdc35d5475ae6dc0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Sat, 13 Jul 2019 04:38:50 +0900 Subject: libcamera: ipa_module: Fix open source license verification MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The second argument to std::array is the size of the array, not of the elements it contains. Fix this by turning the std::array into a simple array of const char pointers. Fixes: 099815b85377ac68 ("libcamera: ipa_module: add isOpenSource") Signed-off-by: Niklas Söderlund Reviewed-by: Paul Elder --- src/libcamera/ipa_module.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/libcamera/ipa_module.cpp') diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 93bb4889..f9e0896c 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -22,6 +22,7 @@ #include "log.h" #include "pipeline_handler.h" +#include "utils.h" /** * \file ipa_module.h @@ -478,7 +479,7 @@ bool IPAModule::match(PipelineHandler *pipe, */ bool IPAModule::isOpenSource() const { - static std::array osLicenses = { + static const char *osLicenses[] = { "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", @@ -489,8 +490,11 @@ bool IPAModule::isOpenSource() const "LGPL-3.0-or-later", }; - return std::find(osLicenses.begin(), osLicenses.end(), info_.license) - != osLicenses.end(); + for (unsigned int i = 0; i < ARRAY_SIZE(osLicenses); i++) + if (!strcmp(osLicenses[i], info_.license)) + return true; + + return false; } } /* namespace libcamera */ -- cgit v1.2.1