diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-10 10:37:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-10 10:37:24 +0200 |
commit | f136890dc01260bde611b4c121ddf119281cf5b4 (patch) | |
tree | ca50d042c8c2b54b614e50abc877aadb36d4930b /include | |
parent | e842914ae3ec6109e889cfc4d0387192a68d2907 (diff) |
Clean up AlphaMask::CopyPixel "override" hack
...that required undefined downcasts of Bitmap objects that are not actually AlphaMasks.
Change-Id: I629f4a81d40a2a85cd877ffec13445786ef58187
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/alpha.hxx | 3 | ||||
-rw-r--r-- | include/vcl/bitmap.hxx | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 483f7492a9ae..de3b4513e4f8 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -105,9 +105,6 @@ public: Bitmap GetBitmap() const; - bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, - const AlphaMask* pAlphaSrc = NULL); - bool Erase( sal_uInt8 cTransparency ); bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency ); bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 8dd71252a9c8..d2f0cac3bcde 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -512,6 +512,9 @@ public: const Rectangle& rRectSrc, const Bitmap* pBmpSrc = NULL ); + bool CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangle& rRectSrc, + const Bitmap* pBmpSrc = NULL); + /** Perform boolean operations with another bitmap @param rMask |