summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/bmpacc.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2018-02-26 05:48:46 +1100
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-26 07:13:31 +0100
commitea05b6595b2d0c8106249b08f3529b4574bdfdf5 (patch)
tree72122ce4ea9f6eb1dff38ce8720edf296668c542 /vcl/source/gdi/bmpacc.cxx
parent3400424877032595490f38711b5e8520ed889fee (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 'vcl/source/gdi/bmpacc.cxx')
-rw-r--r--vcl/source/gdi/bmpacc.cxx40
1 files changed, 5 insertions, 35 deletions
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;