diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-09-30 17:11:32 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-07 17:04:37 +0200 |
| commit | a9a6e154301fef99fe294591e0b327ace7e0945f (patch) | |
| tree | 7858128c6c590adab49491f56d4c9df8209aa080 /vcl | |
| parent | a5b775c638c5631acb16363e37ee9c49d8835d0b (diff) | |
fix test for CanvasBitmap not handling N32BitTcMask bpp properly
Change-Id: Ic331d33e0f0feca1fde4425fdb4106b1a769194d
Reviewed-on: https://gerrit.libreoffice.org/80350
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index bd6f96b7ca95..48514580104b 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -84,10 +84,13 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, BitmapEx aContainedBmpEx( xBmp->getBitmapEx() ); Bitmap aContainedBmp( aContainedBmpEx.GetBitmap() ); int nDepth = nOriginalDepth; + int extraBpp = 0; { Bitmap::ScopedReadAccess pAcc( aContainedBmp ); nDepth = pAcc->GetBitCount(); + if( pAcc->GetScanlineFormat() == ScanlineFormat::N32BitTcMask ) + extraBpp = 8; // the format has 8 unused bits } CPPUNIT_ASSERT_EQUAL_MESSAGE( "Original bitmap size not (200,200)", @@ -106,7 +109,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, uno::Sequence<sal_Int8> aPixelData = xBmp->getData(aLayout, geometry::IntegerRectangle2D(0,0,1,1)); const sal_Int32 nExpectedBitsPerPixel( - aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth); + (aContainedBmpEx.IsTransparent() ? std::max(8,nDepth)+8 : nDepth) + extraBpp); CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanlines not 1", static_cast<sal_Int32>(1), aLayout.ScanLines); CPPUNIT_ASSERT_EQUAL_MESSAGE( "# scanline bytes mismatch", |