diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-13 15:11:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-16 09:25:50 +0000 |
| commit | 7dd6b261853ad53207fe5c367f98c4db1dfd54dc (patch) | |
| tree | 076e35af0001bac6f1590ed77df5f0618a0740df /vcl/headless/svpvd.cxx | |
| parent | 8569c6d0ad70c32a08774fa6f5ec25b465ea98ee (diff) | |
use cairo-compatible top-down direction virtual devices everywhere
that way we can use cairo to text render etc onto our basebmp-backed
headless/gtk3 virtual devices
Change-Id: I91002b610b72a4fe1d2094a57c5cb1b6b5d69cb1
Reviewed-on: https://gerrit.libreoffice.org/19957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/headless/svpvd.cxx')
| -rw-r--r-- | vcl/headless/svpvd.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 4ed3fc5909a2..fab2c153fa49 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -52,12 +52,11 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics ) bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY ) { - return SetSizeUsingBuffer( nNewDX, nNewDY, basebmp::RawMemorySharedArray(), false ); + return SetSizeUsingBuffer(nNewDX, nNewDY, basebmp::RawMemorySharedArray()); } bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, - const basebmp::RawMemorySharedArray &pBuffer, - const bool bTopDown ) + const basebmp::RawMemorySharedArray &pBuffer ) { B2IVector aDevSize( nNewDX, nNewDY ); if( aDevSize.getX() == 0 ) @@ -76,14 +75,14 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, std::vector< basebmp::Color > aDevPal(2); aDevPal[0] = basebmp::Color( 0, 0, 0 ); aDevPal[1] = basebmp::Color( 0xff, 0xff, 0xff ); - m_aDevice = createBitmapDevice( aDevSize, bTopDown, nFormat, nStride, + m_aDevice = createBitmapDevice( aDevSize, true, nFormat, nStride, PaletteMemorySharedVector( new std::vector< basebmp::Color >(aDevPal) ) ); } else { m_aDevice = pBuffer ? - createBitmapDevice( aDevSize, bTopDown, nFormat, nStride, pBuffer, PaletteMemorySharedVector() ) - : createBitmapDevice( aDevSize, bTopDown, nFormat, nStride ); + createBitmapDevice( aDevSize, true, nFormat, nStride, pBuffer, PaletteMemorySharedVector() ) + : createBitmapDevice( aDevSize, true, nFormat, nStride ); } // update device in existing graphics |