From patchwork Wed Oct 21 15:41:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10177 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 4D516BDB13 for ; Wed, 21 Oct 2020 15:41:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 126E060BE7; Wed, 21 Oct 2020 17:41:54 +0200 (CEST) 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="vFKA+33x"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E6B8603F9 for ; Wed, 21 Oct 2020 17:41:52 +0200 (CEST) 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 F235292; Wed, 21 Oct 2020 17:41:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1603294912; bh=NAJdwAi0Tpx3h5Fp82Lz/SxTPqLZxMsXbaQKBrAXp+I=; h=From:To:Cc:Subject:Date:From; b=vFKA+33xYda47ZlO32olWxYXgI3Zd/Rqund2i3lM6vg71TTac38hV3CDDcH0JrJW9 291r1YU5sIUdRuOzLiHH4M7kBNbUNqQ5FtuE55n0aXdBSwT+djaB0sOOlfJqMvOrJD c1+je9w+vERJWuIFpaWsIWNxc3CzFkCwzk5k2Jcc= From: Kieran Bingham To: libcamera devel Date: Wed, 21 Oct 2020 16:41:33 +0100 Message-Id: <20201021154148.511505-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 00/15] Shadowed Variables 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" Final spin of the shadowed variables series. (hopefully) So a few more additions crept in to this series to cover the V4L2 layer, and updates that have been made in the android layer. Hopefully this is 'done' ;-) Kieran Bingham (15): libcamera: thread: Prevent shadowing of signal name libcamera: pipeline: Prevent variable shadowing libcamera: pipeline: Use existing variable definitions libcamera: pipeline: rpi_stream: Explicitly name requestBuffer libcamera: v4l2_videodevice: Prevent shadowing of V4L2BufferCache members ipa: raspberrypi: Re-use iterator variable android: camera_device: Use existing variable definitions android: camera_device: use member style on Camera3RequestDescriptor android: camera_device: Rename shadowed variable android: metadata: Disable -Wshadow v4l2: camera: Prevent shadowing within V4L2Camera::Buffer cam: options: Rename optional arg to prevent shadowing qcam: main_window: Explicitly name raw buffer test: v4l2_videodevice: Prevent variable shadowing of format meson: Enable shadowed variable warning include/libcamera/internal/v4l2_videodevice.h | 4 +- meson.build | 1 + src/android/camera_device.cpp | 64 +++++++++---------- src/android/camera_device.h | 10 +-- src/android/meson.build | 1 + src/cam/options.cpp | 10 +-- src/ipa/raspberrypi/controller/rpi/alsc.cpp | 6 +- .../pipeline/raspberrypi/raspberrypi.cpp | 8 +-- .../pipeline/raspberrypi/rpi_stream.cpp | 8 +-- src/libcamera/pipeline/simple/converter.cpp | 8 +-- src/libcamera/pipeline/simple/simple.cpp | 8 +-- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 +- src/libcamera/thread.cpp | 8 +-- src/libcamera/v4l2_videodevice.cpp | 12 ++-- src/qcam/main_window.cpp | 8 +-- src/v4l2/v4l2_camera.h | 6 +- src/v4l2/v4l2_camera_proxy.cpp | 4 +- test/v4l2_videodevice/formats.cpp | 6 +- 18 files changed, 89 insertions(+), 87 deletions(-)