[{"id":30061,"web_url":"https://patchwork.libcamera.org/comment/30061/","msgid":"<171926519040.625657.1533716907311316989@ping.linuxembedded.co.uk>","date":"2024-06-24T21:39:50","subject":"Re: [PATCH 07/10] apps: Define local functions in anonymous\n\tnamespace","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-06-24 20:29:38)\n> Multiple local functions are defined in the global namespace without the\n> static keyword. This compiles fine for now, but will cause a missing\n> declaration warning when we enable thel. To prepare for that, move the\n\ns/thel/them/\n\n> function declaration to an anonymous namespace.\n> \n> While at it, for consistency, include an existing static function in the\n> namespace and drop the static keyword.\n> \n> Signed-off-by: Laurent Pinchart \n\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/apps/cam/main.cpp | 4 ++++\n> src/apps/common/dng_writer.cpp | 6 +++++-\n> src/apps/qcam/main.cpp | 4 ++++\n> 3 files changed, 13 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp\n> index 4f87f200db21..460dbc813060 100644\n> --- a/src/apps/cam/main.cpp\n> +++ b/src/apps/cam/main.cpp\n> @@ -344,12 +344,16 @@ std::string CamApp::cameraName(const Camera *camera)\n> return name;\n> }\n> \n> +namespace {\n> +\n> void signalHandler([[maybe_unused]] int signal)\n> {\n> std::cout << \"Exiting\" << std::endl;\n> CamApp::instance()->quit();\n> }\n> \n> +} /* namespace */\n> +\n> int main(int argc, char **argv)\n> {\n> CamApp app;\n> diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\n> index 59f1fa23543b..58e35f3f9e1b 100644\n> --- a/src/apps/common/dng_writer.cpp\n> +++ b/src/apps/common/dng_writer.cpp\n> @@ -126,6 +126,8 @@ struct Matrix3d {\n> float m[9];\n> };\n> \n> +namespace {\n> +\n> void packScanlineSBGGR8(void *output, const void *input, unsigned int width)\n> {\n> const uint8_t *in = static_cast(input);\n> @@ -282,7 +284,7 @@ void thumbScanlineIPU3([[maybe_unused]] const FormatInfo &info, void *output,\n> }\n> }\n> \n> -static const std::map formatInfo = {\n> +const std::map formatInfo = {\n> { formats::SBGGR8, {\n> .bitsPerSample = 8,\n> .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed },\n> @@ -381,6 +383,8 @@ static const std::map formatInfo = {\n> } },\n> };\n> \n> +} /* namespace */\n> +\n> int DNGWriter::write(const char *filename, const Camera *camera,\n> const StreamConfiguration &config,\n> const ControlList &metadata,\n> diff --git a/src/apps/qcam/main.cpp b/src/apps/qcam/main.cpp\n> index 9846fba58508..d0bde14130fb 100644\n> --- a/src/apps/qcam/main.cpp\n> +++ b/src/apps/qcam/main.cpp\n> @@ -21,6 +21,8 @@\n> \n> using namespace libcamera;\n> \n> +namespace {\n> +\n> void signalHandler([[maybe_unused]] int signal)\n> {\n> qInfo() << \"Exiting\";\n> @@ -52,6 +54,8 @@ OptionsParser::Options parseOptions(int argc, char *argv[])\n> return options;\n> }\n> \n> +} /* namespace */\n> +\n> int main(int argc, char **argv)\n> {\n> QApplication app(argc, argv);\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"","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 998CFBD87C\n\tfor ;\n\tMon, 24 Jun 2024 21:39:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4E3CD654AC;\n\tMon, 24 Jun 2024 23:39:55 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AF347654A4\n\tfor ;\n\tMon, 24 Jun 2024 23:39:53 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B03B81650;\n\tMon, 24 Jun 2024 23:39:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LJQmilcX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719265171;\n\tbh=NRRZFqzHw97sRU1ohVriZW3XYo2ZY7/YHn2CkVYYhZI=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=LJQmilcXbQv3z/zzl4JJVP6VJkDOPtNT1Lm6gjfMUL8Bt8xbnQvz2sd9Fp4w6kAgp\n\tTmB05t7E6M1jfdkKDCMeWzTF09hc7djehcr4Z2ml0cDE0zlapffhsgQAh6deyLtzmi\n\t7W3gAtdvagqZq8rwBXuPu0sa+d1B/r3kG4UezcUc=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240624192941.22943-8-laurent.pinchart@ideasonboard.com>","References":"<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>\n\t<20240624192941.22943-8-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH 07/10] apps: Define local functions in anonymous\n\tnamespace","From":"Kieran Bingham ","Cc":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 24 Jun 2024 22:39:50 +0100","Message-ID":"<171926519040.625657.1533716907311316989@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]