From patchwork Mon Oct 24 10:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17688 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 AE72ABDB16 for ; Mon, 24 Oct 2022 10:47:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EAEA762F13; Mon, 24 Oct 2022 12:47:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666608426; bh=EiODlsPQxXHvEOcHPrX9m/Q/SkGXr/sHmiHCo/rcX0U=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=TRMcYaeVZkpCpmObRjd3jmWgS+CizIV4wm8Wdx8gsXSAUx2MVsVyB3VBgo7f38j3i jPv6K9B7EH+rf8ud4m+l+6SHcupi4AVKVkBOMjMTYXoyUySECF9AlSWnGSKV3npVtE GJt8A6Or5iEKi+va0Ur2kmD1NSILXowrQtyDgGIZApc5mk0YtyBpgxXSngX4G3oqCR RDeCndFbeuDDs/s9GG1tyY3DRMsjSFDTx4xILjhwsyqIKwNuyEI11T6T9v8fYg+2Bx +D3Ns3LIBFYqPl2aw7nfsj+Ww56Zw6XUQi5RSFle86tpqxjAjEQgE5VYKxtGUcFsS7 a8RT9Zy3dFn3w== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E38FD62EC6 for ; Mon, 24 Oct 2022 12:47:03 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iRhHR1t2"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 62E3F471 for ; Mon, 24 Oct 2022 12:47:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1666608423; bh=EiODlsPQxXHvEOcHPrX9m/Q/SkGXr/sHmiHCo/rcX0U=; h=From:To:Subject:Date:From; b=iRhHR1t2191FY3f2teUlCnnz3t0pjMFiHoZuRIrawX4uGAF0ADT2U47O+QD93O//e eP2XJSKe/NtEeVLdF3YsSeRcEAR+JLaLQD+9tyGm7JAQaQiHTU2vvx5gSWPPOgpVeh h+LfQfywLb39Qt5VAgChpqUmjFrfBx6O7GtrR9ZE= To: libcamera-devel@lists.libcamera.org Date: Mon, 24 Oct 2022 13:46:38 +0300 Message-Id: <20221024104638.1031-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.37.4 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] apps: cam: Fix compilation error with clang when libtiff-4 is not found 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: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When libtiff-4 is not found, the private camera_ member of the FileSink class is set but never used. This causes a compilation error with clang: In file included from ../../src/apps/cam/file_sink.cpp:19: ../../src/apps/cam/file_sink.h:39:27: error: private field 'camera_' is not used [-Werror,-Wunused-private-field] const libcamera::Camera *camera_; Fix by making the camera_ member field conditional on HAVE_TIFF. Fixes: 6404b163bcbb ("cam: file_sink: Add support for DNG output") Signed-off-by: Laurent Pinchart Acked-by: Kieran Bingham --- src/apps/cam/file_sink.cpp | 8 ++++++-- src/apps/cam/file_sink.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) base-commit: 24f8ef763a60f410963fd8897a16ae077aaeff0d diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp index 9d60c04e1cf4..4dfacc103c54 100644 --- a/src/apps/cam/file_sink.cpp +++ b/src/apps/cam/file_sink.cpp @@ -21,10 +21,14 @@ using namespace libcamera; -FileSink::FileSink(const libcamera::Camera *camera, +FileSink::FileSink([[maybe_unused]] const libcamera::Camera *camera, const std::map &streamNames, const std::string &pattern) - : camera_(camera), streamNames_(streamNames), pattern_(pattern) + : +#ifdef HAVE_TIFF + camera_(camera), +#endif + streamNames_(streamNames), pattern_(pattern) { } diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h index 9ce8b619f69d..300edf8dc902 100644 --- a/src/apps/cam/file_sink.h +++ b/src/apps/cam/file_sink.h @@ -36,7 +36,9 @@ private: libcamera::FrameBuffer *buffer, const libcamera::ControlList &metadata); +#ifdef HAVE_TIFF const libcamera::Camera *camera_; +#endif std::map streamNames_; std::string pattern_; std::map> mappedBuffers_;