summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-10 00:29:21 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-18 18:13:05 +0300
commite7f446e1edcc6afc47287d49030280e335fe6838 (patch)
tree761261f83a0d18dd63bf4da2a0fc2dc983ea95d8
parent9c907813321612e245ecdd25950959e8efbe9872 (diff)
libcamera: geometry: Sort classes alphabetically
Move the Size class before the SizeRange class. No functional change. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--include/libcamera/geometry.h30
-rw-r--r--src/libcamera/geometry.cpp58
2 files changed, 44 insertions, 44 deletions
diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
index f41017aa..7704ab5a 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 d63eceaf..1f875bbe 100644
--- a/src/libcamera/geometry.cpp
+++ b/src/libcamera/geometry.cpp
@@ -63,6 +63,35 @@ const std::string Rectangle::toString() const
}
/**
+ * \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 */