diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2024-11-20 15:55:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-11-21 13:11:04 +0100 |
commit | 75799dae6e85c1af047ae7051702b7913e2c0f28 (patch) | |
tree | e93874f28baae08e14fb597d7144862f60225d1f /vcl | |
parent | a44a406de423b3d69183cc2e23f1e5f121518fab (diff) |
use default implementation for drawEPS
so only the one that implements it needs to override it
Change-Id: I19e79c5746dbbebbf5914922587016fd03a902d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176848
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/headless/SvpGraphicsBackend.cxx | 6 | ||||
-rw-r--r-- | vcl/inc/headless/SvpGraphicsBackend.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/qt5/QtGraphics.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 9 | ||||
-rw-r--r-- | vcl/inc/salgdiimpl.hxx | 9 | ||||
-rw-r--r-- | vcl/inc/skia/gdiimpl.hxx | 3 | ||||
-rw-r--r-- | vcl/qt5/QtGraphics_GDI.cxx | 6 | ||||
-rw-r--r-- | vcl/skia/gdiimpl.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx | 3 | ||||
-rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 5 | ||||
-rw-r--r-- | vcl/win/gdi/gdiimpl.hxx | 6 |
12 files changed, 10 insertions, 55 deletions
diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx index c1210be0e557..029e65820209 100644 --- a/vcl/headless/SvpGraphicsBackend.cxx +++ b/vcl/headless/SvpGraphicsBackend.cxx @@ -211,12 +211,6 @@ void SvpGraphicsBackend::invert(sal_uInt32 nPoints, const Point* pPtAry, SalInve m_rCairoCommon.invert(nPoints, pPtAry, nFlags, getAntiAlias()); } -bool SvpGraphicsBackend::drawEPS(tools::Long /*nX*/, tools::Long /*nY*/, tools::Long /*nWidth*/, - tools::Long /*nHeight*/, void* /*pPtr*/, sal_uInt32 /*nSize*/) -{ - return false; -} - bool SvpGraphicsBackend::blendBitmap(const SalTwoRect& /*rPosAry*/, const SalBitmap& /*rBitmap*/) { return false; diff --git a/vcl/inc/headless/SvpGraphicsBackend.hxx b/vcl/inc/headless/SvpGraphicsBackend.hxx index a6f6f843482d..a631cb161e8b 100644 --- a/vcl/inc/headless/SvpGraphicsBackend.hxx +++ b/vcl/inc/headless/SvpGraphicsBackend.hxx @@ -102,9 +102,6 @@ public: void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, diff --git a/vcl/inc/qt5/QtGraphics.hxx b/vcl/inc/qt5/QtGraphics.hxx index eb1a870bb09f..4c7deb5d3f68 100644 --- a/vcl/inc/qt5/QtGraphics.hxx +++ b/vcl/inc/qt5/QtGraphics.hxx @@ -131,9 +131,6 @@ public: void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) override; - bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override; bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap, diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 6b2c35a35e36..26daad069101 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -517,11 +517,12 @@ protected: virtual void invert( sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags ) = 0; + /// Only implemented by the macOS Quartz backend and the MS-Windows GDI backend. virtual bool drawEPS( - tools::Long nX, tools::Long nY, - tools::Long nWidth, tools::Long nHeight, - void* pPtr, - sal_uInt32 nSize ) = 0; + tools::Long /*nX*/, tools::Long /*nY*/, + tools::Long /*nWidth*/, tools::Long /*nHeight*/, + void* /*pPtr*/, + sal_uInt32 /*nSize*/ ) { return false; } /** Blend the bitmap with the current buffer */ virtual bool blendBitmap( diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx index c79cf7ea14f3..4d76d9a41446 100644 --- a/vcl/inc/salgdiimpl.hxx +++ b/vcl/inc/salgdiimpl.hxx @@ -177,11 +177,12 @@ public: virtual void invert( sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags ) = 0; + /// Only implemented by the macOS Quartz backend and the MS-Windows GDI backend. virtual bool drawEPS( - tools::Long nX, tools::Long nY, - tools::Long nWidth, tools::Long nHeight, - void* pPtr, - sal_uInt32 nSize ) = 0; + tools::Long /*nX*/, tools::Long /*nY*/, + tools::Long /*nWidth*/, tools::Long /*nHeight*/, + void* /*pPtr*/, + sal_uInt32 /*nSize*/ ) { return false; } virtual bool blendBitmap( const SalTwoRect&, diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index 7fad579d0db2..c261e4af97c1 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -149,9 +149,6 @@ public: 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; - /** Render bitmap with alpha channel @param rSourceBitmap diff --git a/vcl/qt5/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx index 8e76741c5f30..5f411e2ebf30 100644 --- a/vcl/qt5/QtGraphics_GDI.cxx +++ b/vcl/qt5/QtGraphics_GDI.cxx @@ -570,12 +570,6 @@ void QtGraphicsBackend::invert(sal_uInt32 /*nPoints*/, const Point* /*pPtAry*/, { } -bool QtGraphicsBackend::drawEPS(tools::Long /*nX*/, tools::Long /*nY*/, tools::Long /*nWidth*/, - tools::Long /*nHeight*/, void* /*pPtr*/, sal_uInt32 /*nSize*/) -{ - return false; -} - bool QtGraphicsBackend::blendBitmap(const SalTwoRect&, const SalBitmap& /*rBitmap*/) { return false; diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index aa5a49ba602b..815c52b119f2 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1595,12 +1595,6 @@ void SkiaSalGraphicsImpl::invert(sal_uInt32 nPoints, const Point* pPointArray, S invert(aPolygon, eFlags); } -bool SkiaSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, - sal_uInt32) -{ - return false; -} - // Create SkImage from a bitmap and possibly an alpha mask (the usual VCL one-minus-alpha), // with the given target size. Result will be possibly cached, unless disabled. // Especially in raster mode scaling and alpha blending may be expensive if done repeatedly. diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx index acc9fc295523..9e822047f14e 100644 --- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx +++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx @@ -207,12 +207,6 @@ bool X11CairoSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const sal_uInt32 return false; } -bool X11CairoSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, - sal_uInt32) -{ - return false; -} - bool X11CairoSalGraphicsImpl::blendBitmap(const SalTwoRect&, const SalBitmap&) { return false; } bool X11CairoSalGraphicsImpl::blendAlphaBitmap(const SalTwoRect&, const SalBitmap&, diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx index f0376e3b0068..3a8948eedafe 100644 --- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx +++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx @@ -161,9 +161,6 @@ public: const Point* const* pPtAry, const PolyFlags* const* pFlgAry) override; - bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, - void* pPtr, sal_uInt32 nSize) 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, diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index dbd3b15b2916..beb3834459ec 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -235,11 +235,6 @@ WinSalGraphicsImpl::~WinSalGraphicsImpl() } } -bool WinSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, sal_uInt32) -{ - return false; -} - void WinSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { HDC hSrcDC; diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx index 980454ebc303..da0aa7672b73 100644 --- a/vcl/win/gdi/gdiimpl.hxx +++ b/vcl/win/gdi/gdiimpl.hxx @@ -182,12 +182,6 @@ public: 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; |