From patchwork Thu Jul 24 15:29:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 23948 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 9B5A6C3237 for ; Thu, 24 Jul 2025 15:29:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4728F6911B; Thu, 24 Jul 2025 17:29:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="W4RR+Khb"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9D33F69111 for ; Thu, 24 Jul 2025 17:29:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753370989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GE3y2yYFnJuaa26K/nYhD5BmAa9VJfwt1rxoAuG+Ncs=; b=W4RR+KhbYqJznqtrZ/mhJ8gB4BB0iYKWaEj1Gj/kjVGn6xsfLESEZHtMzD726B6cSkjESy 6ocmNudqOixfzmFDWFacSbYe3Qj716LPJiO3aAGu7Q8BQNSDH3cU7RAhHAWgGrJ9rm7VEi uDWwBBYtXm+v3y4L5E7oFly0ev+t6RI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-61-JaNl7-4HOTC8n0sBdV1g6Q-1; Thu, 24 Jul 2025 11:29:47 -0400 X-MC-Unique: JaNl7-4HOTC8n0sBdV1g6Q-1 X-Mimecast-MFC-AGG-ID: JaNl7-4HOTC8n0sBdV1g6Q_1753370986 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C234195FD06; Thu, 24 Jul 2025 15:29:46 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.255]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D649F300018D; Thu, 24 Jul 2025 15:29:44 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Kieran Bingham Subject: [PATCH v2 1/2] libcamera: geometry: Add Rectangle::croppedBy Date: Thu, 24 Jul 2025 17:29:35 +0200 Message-ID: <20250724152936.99830-2-mzamazal@redhat.com> In-Reply-To: <20250724152936.99830-1-mzamazal@redhat.com> References: <20250724152936.99830-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uQ8MaXrYsMmA94Xmi2UWsIbltx7k-QACLuHT3heocB8_1753370986 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true 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" Let's add a new Rectangle method that returns the coordinates of the central area of the original rectangle cropped by given numerator/denominator fraction. This is useful to specify a limited area of the image to operate on, for example computing statistics only from a reduced area for speedup. Signed-off-by: Milan Zamazal --- include/libcamera/geometry.h | 2 ++ src/libcamera/geometry.cpp | 19 +++++++++++++++++++ test/geometry.cpp | 9 +++++++++ 3 files changed, 30 insertions(+) diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h index f322e3d5b..603c9a117 100644 --- a/include/libcamera/geometry.h +++ b/include/libcamera/geometry.h @@ -297,6 +297,8 @@ public: [[nodiscard]] Rectangle scaledBy(const Size &numerator, const Size &denominator) const; [[nodiscard]] Rectangle translatedBy(const Point &point) const; + [[nodiscard]] Rectangle croppedBy(const unsigned int numerator, + const unsigned int denominator) const; Rectangle transformedBetween(const Rectangle &source, const Rectangle &target) const; diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 81cc8cd53..8ceb75698 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -837,6 +837,25 @@ Rectangle Rectangle::translatedBy(const Point &point) const return { x + point.x, y + point.y, width, height }; } +/** + * \brief Return a central area crop of the rectangle + * \param[in] numerator The numerator of the crop factor + * \param[in] denominator The denominator of the crop factor + * + * The rectangle of the central part of the original rectangle is computed, of + * numerator/denominator times the original width and height. + * + * \return The cropped Rectangle coordinates + */ +Rectangle Rectangle::croppedBy(const unsigned int numerator, + const unsigned int denominator) const +{ + unsigned int w = static_cast(width) * numerator / denominator; + unsigned int h = static_cast(height) * numerator / denominator; + + return Size(w, h).centeredTo(center()); +} + /** * \brief Transform a Rectangle from one reference rectangle to another * \param[in] source The \a source reference rectangle diff --git a/test/geometry.cpp b/test/geometry.cpp index 11df043b7..9864774f4 100644 --- a/test/geometry.cpp +++ b/test/geometry.cpp @@ -466,6 +466,15 @@ protected: return TestFail; } + /* Rectangle::croppedBy() tests */ + if (Rectangle(Size(300, 100)).croppedBy(2, 3) != + Rectangle(50, 17, 200, 66) || + Rectangle(-100, 100, 300, 700).croppedBy(3, 7) != + Rectangle(-14, 300, 128, 300)) { + cout << "Rectangle::croppedBy() test failed " << endl; + return TestFail; + } + /* Rectangle::translateBy() tests */ r = Rectangle(10, -20, 300, 400); r.translateBy(Point(-30, 40));