vcl/source/bitmap/dibtools.cxx | 2 +-
vcl/source/gdi/TypeSerializer.cxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a50aad83a6782b129e897c6520c4867fab49b906
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Aug 24 20:24:22 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Sun Aug 24 21:42:44 2025 +0200
BitmapEx->Bitmap in TypeSerializer
which flushes out a bug in the ReadDIBBitmapEx function
I introduced in
commit 3846485ba75c5f73fac4ab3e5bd7de582ced673b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Jul 30 15:32:40 2025 +0200
BitmapEx->Bitmap in TBCBitMap
Change-Id: Id762058a803ab0f3b27a594b8e18de378e6c250c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190141
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index d5e63c9138cf..97b3b7d49000 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -1698,7 +1698,7 @@ bool ReadDIBBitmapEx(
bool bMSOFormat)
{
Bitmap aBmp;
- if (!ImplReadDIB(aBmp, nullptr, rIStm, bFileHeader, bMSOFormat) &&
!rIStm.GetError())
+ if (!ImplReadDIB(aBmp, nullptr, rIStm, bFileHeader, bMSOFormat) ||
rIStm.GetError())
return false;
// base bitmap was read, set as return value and try to read alpha
extra-data
diff --git a/vcl/source/gdi/TypeSerializer.cxx
b/vcl/source/gdi/TypeSerializer.cxx
index 9ceaa7debfd9..6888f4469acf 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -208,12 +208,12 @@ void TypeSerializer::readGraphic(Graphic& rGraphic)
}
else
{
- BitmapEx aBitmapEx;
+ Bitmap aBitmap;
const SvStreamEndian nOldFormat = mrStream.GetEndian();
mrStream.SeekRel(-4);
mrStream.SetEndian(SvStreamEndian::LITTLE);
- ReadDIBBitmapEx(aBitmapEx, mrStream);
+ ReadDIBBitmapEx(aBitmap, mrStream);
if (!mrStream.GetError())
{
@@ -235,12 +235,12 @@ void TypeSerializer::readGraphic(Graphic& rGraphic)
// #108077# manually set loaded BmpEx to Animation
// (which skips loading its BmpEx if already done)
- aAnimation.SetBitmapEx(aBitmapEx);
+ aAnimation.SetBitmapEx(BitmapEx(aBitmap));
rGraphic = Graphic(aAnimation);
}
else
{
- rGraphic = Graphic(aBitmapEx);
+ rGraphic = Graphic(aBitmap);
}
}
else
