[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basebmp/test

[Damjan Jovanovic]

 basebmp/test/basictest.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea9ece87c56f943cce37f1662cb7932dcfc6281a
Author: Damjan Jovanovic <dam...@apache.org>
Date:   Sat Oct 31 13:44:11 2015 +0000

    Fix a unit test that doesn't compile on MacOS, breaking the build.
    
    Found-by: Pathangi Janardhanan Jatinshravan <JATINSHR001 at e dot ntu dot 
edu dot sg>
    Patch-by: Pathangi Janardhanan Jatinshravan <JATINSHR001 at e dot ntu dot 
edu dot sg>

diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 85d4aaa..03d08d0 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -92,7 +92,7 @@ TEST_F(BasicTest, testConstruction)
     ASSERT_TRUE( pDevice->isTopDown() == true ) << "Top down format";
     ASSERT_TRUE( pDevice->getScanlineFormat() == Format::ONE_BIT_MSB_PAL ) << 
"Scanline format";
     ASSERT_TRUE( pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 ) << 
"Scanline len";
-    ASSERT_TRUE( pDevice->getPalette() ) << "Palette existence";
+    ASSERT_TRUE( pDevice->getPalette() != NULL ) << "Palette existence";
     ASSERT_TRUE( (*pDevice->getPalette())[0] == Color(0) ) << "Palette entry 0 
is black";
     ASSERT_TRUE( (*pDevice->getPalette())[1] == Color(0xFFFFFFFF) ) << 
"Palette entry 1 is white";
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits