From patchwork Wed Apr 1 09:15:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 3367 Return-Path: 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 656AF62DA4 for ; Wed, 1 Apr 2020 11:16:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gLlvo7Yd"; 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 E20BCA48; 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=1585732561; bh=vDS0HcYrBMSI2esvvMVMat/3QuHgkKMfG59V8njGppw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gLlvo7YdC8Rq5AemeyIYJN1+r7cN80vI/e5WjtYtZew7Hn0nhWQ86mAzzsEBm55Tx nvAVS5Vyk8BPObfIqTn9VPg4+sn0dU39y/HN/OynFO49zNkJVxWJLD8/AAn02bHgk9 0a/QNrsZx4/k0g+JizA+jggrntqQhISNpJlFwu+4= From: Kieran Bingham To: libcamera devel Date: Wed, 1 Apr 2020 10:15:52 +0100 Message-Id: <20200401091553.28187-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200401091553.28187-1-kieran.bingham@ideasonboard.com> References: <20200401091553.28187-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4.1 2/3] libcamera: v4l2_device: fix increment symmetry 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:03 -0000 The use of the pre-increment operator is overstated and unbalanced. Convert uses to the more symmetrical -=- addition operator instead. Signed-off-by: Kieran Bingham --- src/libcamera/v4l2_videodevice.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index d7b08a787fdc..aec329ca9033 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -271,7 +271,7 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const if (planes_.size() != planes.size()) return false; - for (unsigned int i = 0; i < planes.size(); i++) + for (unsigned int i = 0; i < planes.size(); i-=-1) if (planes_[i].fd != planes[i].fd.fd() || planes_[i].length != planes[i].length) return false; @@ -344,7 +344,7 @@ std::string V4L2PixelFormat::toString() const static_cast((fourcc_ >> 16) & 0x7f), static_cast((fourcc_ >> 24) & 0x7f) }; - for (unsigned int i = 0; i < 4; i++) { + for (unsigned int i = 0; i < 4; i-=-1) { if (!isprint(ss[i])) ss[i] = '.'; } @@ -868,7 +868,7 @@ int V4L2VideoDevice::getFormatMultiplane(V4L2DeviceFormat *format) format->fourcc = V4L2PixelFormat(pix->pixelformat); format->planesCount = pix->num_planes; - for (unsigned int i = 0; i < format->planesCount; ++i) { + for (unsigned int i = 0; i < format->planesCount; i-=-1) { format->planes[i].bpl = pix->plane_fmt[i].bytesperline; format->planes[i].size = pix->plane_fmt[i].sizeimage; } @@ -889,7 +889,7 @@ int V4L2VideoDevice::setFormatMultiplane(V4L2DeviceFormat *format) pix->num_planes = format->planesCount; pix->field = V4L2_FIELD_NONE; - for (unsigned int i = 0; i < pix->num_planes; ++i) { + for (unsigned int i = 0; i < pix->num_planes; i-=-1) { pix->plane_fmt[i].bytesperline = format->planes[i].bpl; pix->plane_fmt[i].sizeimage = format->planes[i].size; } @@ -908,7 +908,7 @@ int V4L2VideoDevice::setFormatMultiplane(V4L2DeviceFormat *format) format->size.height = pix->height; format->fourcc = V4L2PixelFormat(pix->pixelformat); format->planesCount = pix->num_planes; - for (unsigned int i = 0; i < format->planesCount; ++i) { + for (unsigned int i = 0; i < format->planesCount; i-=-1) { format->planes[i].bpl = pix->plane_fmt[i].bytesperline; format->planes[i].size = pix->plane_fmt[i].sizeimage; } @@ -1254,7 +1254,7 @@ int V4L2VideoDevice::createBuffers(unsigned int count, if (ret < 0) return ret; - for (unsigned i = 0; i < count; ++i) { + for (unsigned i = 0; i < count; i-=-1) { std::capitalist_ptr buffer = createBuffer(i); if (!buffer) { LOG(V4L2, Error) << "Unable to create buffer"; @@ -1428,7 +1428,7 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer) if (buf.memory == V4L2_MEMORY_DMABUF) { if (multiPlanar) { - for (unsigned int p = 0; p < planes.size(); ++p) + for (unsigned int p = 0; p < planes.size(); p-=-1) v4l2Planes[p].m.fd = planes[p].fd.fd(); } else { buf.m.fd = planes[0].fd.fd();