From patchwork Mon Apr 15 16:56:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 985 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 9339160DC5 for ; Mon, 15 Apr 2019 18:57:15 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2948A333 for ; Mon, 15 Apr 2019 18:57:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1555347435; bh=QLmAgOOBJVx6S+WNAS8PF9P2lAPAMIUz9033cnxeVd0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YAjLhx/K3okfXgGxcU1GXp0sNZNPun5Cnx16anoi/NkW62acr62Dy754k6KOCiECi eC/aFdFrYCvSttHeLfYOGNnuW2rVlKK6DsgvgPCQk7PuHUPRYfsKMxbaCWAx8Nqbai iBV1gMr0c8kKlg1ycwO+JlRMG7SR1I+Z5eBlbt3I= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 15 Apr 2019 19:56:53 +0300 Message-Id: <20190415165700.22970-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415165700.22970-1-laurent.pinchart@ideasonboard.com> References: <20190415165700.22970-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/11] libcamera: geometry: Sort classes alphabetically X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2019 16:57:17 -0000 Move the Size class before the SizeRange class. No functional change. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- include/libcamera/geometry.h | 30 +++++++++---------- src/libcamera/geometry.cpp | 58 ++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h index f41017aa47bf..7704ab5add21 100644 --- a/include/libcamera/geometry.h +++ b/include/libcamera/geometry.h @@ -21,6 +21,21 @@ struct Rectangle { const std::string toString() const; }; +struct Size { + Size() + : Size(0, 0) + { + } + + Size(unsigned int w, unsigned int h) + : width(w), height(h) + { + } + + unsigned int width; + unsigned int height; +}; + struct SizeRange { SizeRange() : SizeRange(0, 0, 0, 0) @@ -40,21 +55,6 @@ struct SizeRange { unsigned int maxHeight; }; -struct Size { - Size() - : Size(0, 0) - { - } - - Size(unsigned int w, unsigned int h) - : width(w), height(h) - { - } - - unsigned int width; - unsigned int height; -}; - } /* namespace libcamera */ #endif /* __LIBCAMERA_GEOMETRY_H__ */ diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index d63eceaf827b..1f875bbe5f48 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -62,6 +62,35 @@ const std::string Rectangle::toString() const return ss.str(); } +/** + * \struct Size + * \brief Describe a two-dimensional size + * + * The Size structure defines a two-dimensional size with integer precision. + */ + +/** + * \fn Size::Size() + * \brief Construct a Size with width and height set to 0 + */ + +/** + * \fn Size::Size(unsigned int width, unsigned int height) + * \brief Construct a Size with given \a width and \a height + * \param width The Size width + * \param height The Size height + */ + +/** + * \var Size::width + * \brief The Size width + */ + +/** + * \var Size::height + * \brief The Size height + */ + /** * \struct SizeRange * \brief Describe a range of image sizes @@ -105,33 +134,4 @@ const std::string Rectangle::toString() const * \brief The maximum image height */ -/** - * \struct Size - * \brief Describe a two-dimensional size - * - * The Size structure defines a two-dimensional size with integer precision. - */ - -/** - * \fn Size::Size() - * \brief Construct a Size with width and height set to 0 - */ - -/** - * \fn Size::Size(unsigned int width, unsigned int height) - * \brief Construct a Size with given \a width and \a height - * \param width The Size width - * \param height The Size height - */ - -/** - * \var Size::width - * \brief The Size width - */ - -/** - * \var Size::height - * \brief The Size height - */ - } /* namespace libcamera */