diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-12 11:01:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 11:34:08 +0000 |
| commit | 828b117624724647abea4f353343887747043390 (patch) | |
| tree | 7c05bf6bf78f34a97bcaa4c9407d2f3e6d34b1d3 /vcl | |
| parent | 13b987947918c01419ea1a64e2edc0ebd9133001 (diff) | |
route other drawBitmap through cairo
Change-Id: I18336a7b0479c9a57f0951daadac4dfed422e5c4
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 9fefa74490cf..7f068f049469 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1126,7 +1126,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR, cairo_surface_t* source = SvpSalGraphics::createCairoSurface(pSrc->m_aOrigDevice); if (!source) { - SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawBitmap case"); + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::copyBits case"); return; } @@ -1168,23 +1168,11 @@ void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceB copySource(rTR, source); } -void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, +void SvpSalGraphics::drawBitmap( const SalTwoRect& rTR, + const SalBitmap& rSourceBitmap, const SalBitmap& rTransparentBitmap ) { - const SvpSalBitmap& rSrc = static_cast<const SvpSalBitmap&>(rSalBitmap); - const SvpSalBitmap& rSrcTrans = static_cast<const SvpSalBitmap&>(rTransparentBitmap); - basegfx::B2IBox aSrcRect( rPosAry.mnSrcX, rPosAry.mnSrcY, - rPosAry.mnSrcX+rPosAry.mnSrcWidth, - rPosAry.mnSrcY+rPosAry.mnSrcHeight ); - basegfx::B2IBox aDestRect( rPosAry.mnDestX, rPosAry.mnDestY, - rPosAry.mnDestX+rPosAry.mnDestWidth, - rPosAry.mnDestY+rPosAry.mnDestHeight ); - SvpSalGraphics::ClipUndoHandle aUndo( this ); - if (!isClippedSetup(aDestRect, aUndo) && m_aDevice) - m_aDevice->drawMaskedBitmap( rSrc.getBitmap(), rSrcTrans.getBitmap(), - aSrcRect, aDestRect, basebmp::DrawMode::Paint, m_aClipMap ); - dbgOut( m_aDevice ); + drawAlphaBitmap(rTR, rSourceBitmap, rTransparentBitmap); } void SvpSalGraphics::drawMask( const SalTwoRect& rPosAry, |