From patchwork Thu Feb 4 14:37:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11146 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8A680BD162 for ; Thu, 4 Feb 2021 14:37:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 17D436141E; Thu, 4 Feb 2021 15:37:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="tjLnTGDs"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 10D8A60305 for ; Thu, 4 Feb 2021 15:37:43 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 914E9440; Thu, 4 Feb 2021 15:37:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1612449462; bh=/WftimkzWqPxhFx8DC8yCSrAmZ1OqnNFHtmuCUlegzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tjLnTGDszss4bYPiP0G5CjDE5OSkXL8bAI3UqD+Q3+STVocu+piQwgSgAt/c3WFCk fXSdnShXisSZXSqOpH069I7azVdh36vpMTb4OtUPnNWPN5UuPQJGjbtVidPgNhVXGS wUwG9/+nbh54xDBDvvGRlrHQV/Wx8BUCDoGF59Qs= From: Kieran Bingham To: libcamera devel Date: Thu, 4 Feb 2021 14:37:36 +0000 Message-Id: <20210204143736.1762344-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204035951.23751-1-laurent.pinchart@ideasonboard.com> References: <20210204035951.23751-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: jpeg: Utilise compiler specific nodiscard X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Utilise the new compiler specific __nodiscard to maintain coding style. Signed-off-by: Kieran Bingham --- Only applicable along with Laurent's [[nodiscard]] series. src/android/jpeg/exif.cpp | 2 +- src/android/jpeg/exif.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index fdd46070ba7c..ed995ca13167 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -515,7 +515,7 @@ std::u16string Exif::utf8ToUtf16(const std::string &str) return ret; } -[[nodiscard]] int Exif::generate() +__nodiscard int Exif::generate() { if (exifData_) { free(exifData_); diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h index b0d614027ede..67dbd20524d8 100644 --- a/src/android/jpeg/exif.h +++ b/src/android/jpeg/exif.h @@ -13,6 +13,7 @@ #include +#include #include #include @@ -75,7 +76,7 @@ public: void setWhiteBalance(WhiteBalance wb); libcamera::Span data() const { return { exifData_, size_ }; } - [[nodiscard]] int generate(); + __nodiscard int generate(); private: ExifEntry *createEntry(ExifIfd ifd, ExifTag tag);