From patchwork Thu Feb 12 15:12:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26138 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 C7597C3292 for ; Thu, 12 Feb 2026 15:12:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C21C0621D4; Thu, 12 Feb 2026 16:12:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="N53vYzML"; dkim-atps=neutral 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 DBB5C61FBF for ; Thu, 12 Feb 2026 16:12:42 +0100 (CET) Received: from killaraus.ideasonboard.com (2001-14ba-703d-e500--2a1.rev.dnainternet.fi [IPv6:2001:14ba:703d:e500::2a1]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 9F57D492 for ; Thu, 12 Feb 2026 16:11:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1770909114; bh=pLIahHSoKgx89GFUUhzUm0U6fkVG3MnV+qhO77A/azY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=N53vYzMLzxLTqBSo5H/pgk5O42kfPFz/49w5wyV2FlG04rRjQogWMBS9Iok9sR4ub gMrYkr5rUyEerzlpvmoA1KlHchLP60cqizoQiKVEZcnYsGvrT/rGjoKLSq/rBfV4ej gwDGKtodvX/HVECBM+n68DIdzngylLp2gFF110DE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH v2 2/4] libcamera: Replace iterators with range-based for loops Date: Thu, 12 Feb 2026 17:12:36 +0200 Message-ID: <20260212151238.3736234-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260212151238.3736234-1-laurent.pinchart@ideasonboard.com> References: <20260212151238.3736234-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 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" Use range-based for loops instead of iterators when iterating over a container. This improves readability. Signed-off-by: Laurent Pinchart --- include/libcamera/base/utils.h | 8 ++--- src/gstreamer/gstlibcamera-utils.cpp | 50 +++++++++++----------------- src/ipa/rpi/controller/rpi/agc.cpp | 4 +-- 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/include/libcamera/base/utils.h b/include/libcamera/base/utils.h index 4373bc20d42e..37f0d065f82f 100644 --- a/include/libcamera/base/utils.h +++ b/include/libcamera/base/utils.h @@ -110,13 +110,13 @@ std::string join(const Container &items, const std::string &sep, UnaryOp op) std::ostringstream ss; bool first = true; - for (auto it = std::begin(items); it != std::end(items); ++it) { + for (const auto &item : items) { if (!first) ss << sep; else first = false; - ss << op(*it); + ss << op(item); } return ss.str(); @@ -128,13 +128,13 @@ std::string join(const Container &items, const std::string &sep) std::ostringstream ss; bool first = true; - for (auto it = std::begin(items); it != std::end(items); ++it) { + for (const auto &item : items) { if (!first) ss << sep; else first = false; - ss << *it; + ss << item; } return ss.str(); diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index bfb094c94641..6541d478c83d 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -749,10 +749,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * switch (value.type()) { case ControlTypeBool: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_boolean(&x, *it); + g_value_set_boolean(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -762,10 +761,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeByte: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_uint(&x, *it); + g_value_set_uint(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -775,10 +773,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeUnsigned16: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_uint(&x, *it); + g_value_set_uint(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -788,10 +785,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeUnsigned32: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_uint(&x, *it); + g_value_set_uint(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -801,10 +797,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeInteger32: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_int(&x, *it); + g_value_set_int(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -827,10 +822,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeInteger64: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_int64(&x, *it); + g_value_set_int64(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -840,10 +834,9 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeFloat: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) { + for (const auto &item : value.get>()) { g_value_init(&x, type); - g_value_set_float(&x, *it); + g_value_set_float(&x, item); gst_value_array_append_and_take_value(&v, &x); } } else { @@ -862,27 +855,24 @@ int gst_libcamera_set_structure_field(GstStructure *structure, const ControlId * break; case ControlTypeSize: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) - gst_libcamera_gvalue_set_size(&v, *it); + for (const auto &item : value.get>()) + gst_libcamera_gvalue_set_size(&v, item); } else { gst_libcamera_gvalue_set_size(&v, value.get()); } break; case ControlTypePoint: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) - gst_libcamera_gvalue_set_point(&v, *it); + for (const auto &item : value.get>()) + gst_libcamera_gvalue_set_point(&v, item); } else { gst_libcamera_gvalue_set_point(&v, value.get()); } break; case ControlTypeRectangle: if (is_array) { - Span data = value.get>(); - for (auto it = data.begin(); it != data.end(); ++it) - gst_libcamera_gvalue_set_rectangle(&v, *it); + for (const auto &item : value.get>()) + gst_libcamera_gvalue_set_rectangle(&v, item); } else { gst_libcamera_gvalue_set_rectangle(&v, value.get()); } diff --git a/src/ipa/rpi/controller/rpi/agc.cpp b/src/ipa/rpi/controller/rpi/agc.cpp index afda2e364f64..a8d91f43df29 100644 --- a/src/ipa/rpi/controller/rpi/agc.cpp +++ b/src/ipa/rpi/controller/rpi/agc.cpp @@ -45,10 +45,10 @@ int Agc::read(const libcamera::YamlObject ¶ms) } const auto &channels = params["channels"].asList(); - for (auto ch = channels.begin(); ch != channels.end(); ch++) { + for (const auto &ch : channels) { LOG(RPiAgc, Debug) << "Read AGC channel"; channelData_.emplace_back(); - int ret = channelData_.back().channel.read(*ch, getHardwareConfig()); + int ret = channelData_.back().channel.read(ch, getHardwareConfig()); if (ret) return ret; }