[Libreoffice-commits] core.git: vcl/inc vcl/unx
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Wed Apr 7 15:40:48 UTC 2021
vcl/inc/salgdi.hxx | 247 +++++++++++++++++++++++++++++++
vcl/inc/unx/genpspgraphics.h | 101 ------------
vcl/unx/generic/print/genpspgraphics.cxx | 240 ------------------------------
3 files changed, 248 insertions(+), 340 deletions(-)
New commits:
commit 5a251208fe423b8f102886368da0e7e9dddc1a9c
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Apr 7 10:15:09 2021 +0900
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Apr 7 17:40:04 2021 +0200
vcl: class to automatically delegate calls to SalGraphicImpl
A class for SalGraphic backends that delegates all the graphic
drawing calls to SalGraphicImpl.
Use this for GenPspGraphics.
Change-Id: I0461259802732e9107d9011608530f1ffe2891ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113733
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 175123342318..6cd814164059 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -667,6 +667,253 @@ bool SalGraphics::UpdateSettings(AllSettings& rSettings)
void SalGraphics::handleDamage(const tools::Rectangle&) {}
+
+class VCL_DLLPUBLIC SalGraphicsAutoDelegateToImpl : public SalGraphics
+{
+public:
+ sal_uInt16 GetBitCount() const override
+ {
+ return GetImpl()->GetBitCount();
+ }
+
+ tools::Long GetGraphicsWidth() const override
+ {
+ return GetImpl()->GetGraphicsWidth();
+ }
+
+ void ResetClipRegion() override
+ {
+ GetImpl()->ResetClipRegion();
+ }
+
+ bool setClipRegion( const vcl::Region& i_rClip ) override
+ {
+ return GetImpl()->setClipRegion(i_rClip);
+ }
+
+ void SetLineColor() override
+ {
+ GetImpl()->SetLineColor();
+ }
+
+ void SetLineColor( Color nColor ) override
+ {
+ GetImpl()->SetLineColor(nColor);
+ }
+
+ void SetFillColor() override
+ {
+ GetImpl()->SetFillColor();
+ }
+
+ void SetFillColor( Color nColor ) override
+ {
+ GetImpl()->SetFillColor (nColor);
+ }
+
+ void SetROPLineColor(SalROPColor aColor) override
+ {
+ GetImpl()->SetROPLineColor(aColor);
+ }
+
+ void SetROPFillColor( SalROPColor aColor) override
+ {
+ GetImpl()->SetROPFillColor(aColor);
+ }
+
+ void SetXORMode(bool bSet, bool bInvertOnly) override
+ {
+ GetImpl()->SetXORMode(bSet, bInvertOnly);
+ }
+
+ void drawPixel( tools::Long nX, tools::Long nY ) override
+ {
+ GetImpl()->drawPixel(nX, nY);
+ }
+
+ void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override
+ {
+ GetImpl()->drawPixel(nX, nY, nColor);
+ }
+
+ void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override
+ {
+ GetImpl()->drawLine(nX1, nY1, nX2, nY2);
+ }
+
+ void drawRect( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY ) override
+ {
+ GetImpl()->drawRect(nX, nY, nDX, nDY);
+ }
+
+ void drawPolyLine( sal_uInt32 nPoints, const Point *pPtAry ) override
+ {
+ GetImpl()->drawPolyLine(nPoints, pPtAry);
+ }
+
+ void drawPolygon( sal_uInt32 nPoints, const Point* pPtAry ) override
+ {
+ GetImpl()->drawPolygon(nPoints, pPtAry);
+ }
+
+ void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints, const Point** pPtAry) override
+ {
+ GetImpl()->drawPolyPolygon (nPoly, pPoints, pPtAry);
+ }
+
+ bool drawPolyPolygon(
+ const basegfx::B2DHomMatrix& rObjectToDevice,
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ double fTransparency) override
+ {
+ return GetImpl()->drawPolyPolygon(rObjectToDevice, rPolyPolygon, fTransparency);
+ }
+
+ bool drawPolyLine(
+ const basegfx::B2DHomMatrix& rObjectToDevice,
+ const basegfx::B2DPolygon& rPolygon,
+ double fTransparency,
+ double fLineWidth,
+ const std::vector< double >* pStroke,
+ basegfx::B2DLineJoin eJoin,
+ css::drawing::LineCap eLineCap,
+ double fMiterMinimumAngle,
+ bool bPixelSnapHairline) override
+ {
+ return GetImpl()->drawPolyLine(rObjectToDevice, rPolygon, fTransparency, fLineWidth, pStroke, eJoin, eLineCap, fMiterMinimumAngle, bPixelSnapHairline);
+ }
+
+ bool drawPolyLineBezier( sal_uInt32 nPoints, const Point* pPtAry, const PolyFlags* pFlgAry ) override
+ {
+ return GetImpl()->drawPolyLineBezier(nPoints, pPtAry, pFlgAry);
+ }
+
+ bool drawPolygonBezier( sal_uInt32 nPoints, const Point* pPtAry, const PolyFlags* pFlgAry ) override
+ {
+ return GetImpl()->drawPolygonBezier(nPoints, pPtAry, pFlgAry);
+ }
+
+ bool drawPolyPolygonBezier( sal_uInt32 nPoly,
+ const sal_uInt32* pPoints,
+ const Point* const* pPtAry,
+ const PolyFlags* const* pFlgAry) override
+ {
+ return GetImpl()->drawPolyPolygonBezier(nPoly, pPoints, pPtAry, pFlgAry);
+ }
+
+ void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+ SalInvert nFlags) override
+ {
+ GetImpl()->invert(nX, nY, nWidth, nHeight, nFlags);
+ }
+
+ void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override
+ {
+ GetImpl()->invert(nPoints, pPtAry, nFlags);
+ }
+
+ bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth,
+ tools::Long nHeight, void* pPtr, sal_uInt32 nSize) override
+ {
+ return GetImpl()->drawEPS(nX, nY, nWidth, nHeight, pPtr, nSize);
+ }
+
+ void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override
+ {
+ GetImpl()->copyBits(rPosAry, pSrcGraphics);
+ }
+
+ void copyArea (tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX,
+ tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight,
+ bool bWindowInvalidate) override
+ {
+ GetImpl()->copyArea(nDestX, nDestY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, bWindowInvalidate);
+ }
+
+ void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override
+ {
+ GetImpl()->drawBitmap(rPosAry, rSalBitmap);
+ }
+
+ void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap) override
+ {
+ GetImpl()->drawBitmap(rPosAry, rSalBitmap, rMaskBitmap);
+ }
+
+ void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor) override
+ {
+ GetImpl()->drawMask(rPosAry, rSalBitmap, nMaskColor);
+ }
+
+ std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight) override
+ {
+ return GetImpl()->getBitmap(nX, nY, nWidth, nHeight);
+ }
+
+ Color getPixel(tools::Long nX, tools::Long nY) override
+ {
+ return GetImpl()->getPixel(nX, nY);
+ }
+
+ bool blendBitmap(const SalTwoRect& rPosAry, const SalBitmap& rBitmap) override
+ {
+ return GetImpl()->blendBitmap(rPosAry, rBitmap);
+ }
+
+ bool blendAlphaBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSourceBitmap,
+ const SalBitmap& rMaskBitmap, const SalBitmap& rAlphaBitmap) override
+ {
+ return GetImpl()->blendAlphaBitmap(rPosAry, rSourceBitmap, rMaskBitmap, rAlphaBitmap);
+ }
+
+ bool drawAlphaBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSourceBitmap,
+ const SalBitmap& rAlphaBitmap) override
+ {
+ return GetImpl()->drawAlphaBitmap(rPosAry, rSourceBitmap, rAlphaBitmap);
+ }
+
+ bool drawTransformedBitmap(const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap, double fAlpha) override
+ {
+ return GetImpl()->drawTransformedBitmap(rNull, rX, rY, rSourceBitmap, pAlphaBitmap, fAlpha);
+ }
+
+ bool hasFastDrawTransformedBitmap() const override
+ {
+ return GetImpl()->hasFastDrawTransformedBitmap();
+ }
+
+ bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
+ tools::Long nHeight, sal_uInt8 nTransparency) override
+ {
+ return GetImpl()->drawAlphaRect(nX, nY, nWidth, nHeight, nTransparency);
+ }
+
+ bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override
+ {
+ return GetImpl()->drawGradient(rPolygon, rGradient);
+ }
+
+ bool implDrawGradient(basegfx::B2DPolyPolygon const& rPolyPolygon,
+ SalGradient const& rGradient) override
+ {
+ return GetImpl()->implDrawGradient(rPolyPolygon, rGradient);
+ }
+
+ bool supportsOperation(OutDevSupportType eType) const override
+ {
+ return GetImpl()->supportsOperation(eType);
+ }
+
+ OUString getRenderBackendName() const override
+ {
+ return GetImpl()->getRenderBackendName();
+ }
+};
+
#endif // INCLUDED_VCL_INC_SALGDI_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 6c6c60cdf762..1185ed9abb21 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -39,7 +39,7 @@ class FontAttributes;
class SalInfoPrinter;
class ImplFontMetricData;
-class VCL_DLLPUBLIC GenPspGraphics final : public SalGraphics
+class VCL_DLLPUBLIC GenPspGraphics final : public SalGraphicsAutoDelegateToImpl
{
std::unique_ptr<GenPspGfxBackend> m_pBackend;
@@ -75,19 +75,6 @@ public:
}
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
- virtual sal_uInt16 GetBitCount() const override;
- virtual tools::Long GetGraphicsWidth() const override;
-
- virtual void ResetClipRegion() override;
- virtual bool setClipRegion( const vcl::Region& ) override;
-
- virtual void SetLineColor() override;
- virtual void SetLineColor( Color nColor ) override;
- virtual void SetFillColor() override;
- virtual void SetFillColor( Color nColor ) override;
- virtual void SetXORMode( bool bSet, bool ) override;
- virtual void SetROPLineColor( SalROPColor nROPColor ) override;
- virtual void SetROPFillColor( SalROPColor nROPColor ) override;
virtual void SetTextColor( Color nColor ) override;
virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override;
@@ -120,95 +107,9 @@ public:
virtual std::unique_ptr<GenericSalLayout>
GetTextLayout(int nFallbackLevel) override;
virtual void DrawTextLayout( const GenericSalLayout& ) override;
- virtual bool supportsOperation( OutDevSupportType ) const override;
- virtual void drawPixel( tools::Long nX, tools::Long nY ) override;
- virtual void drawPixel( tools::Long nX, tools::Long nY, Color nColor ) override;
- virtual void drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 ) override;
- virtual void drawRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
- virtual void drawPolyLine( sal_uInt32 nPoints, const Point* pPtAry ) override;
- virtual void drawPolygon( sal_uInt32 nPoints, const Point* pPtAry ) override;
- virtual void drawPolyPolygon( sal_uInt32 nPoly,
- const sal_uInt32* pPoints,
- const Point** pPtAry ) override;
-
- virtual bool drawPolyPolygon(
- const basegfx::B2DHomMatrix& rObjectToDevice,
- const basegfx::B2DPolyPolygon&,
- double fTransparency) override;
-
- virtual bool drawPolyLine(
- const basegfx::B2DHomMatrix& rObjectToDevice,
- const basegfx::B2DPolygon&,
- double fTransparency,
- double fLineWidth,
- const std::vector< double >* pStroke, // MM01
- basegfx::B2DLineJoin,
- css::drawing::LineCap,
- double fMiterMinimumAngle,
- bool bPixelSnapHairline) override;
- virtual bool drawPolyLineBezier( sal_uInt32 nPoints,
- const Point* pPtAry,
- const PolyFlags* pFlgAry ) override;
- virtual bool drawPolygonBezier( sal_uInt32 nPoints,
- const Point* pPtAry,
- const PolyFlags* pFlgAry ) override;
- virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly,
- const sal_uInt32* pPoints,
- const Point* const* pPtAry,
- const PolyFlags* const* pFlgAry ) override;
-
- virtual void copyArea( tools::Long nDestX,
- tools::Long nDestY,
- tools::Long nSrcX,
- tools::Long nSrcY,
- tools::Long nSrcWidth,
- tools::Long nSrcHeight,
- bool bWindowInvalidate) override;
- virtual void copyBits( const SalTwoRect& rPosAry,
- SalGraphics* pSrcGraphics ) override;
- virtual void drawBitmap( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap ) override;
- virtual void drawBitmap( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
- const SalBitmap& rTransparentBitmap ) override;
- virtual void drawMask( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
- Color nMaskColor ) override;
- virtual std::shared_ptr<SalBitmap> getBitmap( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override;
- virtual Color getPixel( tools::Long nX, tools::Long nY ) override;
- virtual void invert( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
- SalInvert nFlags ) override;
- virtual void invert( sal_uInt32 nPoints, const Point* pPtAry,
- SalInvert nFlags ) override;
-
- virtual bool drawEPS( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
- void* pPtr, sal_uInt32 nSize ) override;
- virtual bool blendBitmap( const SalTwoRect&,
- const SalBitmap& rBitmap ) override;
- virtual bool blendAlphaBitmap( const SalTwoRect&,
- const SalBitmap& rSrcBitmap,
- const SalBitmap& rMaskBitmap,
- const SalBitmap& rAlphaBitmap ) override;
- virtual bool drawAlphaBitmap( const SalTwoRect&,
- const SalBitmap& rSourceBitmap,
- const SalBitmap& rAlphaBitmap ) override;
- virtual bool drawTransformedBitmap( const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap,
- double fAlpha) override;
- virtual bool hasFastDrawTransformedBitmap() const override;
- virtual bool drawAlphaRect( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
- sal_uInt8 nTransparency ) override;
-
- virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override;
- virtual bool implDrawGradient(basegfx::B2DPolyPolygon const& rPolyPolygon, SalGradient const& rGradient) override;
virtual SystemGraphicsData GetGraphicsData() const override;
- virtual OUString getRenderBackendName() const override { return "genpsp"; }
-
#if ENABLE_CAIRO_CANVAS
virtual bool SupportsCairo() const override;
virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 0d255e2ec79d..92baa37f1011 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -86,193 +86,6 @@ void GenPspGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY )
}
}
-sal_uInt16 GenPspGraphics::GetBitCount() const
-{
- return m_pBackend->GetBitCount();
-}
-
-tools::Long GenPspGraphics::GetGraphicsWidth() const
-{
- return m_pBackend->GetGraphicsWidth();
-}
-
-void GenPspGraphics::ResetClipRegion()
-{
- m_pBackend->ResetClipRegion();
-}
-
-bool GenPspGraphics::setClipRegion( const vcl::Region& i_rClip )
-{
- return m_pBackend->setClipRegion(i_rClip);
-}
-
-void GenPspGraphics::SetLineColor()
-{
- m_pBackend->SetLineColor();
-}
-
-void GenPspGraphics::SetLineColor( Color nColor )
-{
- m_pBackend->SetLineColor(nColor);
-}
-
-void GenPspGraphics::SetFillColor()
-{
- m_pBackend->SetFillColor();
-}
-
-void GenPspGraphics::SetFillColor( Color nColor )
-{
- m_pBackend->SetFillColor (nColor);
-}
-
-void GenPspGraphics::SetROPLineColor(SalROPColor aColor)
-{
- m_pBackend->SetROPLineColor(aColor);
-}
-
-void GenPspGraphics::SetROPFillColor( SalROPColor aColor)
-{
- m_pBackend->SetROPFillColor(aColor);
-}
-
-void GenPspGraphics::SetXORMode(bool bSet, bool bInvertOnly)
-{
- m_pBackend->SetXORMode(bSet, bInvertOnly);
-}
-
-void GenPspGraphics::drawPixel( tools::Long nX, tools::Long nY )
-{
- m_pBackend->drawPixel(nX, nY);
-}
-
-void GenPspGraphics::drawPixel( tools::Long nX, tools::Long nY, Color nColor )
-{
- m_pBackend->drawPixel(nX, nY, nColor);
-}
-
-void GenPspGraphics::drawLine( tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2 )
-{
- m_pBackend->drawLine(nX1, nY1, nX2, nY2);
-}
-
-void GenPspGraphics::drawRect( tools::Long nX, tools::Long nY, tools::Long nDX, tools::Long nDY )
-{
- m_pBackend->drawRect(nX, nY, nDX, nDY);
-}
-
-void GenPspGraphics::drawPolyLine( sal_uInt32 nPoints, const Point *pPtAry )
-{
- m_pBackend->drawPolyLine(nPoints, pPtAry);
-}
-
-void GenPspGraphics::drawPolygon( sal_uInt32 nPoints, const Point* pPtAry )
-{
- m_pBackend->drawPolygon(nPoints, pPtAry);
-}
-
-void GenPspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
- const sal_uInt32 *pPoints,
- const Point* *pPtAry )
-{
- m_pBackend->drawPolyPolygon (nPoly, pPoints, pPtAry);
-}
-
-bool GenPspGraphics::drawPolyPolygon(
- const basegfx::B2DHomMatrix& rObjectToDevice,
- const basegfx::B2DPolyPolygon& rPolyPolygon,
- double fTransparency)
-{
- return m_pBackend->drawPolyPolygon(rObjectToDevice, rPolyPolygon, fTransparency);
-}
-
-bool GenPspGraphics::drawPolyLine(
- const basegfx::B2DHomMatrix& rObjectToDevice,
- const basegfx::B2DPolygon& rPolygon,
- double fTransparency,
- double fLineWidth,
- const std::vector< double >* pStroke, // MM01
- basegfx::B2DLineJoin eJoin,
- css::drawing::LineCap eLineCap,
- double fMiterMinimumAngle,
- bool bPixelSnapHairline)
-{
- return m_pBackend->drawPolyLine(rObjectToDevice, rPolygon, fTransparency, fLineWidth, pStroke, eJoin, eLineCap, fMiterMinimumAngle, bPixelSnapHairline);
-}
-
-bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const Point* pPtAry, const PolyFlags* pFlgAry )
-{
- return m_pBackend->drawPolyLineBezier(nPoints, pPtAry, pFlgAry);
-}
-
-bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const Point* pPtAry, const PolyFlags* pFlgAry )
-{
- return m_pBackend->drawPolygonBezier(nPoints, pPtAry, pFlgAry);
-}
-
-bool GenPspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly,
- const sal_uInt32* pPoints,
- const Point* const* pPtAry,
- const PolyFlags* const* pFlgAry )
-{
- return m_pBackend->drawPolyPolygonBezier(nPoly, pPoints, pPtAry, pFlgAry);
-}
-
-void GenPspGraphics::invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
- SalInvert nFlags)
-{
- m_pBackend->invert(nX, nY, nWidth, nHeight, nFlags);
-}
-
-void GenPspGraphics::invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags)
-{
- m_pBackend->invert(nPoints, pPtAry, nFlags);
-}
-
-bool GenPspGraphics::drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth,
- tools::Long nHeight, void* pPtr, sal_uInt32 nSize)
-{
- return m_pBackend->drawEPS(nX, nY, nWidth, nHeight, pPtr, nSize);
-}
-
-void GenPspGraphics::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics)
-{
- m_pBackend->copyBits(rPosAry, pSrcGraphics);
-}
-
-void GenPspGraphics::copyArea (tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX,
- tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight,
- bool bWindowInvalidate)
-{
- m_pBackend->copyArea(nDestX, nDestY, nSrcX, nSrcY, nSrcWidth, nSrcHeight, bWindowInvalidate);
-}
-
-void GenPspGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap)
-{
- m_pBackend->drawBitmap(rPosAry, rSalBitmap);
-}
-
-void GenPspGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap)
-{
-
- m_pBackend->drawBitmap(rPosAry, rSalBitmap, rMaskBitmap);
-}
-
-void GenPspGraphics::drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, Color nMaskColor)
-{
- m_pBackend->drawMask(rPosAry, rSalBitmap, nMaskColor);
-}
-
-std::shared_ptr<SalBitmap> GenPspGraphics::getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight)
-{
- return m_pBackend->getBitmap(nX, nY, nWidth, nHeight);
-}
-
-Color GenPspGraphics::getPixel(tools::Long nX, tools::Long nY)
-{
- return m_pBackend->getPixel(nX, nY);
-}
-
namespace {
class ImplPspFontData : public FreetypeFontFace
@@ -621,59 +434,6 @@ void GenPspGraphics::AnnounceFonts( PhysicalFontCollection* pFontCollection, con
pFontCollection->Add( pFD.get() );
}
-bool GenPspGraphics::blendBitmap(const SalTwoRect& rPosAry, const SalBitmap& rBitmap)
-{
- return m_pBackend->blendBitmap(rPosAry, rBitmap);
-}
-
-bool GenPspGraphics::blendAlphaBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSourceBitmap,
- const SalBitmap& rMaskBitmap, const SalBitmap& rAlphaBitmap)
-{
- return m_pBackend->blendAlphaBitmap(rPosAry, rSourceBitmap, rMaskBitmap, rAlphaBitmap);
-}
-
-bool GenPspGraphics::drawAlphaBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSourceBitmap,
- const SalBitmap& rAlphaBitmap)
-{
- return m_pBackend->drawAlphaBitmap(rPosAry, rSourceBitmap, rAlphaBitmap);
-}
-
-bool GenPspGraphics::drawTransformedBitmap(const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap, double fAlpha)
-{
- return m_pBackend->drawTransformedBitmap(rNull, rX, rY, rSourceBitmap, pAlphaBitmap, fAlpha);
-}
-
-bool GenPspGraphics::hasFastDrawTransformedBitmap() const
-{
- return m_pBackend->hasFastDrawTransformedBitmap();
-}
-
-bool GenPspGraphics::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
- tools::Long nHeight, sal_uInt8 nTransparency)
-{
- return m_pBackend->drawAlphaRect(nX, nY, nWidth, nHeight, nTransparency);
-}
-
-bool GenPspGraphics::drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient)
-{
- return m_pBackend->drawGradient(rPolygon, rGradient);
-}
-
-bool GenPspGraphics::implDrawGradient(basegfx::B2DPolyPolygon const& rPolyPolygon,
- SalGradient const& rGradient)
-{
- return m_pBackend->implDrawGradient(rPolyPolygon, rGradient);
-}
-
-bool GenPspGraphics::supportsOperation(OutDevSupportType eType) const
-{
- return m_pBackend->supportsOperation(eType);
-}
-
SystemGraphicsData GenPspGraphics::GetGraphicsData() const
{
return SystemGraphicsData();
More information about the Libreoffice-commits
mailing list