diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 11:29:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-21 11:29:48 -0700 |
commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/common/math_util.h | |
parent | 2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff) | |
parent | 0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (diff) |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/common/math_util.h')
-rw-r--r-- | src/common/math_util.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h index d44b06e74..41d89666c 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h @@ -8,22 +8,20 @@ #include <cstdlib> #include <type_traits> -namespace MathUtil -{ +namespace MathUtil { -inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start1, unsigned length1) { +inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start1, + unsigned length1) { return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); } -template<typename T> -inline T Clamp(const T val, const T& min, const T& max) -{ +template <typename T> +inline T Clamp(const T val, const T& min, const T& max) { return std::max(min, std::min(max, val)); } -template<class T> -struct Rectangle -{ +template <class T> +struct Rectangle { T left; T top; T right; @@ -31,10 +29,15 @@ struct Rectangle Rectangle() {} - Rectangle(T left, T top, T right, T bottom) : left(left), top(top), right(right), bottom(bottom) {} + Rectangle(T left, T top, T right, T bottom) + : left(left), top(top), right(right), bottom(bottom) {} - T GetWidth() const { return std::abs(static_cast<typename std::make_signed<T>::type>(right - left)); } - T GetHeight() const { return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top)); } + T GetWidth() const { + return std::abs(static_cast<typename std::make_signed<T>::type>(right - left)); + } + T GetHeight() const { + return std::abs(static_cast<typename std::make_signed<T>::type>(bottom - top)); + } }; -} // namespace MathUtil +} // namespace MathUtil |