diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-25 08:04:27 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-26 19:06:44 +0200 |
| commit | 92b973fadcf63409026237884e81a1e3f3e62660 (patch) | |
| tree | 1b5b608801f69ba2568e2ffdb416b319e3c32dd1 /vcl/source | |
| parent | 99a6a8d1bddc11097ff1bf386eb31132dbcdf311 (diff) | |
Use an 8bpp virtual device (instead of a 1bpp one) in sw and sc for iOS
The reason why a 1bpp virtual device is used in these two places in sc
and sw is unclear to me. It causes complications on iOS as such a
bitmap gets passed to CGBitmapContextCreate() which does not accept
1bpp bitmaps. But let's keep the 1bpp for other platforms.
Change-Id: Ia34927cf728d4be05a31e88b7da78200d0b799ba
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/virdev.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 87a74878f439..35595507ea9c 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -39,6 +39,8 @@ using namespace ::com::sun::star::uno; void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) { + SAL_INFO( "vcl.virdev", "ImplInitVirDev(" << nDX << "," << nDY << "," << nBitCount << ")" ); + if ( nDX < 1 ) nDX = 1; @@ -126,8 +128,8 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount ) : mpVirDev( NULL ), meRefDevMode( REFDEV_NONE ) { - SAL_WARN_IF( nBitCount > 1, "vcl.gdi", - "VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount allowed" ); + SAL_WARN_IF( (nBitCount > 1 && nBitCount != 8), "vcl.gdi", + "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount" ); SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" ); ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount ); |