include/vcl/bitmapaccess.hxx | 13 ++-----------
vcl/source/gdi/bmpacc.cxx | 40 +++++-----------------------------------
2 files changed, 7 insertions(+), 46 deletions(-)
New commits:
commit ea05b6595b2d0c8106249b08f3529b4574bdfdf5
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Feb 26 05:48:46 2018 +1100
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.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
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);
};
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 74be5e1202b6..f5a218ccf464 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -30,23 +30,6 @@ BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap,
BitmapAccessMode nMode ) :
mpBuffer ( nullptr ),
mnAccessMode ( nMode )
{
- ImplCreate( rBitmap );
-}
-
-BitmapInfoAccess::BitmapInfoAccess( Bitmap& rBitmap ) :
- mpBuffer ( nullptr ),
- mnAccessMode ( BitmapAccessMode::Info )
-{
- ImplCreate( rBitmap );
-}
-
-BitmapInfoAccess::~BitmapInfoAccess()
-{
- ImplDestroy();
-}
-
-void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap )
-{
std::shared_ptr<ImpBitmap> xImpBmp = rBitmap.ImplGetImpBitmap();
SAL_WARN_IF( !xImpBmp, "vcl", "Forbidden Access to empty bitmap!" );
@@ -83,7 +66,7 @@ void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap )
}
}
-void BitmapInfoAccess::ImplDestroy()
+BitmapInfoAccess::~BitmapInfoAccess()
{
std::shared_ptr<ImpBitmap> xImpBmp = maBitmap.ImplGetImpBitmap();
@@ -104,23 +87,6 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap,
BitmapAccessMode nMode ) :
mFncGetPixel ( nullptr ),
mFncSetPixel ( nullptr )
{
- ImplInitScanBuffer( rBitmap );
-}
-
-BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) :
- BitmapInfoAccess( rBitmap, BitmapAccessMode::Read ),
- mFncGetPixel ( nullptr ),
- mFncSetPixel ( nullptr )
-{
- ImplInitScanBuffer( rBitmap );
-}
-
-BitmapReadAccess::~BitmapReadAccess()
-{
-}
-
-void BitmapReadAccess::ImplInitScanBuffer( Bitmap const & rBitmap )
-{
if (!mpBuffer)
return;
@@ -139,6 +105,10 @@ void BitmapReadAccess::ImplInitScanBuffer( Bitmap const &
rBitmap )
}
}
+BitmapReadAccess::~BitmapReadAccess()
+{
+}
+
bool BitmapReadAccess::ImplSetAccessPointers( ScanlineFormat nFormat )
{
bool bRet = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
