diff options
author | Armin Le Grand <Armin.Le.Grand@me.com> | 2021-12-10 16:36:11 +0100 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2021-12-10 17:51:12 +0100 |
commit | 2c6e2fa596d4ecb22adb062a837f1bbf4384fed2 (patch) | |
tree | f2a588a1bbaa54faf5633dfdcce8e199322d639c /vcl/unx | |
parent | 6494fba15ea93283b625bf6bdb4666709f22439f (diff) |
Revert "Re-Enable DrawTransformBitmapExDirect for render backends"
This reverts commit 7e5af164b7d293dd410710bed411e1ca64bbecf7.
Reason for revert: Not the best/effective way to clear out the stuff remaining to be done, would need additional stuff
Change-Id: Ia6ab90384da29a5e34eff0ab8881bad2ab49c58c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126601
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/print/GenPspGfxBackend.cxx | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 7c167255d33b..53226821b4a1 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -852,6 +852,11 @@ bool X11SalGraphicsImpl::drawTransformedBitmap( return false; } +bool X11SalGraphicsImpl::hasFastDrawTransformedBitmap() const +{ + return false; +} + bool X11SalGraphicsImpl::drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) { diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 56cfba5ba371..6257b47d613d 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -272,6 +272,8 @@ public: const SalBitmap* pAlphaBitmap, double fAlpha) override; + virtual bool hasFastDrawTransformedBitmap() const override; + /** Render solid rectangle with given transparency @param nTransparency diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 648de56744a0..cfdb272005a5 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -139,13 +139,14 @@ bool X11SalGraphics::drawTransformedBitmap( const SalBitmap* pAlphaBitmap, double fAlpha) { - // called mxImpl->drawTransformedBitmap anyways returns false, but spares a call - if( fAlpha != 1.0 ) - return false; - return mxImpl->drawTransformedBitmap( rNull, rX, rY, rSourceBitmap, pAlphaBitmap, fAlpha ); } +bool X11SalGraphics::hasFastDrawTransformedBitmap() const +{ + return mxImpl->hasFastDrawTransformedBitmap(); +} + bool X11SalGraphics::drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency ) { diff --git a/vcl/unx/generic/print/GenPspGfxBackend.cxx b/vcl/unx/generic/print/GenPspGfxBackend.cxx index 2201c54c69d8..7b461ff4f5c6 100644 --- a/vcl/unx/generic/print/GenPspGfxBackend.cxx +++ b/vcl/unx/generic/print/GenPspGfxBackend.cxx @@ -387,6 +387,8 @@ bool GenPspGfxBackend::drawTransformedBitmap(const basegfx::B2DPoint& /*rNull*/, return false; } +bool GenPspGfxBackend::hasFastDrawTransformedBitmap() const { return false; } + bool GenPspGfxBackend::drawAlphaRect(tools::Long /*nX*/, tools::Long /*nY*/, tools::Long /*nWidth*/, tools::Long /*nHeight*/, sal_uInt8 /*nTransparency*/) { |