[Libreoffice-commits] core.git: vcl/qa

Baptiste Daroussin bapt at FreeBSD.org
Thu Dec 10 23:27:45 PST 2015


 vcl/qa/cppunit/BitmapTest.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c68b47ea1aae449599c8a616b6240daaf4be1d61
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date:   Thu Dec 10 17:28:15 2015 +0100

    Fix test on FreeBSD which uses the same backend as Linux
    
    Change-Id: Ibc43b9f3d0fc9e343b0ff9abd627ee9afb881d69
    Reviewed-on: https://gerrit.libreoffice.org/20624
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index fe8c933..7813adb 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -70,7 +70,7 @@ void BitmapTest::testConvert()
     CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), aBitmap.GetBitCount());
     {
         Bitmap::ScopedReadAccess pReadAccess(aBitmap);
-#if defined LINUX
+#if defined LINUX || defined FREEBSD
         // 24 bit Bitmap on SVP backend uses 32bit BGRA format
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(32), pReadAccess->GetBitCount());
         CPPUNIT_ASSERT_EQUAL(sal_uLong(40), pReadAccess->GetScanlineSize());


More information about the Libreoffice-commits mailing list