make ScanlineStride an argument to createBitmapDevice

so we could create bitmap devices that have the same stride that cairo expects,
provide getBitmapDeviceStrideForWidth to get a default value

Change-Id: I7ecc6f54a734b3f6bed59c699ac3b482c4ad7c47

1 files changed, 5 insertions, 5 deletions

diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index b075399d27e2..ef6e1ab2679a 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -151,13 +151,13 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
         }
 
         // construct alpha mask from raw bitmap
-        const B2IVector aSize(
-            pGcpHelper->maRawBitmap.mnScanlineSize,
-            pGcpHelper->maRawBitmap.mnHeight );
-        if( aSize.getX() && aSize.getY() )
+        if (pGcpHelper->maRawBitmap.mnScanlineSize && pGcpHelper->maRawBitmap.mnHeight)
         {
+            const B2IVector aSize(
+                pGcpHelper->maRawBitmap.mnScanlineSize,
+                pGcpHelper->maRawBitmap.mnHeight );
             static PaletteMemorySharedVector aDummyPAL;
-            pGcpHelper->maBitmapDev = createBitmapDevice( aSize, true, nBmpFormat, pGcpHelper->maRawBitmap.mpBits, aDummyPAL );
+            pGcpHelper->maBitmapDev = createBitmapDevice( aSize, true, nBmpFormat, aSize.getX(), pGcpHelper->maRawBitmap.mpBits, aDummyPAL );
         }
 
         rGlyphData.ExtDataRef().meInfo = nBmpFormat;