diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-17 16:32:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-17 20:13:21 +0200 |
| commit | f4351535f3bf10b94cccc721ab395e2c7f5010a4 (patch) | |
| tree | 19c18c568867d47918fad11b5c2bd70459cf74cc /drawinglayer/source/texture | |
| parent | 13db6e8671c36e1a028d6a8ad63f518e60f84870 (diff) | |
Consolidate: basegfx::clamp -> o3tl::clamp
Change-Id: Iffd8b0a19d4479b6c70dc834c6f64499e87e01b1
Reviewed-on: https://gerrit.libreoffice.org/59265
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'drawinglayer/source/texture')
| -rw-r--r-- | drawinglayer/source/texture/texture.cxx | 5 | ||||
| -rw-r--r-- | drawinglayer/source/texture/texture3d.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index cf10feab336d..d8cd40e4e919 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -21,6 +21,7 @@ #include <basegfx/numeric/ftools.hxx> #include <basegfx/utils/gradienttools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <o3tl/clamp.hxx> #include <converters.hxx> @@ -697,8 +698,8 @@ namespace drawinglayer double fOffsetX, double fOffsetY) : maRange(rRange), - mfOffsetX(basegfx::clamp(fOffsetX, 0.0, 1.0)), - mfOffsetY(basegfx::clamp(fOffsetY, 0.0, 1.0)) + mfOffsetX(o3tl::clamp(fOffsetX, 0.0, 1.0)), + mfOffsetY(o3tl::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 c021c336bb2c..67e7ed56da19 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -18,6 +18,7 @@ */ #include <drawinglayer/texture/texture3d.hxx> +#include <o3tl/clamp.hxx> #include <vcl/bitmapaccess.hxx> #include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx> #include <sal/log.hxx> @@ -288,8 +289,8 @@ namespace drawinglayer double fOffsetX, double fOffsetY) : GeoTexSvxBitmapEx(rBitmapEx, rRange), - mfOffsetX(basegfx::clamp(fOffsetX, 0.0, 1.0)), - mfOffsetY(basegfx::clamp(fOffsetY, 0.0, 1.0)), + mfOffsetX(o3tl::clamp(fOffsetX, 0.0, 1.0)), + mfOffsetY(o3tl::clamp(fOffsetY, 0.0, 1.0)), mbUseOffsetX(!basegfx::fTools::equalZero(mfOffsetX)), mbUseOffsetY(!mbUseOffsetX && !basegfx::fTools::equalZero(mfOffsetY)) { |