[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source

[Andras Timar]

 desktop/source/lib/init.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6b4cffc4593f8137f1820069296e882df357fb51
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Sun Dec 13 19:50:54 2015 +0100

    build fix
    
    Change-Id: I4be6445ff49d04e9e2f4146b4f5536770249fb84

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 48881e1..efd5d10 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1573,7 +1573,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
             if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
                 continue;
 
-            VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
+            VirtualDevice aDevice(nullptr, Size(1, 1), 0);
             ::Rectangle aRect;
             vcl::Font aFont(rInfo);
             aFont.SetSize(Size(0, 25));
@@ -1587,11 +1587,12 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
             unsigned char* pBuffer = static_cast<unsigned char*>(malloc(4 * 
nFontWidth * nFontHeight));
             memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
             boost::shared_array<sal_uInt8> aBuffer(pBuffer, NoDelete< 
sal_uInt8 >());
+            boost::shared_array<sal_uInt8> aAlphaBuffer;
 
             aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
             aDevice.SetOutputSizePixelScaleOffsetAndBuffer(
                         Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
-                        aBuffer, nullptr);
+                        aBuffer, aAlphaBuffer);
             aDevice.DrawText(Point(0,0), aFontName);
 
             return pBuffer;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits