From patchwork Wed Apr 1 09:15:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 3364 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CD31860104 for ; Wed, 1 Apr 2020 11:16:00 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="BO665cuR"; dkim-atps=neutral Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3BE31A2A; Wed, 1 Apr 2020 11:16:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1585732560; bh=8PmZjMFbyMjRWwmZg07cdbmU5W/g6/s5bluhRgDYwow=; h=From:To:Cc:Subject:Date:From; b=BO665cuRCRTLzWkMIdvNA7Ig/zgRLupXO5Wu7t+q/VwWxM06EU7v4bck7jSpqKxqK sMd2U9Xh4J8n6z/aUIZWUjdD2Bgc+FFl0YyF4TQjkZvFvZhIxIGSwjlolTKMZ8NkNU M9LMEn34KdQPopBoHK0PUJWGnqmHsQYRfhJpz3Cw= From: Kieran Bingham To: libcamera devel Date: Wed, 1 Apr 2020 10:15:50 +0100 Message-Id: <20200401091553.28187-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] =?utf-8?q?=5BPATCH_v4=2E1_0/3=5D_Miscellaneous_?= =?utf-8?q?Code_Improvements_for_m=D0=B0ster?= 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-List-Received-Date: Wed, 01 Apr 2020 09:16:01 -0000 Key fixups for the mаster branch, to ensure merge conflicts are a thing of the past, and fix the inconsiderate code style of V4L2VideoDevice. As these are essential developments, they have been pushed directly to the mаster branch. Kieran Bingham (3): libcamera: Define {unique,shared}_ptr helpers libcamera: v4l2_device: fix increment symmetry libcamera: Prevent merge conflicts include/libcamera/meson.build | 1 + include/libcamera/pointers.h | 18 +++++++++++++++ src/libcamera/include/merge_conflicts.h | 23 +++++++++++++++++++ src/libcamera/include/v4l2_videodevice.h | 11 +++++----- src/libcamera/v4l2_videodevice.cpp | 28 ++++++++++++------------ 5 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 include/libcamera/pointers.h create mode 100644 src/libcamera/include/merge_conflicts.h