diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-02-26 05:48:46 +1100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 07:13:31 +0100 |
| commit | ea05b6595b2d0c8106249b08f3529b4574bdfdf5 (patch) | |
| tree | 72122ce4ea9f6eb1dff38ce8720edf296668c542 /include | |
| parent | 3400424877032595490f38711b5e8520ed889fee (diff) | |
vcl: remove init and destroy functions from Bitmap{Info|Read}Access
Nothing else ever calls them except the constructor and destructors of
the BitmapInfoAccess class itself - thus there is no real need for
them to exist.
Change-Id: Ib9a78dc5ed67b11c837f2c347ad74d0164e91770
Reviewed-on: https://gerrit.libreoffice.org/50324
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/bitmapaccess.hxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index 37eaef6dcda9..5403cea3e783 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -35,7 +35,7 @@ class VCL_DLLPUBLIC BitmapInfoAccess friend class BitmapReadAccess; public: - BitmapInfoAccess(Bitmap& rBitmap); + BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode = BitmapAccessMode::Info); virtual ~BitmapInfoAccess(); bool operator!() const @@ -146,12 +146,6 @@ protected: BitmapBuffer* mpBuffer; ColorMask maColorMask; BitmapAccessMode mnAccessMode; - - SAL_DLLPRIVATE void ImplCreate(Bitmap& rBitmap); - SAL_DLLPRIVATE void ImplDestroy(); - -protected: - BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode); }; @@ -160,7 +154,7 @@ class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess friend class BitmapWriteAccess; public: - BitmapReadAccess(Bitmap& rBitmap); + BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode = BitmapAccessMode::Read); virtual ~BitmapReadAccess() override; Scanline GetBuffer() const @@ -243,7 +237,6 @@ protected: FncGetPixel mFncGetPixel; FncSetPixel mFncSetPixel; - SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap const & rBitmap ); SAL_DLLPRIVATE bool ImplSetAccessPointers( ScanlineFormat nFormat ); public: @@ -285,8 +278,6 @@ public: static void SetPixelForN32BitTcRgba(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN32BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); -protected: - BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode); }; |