libreofficekit/qa/unit/tiledrendering.cxx | 4 ++-- sd/qa/unit/tiledrendering/tiledrendering.cxx | 4 ++-- sw/qa/extras/htmlexport/htmlexport2.cxx | 3 +-- sw/qa/extras/tiledrendering/tiledrendering.cxx | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit 8e6f240e3bc6d625d51d47a3a2610eccbc1c88aa Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 11:21:51 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 16:15:37 2025 +0200 BitmapEx->Bitmap in some test code now that Bitmap supports transparency Change-Id: I97ece0b597ef782fe7f1dea5daaaf728dc4c9b10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190480 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index 56d789b61e5e..91ea40823872 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -308,8 +308,8 @@ static void dumpRGBABitmap( const OUString& rPath, const unsigned char* pBuffer, BitmapScopedWriteAccess pWriteAccess( aBitmap ); memcpy( pWriteAccess->GetBuffer(), pBuffer, 4*nWidth*nHeight ); - BitmapEx aBitmapEx( aBitmap ); - vcl::PNGWriter aWriter( aBitmapEx ); + Bitmap aBitmap( aBitmap ); + vcl::PNGWriter aWriter( aBitmap ); SvFileStream sOutput( rPath, StreamMode::WRITE ); aWriter.Write( sOutput ); sOutput.Close(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index d56cd76e41e5..0c144ecdfd59 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -2696,12 +2696,12 @@ void debugWriteImageToFile(unsigned step, const std::vector<sal_uInt8>& pBuffer, #if false printf ("%u %s ", step, sJSON); - BitmapEx aBitmapEx = vcl::bitmap::CreateFromData(pBuffer.data(), nViewWidth, nViewHeight, nViewWidth * 4, /*nBitsPerPixel*/32, true, true); + Bitmap aBitmap = vcl::bitmap::CreateFromData(pBuffer.data(), nViewWidth, nViewHeight, nViewWidth * 4, /*nBitsPerPixel*/32, true, true); OUString sFileName = "/tmp/slideshow_" + OUString::number(step) + ".png"; SvFileStream aStream(sFileName, StreamMode::WRITE | StreamMode::TRUNC); vcl::PngImageWriter aPNGWriter(aStream); - aPNGWriter.write(aBitmapEx); + aPNGWriter.write(aBitmap); #endif } diff --git a/sw/qa/extras/htmlexport/htmlexport2.cxx b/sw/qa/extras/htmlexport/htmlexport2.cxx index afad233b166d..4376e05e9570 100644 --- a/sw/qa/extras/htmlexport/htmlexport2.cxx +++ b/sw/qa/extras/htmlexport/htmlexport2.cxx @@ -221,9 +221,8 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifOleBmpTransparent) Bitmap aBitmap; ReadDIB(aBitmap, aBitmapStream, /*bFileHeader=*/true); Size aBitmapSize = aBitmap.GetSizePixel(); - BitmapEx aBitmapEx(aBitmap); Color nActualColor - = aBitmapEx.GetPixelColor(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1); + = aBitmap.GetPixelColor(aBitmapSize.getWidth() - 1, aBitmapSize.getHeight() - 1); // Without the accompanying fix in place, this test would have failed with: // - Expected: Color: R:255 G:255 B:255 A:0 // - Actual : Color: R:0 G:0 B:0 A:0 diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 17530ce79f28..db762b1b6a04 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -3835,7 +3835,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSwitchingChartToDarkMode) #ifdef DBGDUMP SvFileStream aNew("/tmp/dump.png", StreamMode::WRITE | StreamMode::TRUNC); vcl::PngImageWriter aPNGWriter(aNew); - aPNGWriter.write(BitmapEx(aBitmap)); + aPNGWriter.write(aBitmap); #endif int nBlackPixels = 0;
