[libcamera-devel] [PATCH v3 04/13] libcamera: geometry: Sort classes alphabetically
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Thu Apr 18 16:14:28 CEST 2019
Move the Size class before the SizeRange class. No functional change.
Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
---
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 */
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list