diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-05 14:09:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:30 +0200 |
commit | b13fbd19b7282a1210a2e14bb5ede9ecdf944c1c (patch) | |
tree | 3db528acc23250ddcc3dbdc9b1e35a817d8de9ee /vcl/inc | |
parent | ba121a3269d17f87c6d09b9e46aaaf921af40ef6 (diff) |
convert BMP_SCALE constant to scoped enum
Change-Id: Ibc9f88d2588c028cd71aa86c26d970a73025ef22
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 | 4 | ||||
-rw-r--r-- | vcl/inc/salbmp.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/unx/salbmp.h | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index b0fc0769aa42..168852e3caf2 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -61,7 +61,7 @@ public: virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; - virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; + virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index aebc89f00338..0dc9ec8bc974 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -65,7 +65,7 @@ public: inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; } inline sal_uLong ImplGetChecksum() const { return mnChecksum; } - bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ); + bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); bool ImplReplace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ); }; diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 7536144e44ae..3df78c8b2051 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -81,7 +81,7 @@ public: bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; bool Erase( const Color& rFillColor ) SAL_OVERRIDE; - bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; + bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; public: @@ -108,7 +108,7 @@ private: public: - bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ); + bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); }; #endif // INCLUDED_VCL_INC_OPENGL_SALBMP_H diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 432c4df72c2a..f89f4171072e 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -32,6 +32,7 @@ class Color; class SalGraphics; class BitmapPalette; struct BitmapSystemData; +enum class BmpScaleFlag; class VCL_PLUGIN_PUBLIC SalBitmap { @@ -60,7 +61,7 @@ public: virtual bool Crop( const Rectangle& rRectPixel ) = 0; virtual bool Erase( const Color& rFillColor ) = 0; - virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) = 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; }; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 0dc5b362866f..65d85ba862e5 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -148,7 +148,7 @@ public: virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; - virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; + virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; }; |