diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 17:24:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 20:47:02 +0000 |
| commit | 36fcdd5fd4f719dec7ff46593ebaab3995908324 (patch) | |
| tree | 49b4d55b13e287fa3a23dfedeba2a43ef381c131 /vcl/headless | |
| parent | bd25d89b7e6daf2a050d7f7ad996af2f083daca0 (diff) | |
devices are always top-down now
and remove some more unused out of tests code
Change-Id: Ie63b03d1de754038d5477112ddfc9266dbf93709
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpbmp.cxx | 12 | ||||
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 3b93e59f9341..6ef56848dee4 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -51,7 +51,7 @@ bool SvpSalBitmap::Create( const Size& rSize, if( aSize.getY() == 0 ) aSize.setY( 1 ); if( nBitCount > 8 ) - m_aBitmap = createBitmapDevice( aSize, true, nFormat ); + m_aBitmap = createBitmapDevice(aSize, nFormat); else { // prepare palette @@ -64,10 +64,9 @@ bool SvpSalBitmap::Create( const Size& rSize, const BitmapColor& rCol = rPalette[i]; (*pPalette)[i] = basebmp::Color( rCol.GetRed(), rCol.GetGreen(), rCol.GetBlue() ); } - m_aBitmap = createBitmapDevice( aSize, true, nFormat, + m_aBitmap = createBitmapDevice( aSize, nFormat, basebmp::RawMemorySharedArray(), - basebmp::PaletteMemorySharedVector( pPalette ) - ); + basebmp::PaletteMemorySharedVector(pPalette) ); } return true; } @@ -260,8 +259,8 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) pBuf->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; break; } - if( m_aBitmap->isTopDown() ) - pBuf->mnFormat |= BMP_FORMAT_TOP_DOWN; + + pBuf->mnFormat |= BMP_FORMAT_TOP_DOWN; B2IVector aSize = m_aBitmap->getSize(); pBuf->mnWidth = aSize.getX(); @@ -357,7 +356,6 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode } m_aBitmap = basebmp::createBitmapDevice( m_aBitmap->getSize(), - m_aBitmap->isTopDown(), m_aBitmap->getScanlineFormat(), m_aBitmap->getBuffer(), pPal ); diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index fa553b480b13..390ed8fc03fe 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1079,7 +1079,7 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR, SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) { basegfx::B2IVector aSize(nWidth, nHeight); - basebmp::BitmapDeviceSharedPtr aCopy = createBitmapDevice(aSize, true, SVP_CAIRO_FORMAT); + basebmp::BitmapDeviceSharedPtr aCopy = createBitmapDevice(aSize, SVP_CAIRO_FORMAT); cairo_surface_t* target = SvpSalGraphics::createCairoSurface(aCopy); cairo_t* cr = cairo_create(target); |