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 /drawinglayer/source/texture | |
| 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 'drawinglayer/source/texture')
| -rw-r--r-- | drawinglayer/source/texture/texture.cxx | 9 | ||||
| -rw-r--r-- | drawinglayer/source/texture/texture3d.cxx | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index d8cd40e4e919..c2d1a5468e78 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -17,11 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <algorithm> + #include <drawinglayer/texture/texture.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/utils/gradienttools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <o3tl/clamp.hxx> #include <converters.hxx> @@ -698,8 +701,8 @@ namespace drawinglayer double fOffsetX, double fOffsetY) : maRange(rRange), - mfOffsetX(o3tl::clamp(fOffsetX, 0.0, 1.0)), - mfOffsetY(o3tl::clamp(fOffsetY, 0.0, 1.0)) + mfOffsetX(std::clamp(fOffsetX, 0.0, 1.0)), + mfOffsetY(std::clamp(fOffsetY, 0.0, 1.0)) { if(!basegfx::fTools::equalZero(mfOffsetX)) { diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index 68d2826bfa46..74c0766ad51c 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -17,8 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <algorithm> + #include <drawinglayer/texture/texture3d.hxx> -#include <o3tl/clamp.hxx> #include <vcl/bitmapaccess.hxx> #include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx> #include <sal/log.hxx> @@ -289,8 +292,8 @@ namespace drawinglayer double fOffsetX, double fOffsetY) : GeoTexSvxBitmapEx(rBitmapEx, rRange), - mfOffsetX(o3tl::clamp(fOffsetX, 0.0, 1.0)), - mfOffsetY(o3tl::clamp(fOffsetY, 0.0, 1.0)), + mfOffsetX(std::clamp(fOffsetX, 0.0, 1.0)), + mfOffsetY(std::clamp(fOffsetY, 0.0, 1.0)), mbUseOffsetX(!basegfx::fTools::equalZero(mfOffsetX)), mbUseOffsetY(!mbUseOffsetX && !basegfx::fTools::equalZero(mfOffsetY)) { |