diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-07-13 04:38:50 +0900 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-07-13 13:07:24 +0900 |
| commit | 8f1dbd6a92381e38ba4bf65bdc35d5475ae6dc0a (patch) | |
| tree | 9824ad792aee9614e30b5a460dc0f4ac290dfbc0 | |
| parent | bfbc25785fcafb0ed2e14a19d2508238594065d3 (diff) | |
libcamera: ipa_module: Fix open source license verification
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 <niklas.soderlund@ragnatech.se>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
| -rw-r--r-- | src/libcamera/ipa_module.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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<const char *, sizeof(char *)> 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 */ |