From 935aec66ae50ec2448e052c95757b2a83e3999ba Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 15 Jul 2020 01:43:34 +0300 Subject: libcamera: geometry: Define Rectangle after Size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A subsequent change to the Rectangle will require the definition of the Size to be available. Define Rectangle after Size to ease review of that change. No code change is included. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/geometry.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h index d217cfd5..f3088d33 100644 --- a/include/libcamera/geometry.h +++ b/include/libcamera/geometry.h @@ -13,21 +13,6 @@ namespace libcamera { -struct Rectangle { - int x; - int y; - unsigned int width; - unsigned int height; - - const std::string toString() const; -}; - -bool operator==(const Rectangle &lhs, const Rectangle &rhs); -static inline bool operator!=(const Rectangle &lhs, const Rectangle &rhs) -{ - return !(lhs == rhs); -} - struct Size { Size() : Size(0, 0) @@ -141,6 +126,21 @@ static inline bool operator!=(const SizeRange &lhs, const SizeRange &rhs) return !(lhs == rhs); } +struct Rectangle { + int x; + int y; + unsigned int width; + unsigned int height; + + const std::string toString() const; +}; + +bool operator==(const Rectangle &lhs, const Rectangle &rhs); +static inline bool operator!=(const Rectangle &lhs, const Rectangle &rhs) +{ + return !(lhs == rhs); +} + } /* namespace libcamera */ #endif /* __LIBCAMERA_GEOMETRY_H__ */ -- cgit v1.2.1