vcl/headless/svpgdi.cxx | 26 -------------------------- vcl/inc/headless/svpgdi.hxx | 7 ------- 2 files changed, 33 deletions(-)
New commits: commit dd8ab22bd615bba1a5016f3b418157900bed921c Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Tue Dec 28 10:29:39 2021 +0900 Commit: Tomaž Vajngerl <qui...@gmail.com> CommitDate: Tue Jan 4 06:54:49 2022 +0100 vcl: move empty blendBitmap, hasFastDraw,.. to SvpGraphicsBackend Moves blendBitmap, blendAlphaBitmap, hasFastDrawTransformedBitmap, supportsOperation to the SvpGraphicsBackend. Most these are empty stub implementations that aren't supported by the backend. The exception is supportsOperation, which already had been implemented but not removed from svpgdi.*xx files. Change-Id: I240a803d9a8614f1c4ed763a8fc34296202045fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127843 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 4ec12998a163..eb8edacafbd3 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -57,16 +57,6 @@ # endif #endif -bool SvpSalGraphics::blendBitmap( const SalTwoRect&, const SalBitmap& /*rBitmap*/ ) -{ - return false; -} - -bool SvpSalGraphics::blendAlphaBitmap( const SalTwoRect&, const SalBitmap&, const SalBitmap&, const SalBitmap& ) -{ - return false; -} - namespace { cairo_format_t getCairoFormat(const BitmapBuffer& rBuffer) @@ -766,11 +756,6 @@ bool SvpSalGraphics::drawTransformedBitmap( return true; } -bool SvpSalGraphics::hasFastDrawTransformedBitmap() const -{ - return false; -} - bool SvpSalGraphics::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, sal_uInt8 nTransparency) { const bool bHasFill(m_aCairoCommon.m_aFillColor != SALCOLOR_NONE); @@ -1076,15 +1061,4 @@ SystemGraphicsData SvpSalGraphics::GetGraphicsData() const return SystemGraphicsData(); } -bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const -{ - switch (eType) - { - case OutDevSupportType::TransparentRect: - case OutDevSupportType::B2DDraw: - return true; - } - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 04c507f2d3f9..d304b355ab88 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -59,11 +59,6 @@ protected: std::unique_ptr<SvpGraphicsBackend> m_pBackend; protected: - 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, @@ -72,7 +67,6 @@ protected: 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; cairo_t* createTmpCompatibleCairoContext() const; @@ -110,7 +104,6 @@ public: virtual std::unique_ptr<GenericSalLayout> GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; - virtual bool supportsOperation( OutDevSupportType ) const override; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override;