{"id":16813,"url":"https://patchwork.libcamera.org/api/1.1/patches/16813/?format=json","web_url":"https://patchwork.libcamera.org/patch/16813/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220727023816.30008-2-laurent.pinchart@ideasonboard.com>","date":"2022-07-27T02:38:03","name":"[libcamera-devel,v7,01/14] libcamera: yaml_parser: Replace ok flag to get() with std::optional","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"dc23a181e960fecf3522e6753a1b6c7994c7b658","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16813/mbox/","series":[{"id":3331,"url":"https://patchwork.libcamera.org/api/1.1/series/3331/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3331","date":"2022-07-27T02:38:02","name":"Replace boost JSON parser with libyaml in Raspberry Pi IPA","version":7,"mbox":"https://patchwork.libcamera.org/series/3331/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16813/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16813/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 6D7F7BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 27 Jul 2022 02:38:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D9C1363313;\n\tWed, 27 Jul 2022 04:38:19 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 30C656330E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Jul 2022 04:38:19 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BE20956D;\n\tWed, 27 Jul 2022 04:38:18 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658889499;\n\tbh=tA5v39SUMYbMaj+WnM1dGYwfSN0EUnXF/y7pX/wddrU=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=v8AogBPWRz49bYI1wLc4w79GQlm6JAolfHXjfl9yr2uSsu/7/XXoFfkbkT5+oIo/+\n\t87wtCm2IZ4tTXc5K8CPuEL+34Nsbkp/d8qGuSPVn8N4EXmibRJ2a5Pp1CdLTd/guDH\n\t2Bw0E/5oD28P7Y9mMj8so42HNeNUSOKjtr/keP2sPR2d9QcLnlOeNqydmMLoyBrzPD\n\tl1AlA31+QFcHwmE+oxqA25RF6K7Gjj6H4ASKVp7AnyMUpHP6rxz2I5ZzZtwuJqwi7q\n\tXwS4+tY1DKgiU4i3jy9S489qvfO2GCsCor5rDNCsMwomKvjtNx9hYHX/BX+P8LDrfJ\n\tGzBZcU49yMA9w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1658889499;\n\tbh=tA5v39SUMYbMaj+WnM1dGYwfSN0EUnXF/y7pX/wddrU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ZElNNomzFUFGL7BtWa4MskABgSi17AQMqdkSS7RhdKJtCUMd0XbF9EYGkBGmyPn9h\n\tWvMlpZ2iDJfdJgDAh+qEezr5zJehTp1fAXqdDtimVvJIQNJNUrLRdA0mJZ2BvkvGmC\n\t4wFGYviRL+u7ARhvN2+nHVDEagj+zD3lpLnQ99sE="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ZElNNomz\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 27 Jul 2022 05:38:03 +0300","Message-Id":"<20220727023816.30008-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220727023816.30008-1-laurent.pinchart@ideasonboard.com>","References":"<20220727023816.30008-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 01/14] libcamera: yaml_parser: Replace\n\tok flag to get() with std::optional","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"The YamlObject::get() function takes a default value and an optional\nbool ok flag to handle parsing errors. This ad-hoc mechanism complicates\nerror handling in callers.\n\nA better API is possible by dropping the default value and ok flag and\nreturning an std::optional. Not only does it simplify the calls, it also\nlets callers handle errors through the standard std::optional class\ninstead of the current ad-hoc mechanism.\n\nProvide a convenience get() wrapper around std::optional::value_or() to\nfurther simplify callers that don't need any specific error handling.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/yaml_parser.h |   9 +-\n src/libcamera/yaml_parser.cpp            | 138 +++++++++--------------\n test/yaml-parser.cpp                     |  71 ++++++------\n 3 files changed, 96 insertions(+), 122 deletions(-)","diff":"diff --git a/include/libcamera/internal/yaml_parser.h b/include/libcamera/internal/yaml_parser.h\nindex 064cf44381d7..61f2223223a7 100644\n--- a/include/libcamera/internal/yaml_parser.h\n+++ b/include/libcamera/internal/yaml_parser.h\n@@ -9,6 +9,7 @@\n \n #include <iterator>\n #include <map>\n+#include <optional>\n #include <string>\n #include <vector>\n \n@@ -165,7 +166,13 @@ public:\n #else\n \ttemplate<typename T>\n #endif\n-\tT get(const T &defaultValue, bool *ok = nullptr) const;\n+\tstd::optional<T> get() const;\n+\n+\ttemplate<typename T>\n+\tT get(const T &defaultValue) const\n+\t{\n+\t\treturn get<T>().value_or(defaultValue);\n+\t}\n \n \tDictAdapter asDict() const { return DictAdapter{ dictionary_ }; }\n \tListAdapter asList() const { return ListAdapter{ list_ }; }\ndiff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\nindex 5c45e44e49c3..4299f5abd38a 100644\n--- a/src/libcamera/yaml_parser.cpp\n+++ b/src/libcamera/yaml_parser.cpp\n@@ -31,12 +31,6 @@ namespace {\n /* Empty static YamlObject as a safe result for invalid operations */\n static const YamlObject empty;\n \n-void setOk(bool *ok, bool result)\n-{\n-\tif (ok)\n-\t\t*ok = result;\n-}\n-\n } /* namespace */\n \n /**\n@@ -100,54 +94,52 @@ std::size_t YamlObject::size() const\n }\n \n /**\n- * \\fn template<typename T> YamlObject::get<T>(\n- *\tconst T &defaultValue, bool *ok) const\n+ * \\fn template<typename T> YamlObject::get<T>() const\n+ * \\brief Parse the YamlObject as a \\a T value\n+ *\n+ * This function parses the value of the YamlObject as a \\a T object, and\n+ * returns the value. If parsing fails (usually because the YamlObject doesn't\n+ * store a \\a T value), std::nullopt is returned.\n+ *\n+ * \\return The YamlObject value, or std::nullopt if parsing failed\n+ */\n+\n+/**\n+ * \\fn template<typename T> YamlObject::get<T>(const T &defaultValue) const\n  * \\brief Parse the YamlObject as a \\a T value\n  * \\param[in] defaultValue The default value when failing to parse\n- * \\param[out] ok The result of whether the parse succeeded\n  *\n  * This function parses the value of the YamlObject as a \\a T object, and\n  * returns the value. If parsing fails (usually because the YamlObject doesn't\n- * store a \\a T value), the \\a defaultValue is returned, and \\a ok is set to\n- * false. Otherwise, the YamlObject value is returned, and \\a ok is set to true.\n+ * store a \\a T value), the \\a defaultValue is returned.\n  *\n- * The \\a ok pointer is optional and can be a nullptr if the caller doesn't\n- * need to know if parsing succeeded.\n- *\n- * \\return Value as a bool type\n+ * \\return The YamlObject value, or \\a defaultValue if parsing failed\n  */\n \n #ifndef __DOXYGEN__\n \n template<>\n-bool YamlObject::get(const bool &defaultValue, bool *ok) const\n+std::optional<bool> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tif (value_ == \"true\") {\n-\t\tsetOk(ok, true);\n+\tif (value_ == \"true\")\n \t\treturn true;\n-\t} else if (value_ == \"false\") {\n-\t\tsetOk(ok, true);\n+\telse if (value_ == \"false\")\n \t\treturn false;\n-\t}\n \n-\treturn defaultValue;\n+\treturn {};\n }\n \n template<>\n-int16_t YamlObject::get(const int16_t &defaultValue, bool *ok) const\n+std::optional<int16_t> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (value_ == \"\")\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tchar *end;\n \n@@ -157,22 +149,19 @@ int16_t YamlObject::get(const int16_t &defaultValue, bool *ok) const\n \tif ('\\0' != *end || errno == ERANGE ||\n \t    value < std::numeric_limits<int16_t>::min() ||\n \t    value > std::numeric_limits<int16_t>::max())\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value;\n }\n \n template<>\n-uint16_t YamlObject::get(const uint16_t &defaultValue, bool *ok) const\n+std::optional<uint16_t> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (value_ == \"\")\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \t/*\n \t * libyaml parses all scalar values as strings. When a string has\n@@ -183,7 +172,7 @@ uint16_t YamlObject::get(const uint16_t &defaultValue, bool *ok) const\n \t */\n \tstd::size_t found = value_.find_first_not_of(\" \\t\");\n \tif (found != std::string::npos && value_[found] == '-')\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tchar *end;\n \n@@ -193,22 +182,19 @@ uint16_t YamlObject::get(const uint16_t &defaultValue, bool *ok) const\n \tif ('\\0' != *end || errno == ERANGE ||\n \t    value < std::numeric_limits<uint16_t>::min() ||\n \t    value > std::numeric_limits<uint16_t>::max())\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value;\n }\n \n template<>\n-int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n+std::optional<int32_t> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (value_ == \"\")\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tchar *end;\n \n@@ -218,22 +204,19 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n \tif ('\\0' != *end || errno == ERANGE ||\n \t    value < std::numeric_limits<int32_t>::min() ||\n \t    value > std::numeric_limits<int32_t>::max())\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value;\n }\n \n template<>\n-uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n+std::optional<uint32_t> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (value_ == \"\")\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \t/*\n \t * libyaml parses all scalar values as strings. When a string has\n@@ -244,7 +227,7 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n \t */\n \tstd::size_t found = value_.find_first_not_of(\" \\t\");\n \tif (found != std::string::npos && value_[found] == '-')\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tchar *end;\n \n@@ -254,22 +237,19 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n \tif ('\\0' != *end || errno == ERANGE ||\n \t    value < std::numeric_limits<uint32_t>::min() ||\n \t    value > std::numeric_limits<uint32_t>::max())\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value;\n }\n \n template<>\n-double YamlObject::get(const double &defaultValue, bool *ok) const\n+std::optional<double> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (value_ == \"\")\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tchar *end;\n \n@@ -277,50 +257,38 @@ double YamlObject::get(const double &defaultValue, bool *ok) const\n \tdouble value = std::strtod(value_.c_str(), &end);\n \n \tif ('\\0' != *end || errno == ERANGE)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value;\n }\n \n template<>\n-std::string YamlObject::get(const std::string &defaultValue, bool *ok) const\n+std::optional<std::string> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::Value)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n \treturn value_;\n }\n \n template<>\n-Size YamlObject::get(const Size &defaultValue, bool *ok) const\n+std::optional<Size> YamlObject::get() const\n {\n-\tsetOk(ok, false);\n-\n \tif (type_ != Type::List)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n \tif (list_.size() != 2)\n-\t\treturn defaultValue;\n+\t\treturn {};\n \n-\t/*\n-\t * Add a local variable to validate each dimension in case\n-\t * that ok == nullptr.\n-\t */\n-\tbool valid;\n-\tuint32_t width = list_[0]->get<uint32_t>(0, &valid);\n-\tif (!valid)\n-\t\treturn defaultValue;\n+\tauto width = list_[0]->get<uint32_t>();\n+\tif (!width)\n+\t\treturn {};\n \n-\tuint32_t height = list_[1]->get<uint32_t>(0, &valid);\n-\tif (!valid)\n-\t\treturn defaultValue;\n+\tauto height = list_[1]->get<uint32_t>();\n+\tif (!height)\n+\t\treturn {};\n \n-\tsetOk(ok, true);\n-\treturn Size(width, height);\n+\treturn Size(*width, *height);\n }\n \n #endif /* __DOXYGEN__ */\ndiff --git a/test/yaml-parser.cpp b/test/yaml-parser.cpp\nindex 38f848232fa6..ebb654f2ef9c 100644\n--- a/test/yaml-parser.cpp\n+++ b/test/yaml-parser.cpp\n@@ -148,7 +148,6 @@ protected:\n \t\t}\n \n \t\t/* Test string object */\n-\t\tbool ok;\n \t\tauto &strObj = (*root)[\"string\"];\n \n \t\tif (strObj.isDictionary()) {\n@@ -161,27 +160,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<string>(\"\", &ok) != \"libcamera\" || !ok) {\n+\t\tif (strObj.get<string>().value_or(\"\") != \"libcamera\") {\n \t\t\tcerr << \"String object parse as wrong content\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<int32_t>(-1, &ok) != -1 || ok) {\n+\t\tif (strObj.get<int32_t>()) {\n \t\t\tcerr << \"String object parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (strObj.get<uint32_t>()) {\n \t\t\tcerr << \"String object parse as unsigned integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<double>(1.0, &ok) != 1.0 || ok) {\n+\t\tif (strObj.get<double>()) {\n \t\t\tcerr << \"String object parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (strObj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (strObj.get<Size>()) {\n \t\t\tcerr << \"String object parse as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -199,27 +198,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<int32_t>(-100, &ok) != -100 || !ok) {\n+\t\tif (int32Obj.get<int32_t>().value_or(0) != -100) {\n \t\t\tcerr << \"Integer object parse as wrong value\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<string>(\"\", &ok) != \"-100\" || !ok) {\n+\t\tif (int32Obj.get<string>().value_or(\"\") != \"-100\") {\n \t\t\tcerr << \"Integer object fail to parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<double>(1.0, &ok) != -100.0 || !ok) {\n+\t\tif (int32Obj.get<double>().value_or(0.0) != -100.0) {\n \t\t\tcerr << \"Integer object fail to parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (int32Obj.get<uint32_t>()) {\n \t\t\tcerr << \"Negative integer object parse as unsigned integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (int32Obj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (int32Obj.get<Size>()) {\n \t\t\tcerr << \"Integer object parse as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -237,27 +236,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<int32_t>(-1, &ok) != 100 || !ok) {\n+\t\tif (uint32Obj.get<int32_t>().value_or(0) != 100) {\n \t\t\tcerr << \"Unsigned integer object fail to parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<string>(\"\", &ok) != \"100\" || !ok) {\n+\t\tif (uint32Obj.get<string>().value_or(\"\") != \"100\") {\n \t\t\tcerr << \"Unsigned integer object fail to parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<double>(1.0, &ok) != 100.0 || !ok) {\n+\t\tif (uint32Obj.get<double>().value_or(0.0) != 100.0) {\n \t\t\tcerr << \"Unsigned integer object fail to parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<uint32_t>(100, &ok) != 100 || !ok) {\n+\t\tif (uint32Obj.get<uint32_t>().value_or(0) != 100) {\n \t\t\tcerr << \"Unsigned integer object parsed as wrong value\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (uint32Obj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (uint32Obj.get<Size>()) {\n \t\t\tcerr << \"Unsigned integer object parsed as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -275,27 +274,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<string>(\"\", &ok) != \"3.14159\" || !ok) {\n+\t\tif (doubleObj.get<string>().value_or(\"\") != \"3.14159\") {\n \t\t\tcerr << \"Double object fail to parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<double>(1.0, &ok) != 3.14159 || !ok) {\n+\t\tif (doubleObj.get<double>().value_or(0.0) != 3.14159) {\n \t\t\tcerr << \"Double object parse as wrong value\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<int32_t>(-1, &ok) != -1 || ok) {\n+\t\tif (doubleObj.get<int32_t>()) {\n \t\t\tcerr << \"Double object parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (doubleObj.get<uint32_t>()) {\n \t\t\tcerr << \"Double object parse as unsigned integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (doubleObj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (doubleObj.get<Size>()) {\n \t\t\tcerr << \"Double object parse as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -313,27 +312,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (sizeObj.get<string>(\"\", &ok) != \"\" || ok) {\n+\t\tif (sizeObj.get<string>()) {\n \t\t\tcerr << \"Size object parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (sizeObj.get<double>(1.0, &ok) != 1.0 || ok) {\n+\t\tif (sizeObj.get<double>()) {\n \t\t\tcerr << \"Size object parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (sizeObj.get<int32_t>(-1, &ok) != -1 || ok) {\n+\t\tif (sizeObj.get<int32_t>()) {\n \t\t\tcerr << \"Size object parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (sizeObj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (sizeObj.get<uint32_t>()) {\n \t\t\tcerr << \"Size object parse as unsigned integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (sizeObj.get<Size>(Size(0, 0), &ok) != Size(1920, 1080) || !ok) {\n+\t\tif (sizeObj.get<Size>().value_or(Size(0, 0)) != Size(1920, 1080)) {\n \t\t\tcerr << \"Size object parse as wrong value\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -351,27 +350,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.get<string>(\"\", &ok) != \"\" || ok) {\n+\t\tif (listObj.get<string>()) {\n \t\t\tcerr << \"List object parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.get<double>(1.0, &ok) != 1.0 || ok) {\n+\t\tif (listObj.get<double>()) {\n \t\t\tcerr << \"List object parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.get<int32_t>(-1, &ok) != -1 || ok) {\n+\t\tif (listObj.get<int32_t>()) {\n \t\t\tcerr << \"List object parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (listObj.get<uint32_t>()) {\n \t\t\tcerr << \"List object parse as unsigne integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (listObj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (listObj.get<Size>()) {\n \t\t\tcerr << \"String list object parse as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -424,27 +423,27 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.get<string>(\"\", &ok) != \"\" || ok) {\n+\t\tif (dictObj.get<string>()) {\n \t\t\tcerr << \"Dictionary object parse as string\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.get<double>(1.0, &ok) != 1.0 || ok) {\n+\t\tif (dictObj.get<double>()) {\n \t\t\tcerr << \"Dictionary object parse as double\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.get<int32_t>(-1, &ok) != -1 || ok) {\n+\t\tif (dictObj.get<int32_t>()) {\n \t\t\tcerr << \"Dictionary object parse as integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.get<uint32_t>(1, &ok) != 1 || ok) {\n+\t\tif (dictObj.get<uint32_t>()) {\n \t\t\tcerr << \"Dictionary object parse as unsigned integer\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (dictObj.get<Size>(Size(0, 0), &ok) != Size(0, 0) || ok) {\n+\t\tif (dictObj.get<Size>()) {\n \t\t\tcerr << \"Dictionary object parse as Size\" << std::endl;\n \t\t\treturn TestFail;\n \t\t}\n","prefixes":["libcamera-devel","v7","01/14"]}