diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 15:26:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 20:25:08 +0100 |
| commit | 27cd397b1a1a8a39843c093eff68c5ea6cb249e7 (patch) | |
| tree | ecf63804421b12987ae070a24a6ed967f29de1d8 /include/basegfx | |
| parent | 5b19be032c51e0f7489b29c2c98e484587ed0865 (diff) | |
Drop o3tl/clamp.hxx, use C++17 std::clamp instead
Change-Id: I5043c787dcc3b78bc7fdff130564801194e39f46
Reviewed-on: https://gerrit.libreoffice.org/66177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/basegfx')
| -rw-r--r-- | include/basegfx/color/bcolor.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx index 6a6c6886acb6..ef4857bba598 100644 --- a/include/basegfx/color/bcolor.hxx +++ b/include/basegfx/color/bcolor.hxx @@ -22,12 +22,11 @@ #include <sal/config.h> +#include <algorithm> #include <ostream> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/basegfxdllapi.h> -#include <o3tl/clamp.hxx> - namespace basegfx { @@ -155,9 +154,9 @@ namespace basegfx // clamp color to [0.0..1.0] values in all three intensity components BColor& clamp() { - mfX = o3tl::clamp(mfX, 0.0, 1.0); - mfY = o3tl::clamp(mfY, 0.0, 1.0); - mfZ = o3tl::clamp(mfZ, 0.0, 1.0); + mfX = std::clamp(mfX, 0.0, 1.0); + mfY = std::clamp(mfY, 0.0, 1.0); + mfZ = std::clamp(mfZ, 0.0, 1.0); return *this; } |