diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-05 13:24:28 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-06 13:38:00 +0100 |
commit | b0fd921441e1e1066e232282843317514375c8ec (patch) | |
tree | 5dda07ff12936d864e651172f293d72022f99e89 /vcl/inc | |
parent | 08c0a761036427c15d3df13a671abe432654f90d (diff) |
convert tolerance params to sal_uInt8 (second try)
first attempt was in commit e75abe6e0a4ea250366bb29c0ece697e9b1b80a1,
reverted in 7accac097688832d8682a88a0176c3e1482ffade
Change-Id: I460e9ab5fcca3a99656e5d8434fa04c2387d7183
Reviewed-on: https://gerrit.libreoffice.org/47463
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/headless/svpbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/quartz/salbmp.h | 2 | ||||
-rw-r--r-- | vcl/inc/salbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salbmp.h | 2 | ||||
-rw-r--r-- | vcl/inc/win/salbmp.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 884d9d13aecc..efdd2c2bb2af 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -59,7 +59,7 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index a6212693498e..9465771332e8 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -69,7 +69,7 @@ public: bool ImplScalingSupported() const; bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); - bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ); + bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ); bool ImplConvert( BmpConversion eConversion ); }; diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 999df6b321a2..5c4fcd053464 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -76,7 +76,7 @@ public: bool ScalingSupported() const override; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; bool ConvertToGreyscale() override; public: diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index a4dca65c0ee3..d7c2fb74db51 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -76,7 +76,7 @@ public: bool ScalingSupported() const override; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; private: // quartz helper diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index a1014700a68a..a9bddd078004 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -66,7 +66,7 @@ public: virtual bool ScalingSupported() const = 0; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0; + virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) = 0; virtual bool ConvertToGreyscale() { diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index a2dd587a4964..3f45cd5d853c 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -146,7 +146,7 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; }; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index 33d88bb92a30..f139a8608b30 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -97,7 +97,7 @@ public: virtual bool ScalingSupported() const override; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override; - virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override; + virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol ) override; }; #endif // INCLUDED_VCL_INC_WIN_SALBMP_H |