summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-06-10 12:34:39 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-06-11 14:41:50 +0100
commit03b4c0e0724f9928e00abd822bd846c6e200fa14 (patch)
treeed130afaa90f5ed6ac3a3705f6639cccb06c3381 /vcl/inc
parent056c7b46d42c9cb891cb269a2561f1cf34cafe10 (diff)
Revert "fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830"
This reverts commit 46e53913e9dcc84ffed8fb5f1b4959c70c7e5649. Conflicts: vcl/inc/salbmp.hxx vcl/source/gdi/gdimtf.cxx vcl/unx/generic/gdi/salgdi2.cxx Change-Id: Ifa893b687c724ea71655aa4e084a44858695073e
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/salbmp.hxx1
-rw-r--r--vcl/inc/unx/salbmp.h3
-rw-r--r--vcl/inc/unx/salgdi.h5
3 files changed, 0 insertions, 9 deletions
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 09b40d9b74f4..7c3839a9d9ca 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -47,7 +47,6 @@ public:
virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
Size& rSize,
bool bMask = false ) = 0;
- virtual bool HasAlpha() const { return false; }
virtual void Destroy() = 0;
virtual Size GetSize() const = 0;
virtual sal_uInt16 GetBitCount() const = 0;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index ea69da44d611..4b72fcf3fe67 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -75,7 +75,6 @@ private:
BitmapBuffer* mpDIB;
ImplSalDDB* mpDDB;
bool mbGrey;
- bool mbHasAlpha;
public:
@@ -150,8 +149,6 @@ public:
virtual BitmapBuffer* AcquireBuffer( bool bReadOnly );
virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
virtual bool GetSystemData( BitmapSystemData& rData );
- virtual bool HasAlpha() const { return mbHasAlpha; }
- virtual void SetHasAlpha( bool bHasAlpha ) { mbHasAlpha = bHasAlpha; }
};
// --------------
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 84834e39b3d7..3a20ff6a338c 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -322,11 +322,6 @@ public:
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap );
- bool drawAlphaBitmapOpt( const SalTwoRect&,
- const SalBitmap& rSourceBitmap,
- const SalBitmap& rAlphaBitmap,
- bool bUseAlphaBitmap = true );
-
virtual bool drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency );