vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx | 17 +++++++++++++++++
vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx | 12 ++++++++++++
vcl/unx/generic/gdi/gdiimpl.cxx | 24 ------------------------
vcl/unx/generic/gdi/gdiimpl.hxx | 21 ---------------------
4 files changed, 29 insertions(+), 45 deletions(-)
New commits:
commit 6314c6b33dbe29fcba9d92157eaed42772d9c1fc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 10 14:40:37 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 11 10:03:11 2023 +0000
move more unimplemented stubs to X11CairoSalGraphicsImpl
Change-Id: Ic1b4cf481e48e609c9448523e381bd1f304087a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145274
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
index 752e70cc3a99..d703a5e5c93f 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -181,4 +181,21 @@ bool X11CairoSalGraphicsImpl::drawEPS(tools::Long,
tools::Long, tools::Long, too
return false;
}
+bool X11CairoSalGraphicsImpl::blendBitmap(const SalTwoRect&, const SalBitmap&)
{ return false; }
+
+bool X11CairoSalGraphicsImpl::blendAlphaBitmap(const SalTwoRect&, const
SalBitmap&,
+ const SalBitmap&, const
SalBitmap&)
+{
+ return false;
+}
+
+bool X11CairoSalGraphicsImpl::drawTransformedBitmap(const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
const SalBitmap&,
+ const SalBitmap*, double)
+{
+ // here direct support for transformed bitmaps can be implemented
+ return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index a70abab552c3..49b60f4c05c4 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -139,6 +139,18 @@ public:
bool hasFastDrawTransformedBitmap() const override;
+ /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
+ bool drawTransformedBitmap(const basegfx::B2DPoint& rNull, const
basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY, const SalBitmap&
rSourceBitmap,
+ const SalBitmap* pAlphaBitmap, double fAlpha)
override;
+
+ /** Blend bitmap with color channels */
+ bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override;
+
+ /** Render bitmap by blending using the mask and alpha channel */
+ bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap,
+ const SalBitmap& rMaskBitmap, const SalBitmap&
rAlphaBitmap) override;
+
bool supportsOperation(OutDevSupportType eType) const override;
};
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index e84ea8e1266e..5413c2b69980 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -367,18 +367,6 @@ void X11SalGraphicsImpl::drawMaskedBitmap( const
SalTwoRect& rPosAry,
XFreePixmap( pXDisp, aBG );
}
-bool X11SalGraphicsImpl::blendBitmap( const SalTwoRect&,
- const SalBitmap& )
-{
- return false;
-}
-
-bool X11SalGraphicsImpl::blendAlphaBitmap( const SalTwoRect&,
- const SalBitmap&, const SalBitmap&, const SalBitmap& )
-{
- return false;
-}
-
bool X11SalGraphicsImpl::drawAlphaBitmap( const SalTwoRect& rTR,
const SalBitmap& rSrcBitmap, const SalBitmap& rAlphaBmp )
{
@@ -511,18 +499,6 @@ bool X11SalGraphicsImpl::drawAlphaBitmap( const
SalTwoRect& rTR,
return true;
}
-bool X11SalGraphicsImpl::drawTransformedBitmap(
- const basegfx::B2DPoint&,
- const basegfx::B2DPoint&,
- const basegfx::B2DPoint&,
- const SalBitmap&,
- const SalBitmap*,
- double)
-{
- // here direct support for transformed bitmaps can be implemented
- return false;
-}
-
void X11SalGraphicsImpl::drawMask( const SalTwoRect& rPosAry,
const SalBitmap &rSalBitmap,
Color nMaskColor )
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 6832ddf61d09..771dcd039c9c 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -105,18 +105,6 @@ public:
virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long
nY, tools::Long nWidth, tools::Long nHeight ) override;
- /** Blend bitmap with color channels */
- virtual bool blendBitmap(
- const SalTwoRect&,
- const SalBitmap& rBitmap ) override;
-
- /** Render bitmap by blending using the mask and alpha channel */
- virtual bool blendAlphaBitmap(
- const SalTwoRect&,
- const SalBitmap& rSrcBitmap,
- const SalBitmap& rMaskBitmap,
- const SalBitmap& rAlphaBitmap ) override;
-
/** Render bitmap with alpha channel
@param rSourceBitmap
@@ -134,15 +122,6 @@ public:
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap ) override;
- /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the
coordinate system */
- virtual bool drawTransformedBitmap(
- const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap,
- double fAlpha) override;
-
public:
void Init() override;
};
