vcl/win/gdi/salbmp.cxx | 46 ++++++++++------------------------------------
1 file changed, 10 insertions(+), 36 deletions(-)
New commits:
commit fee5ffe67ca3100a9fc2e4830aff2bea0d22591b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 24 11:33:17 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 24 12:20:51 2025 +0100
remove remnants of 16-bit bitmap support from windows backend
dead since
commit 78b9dac2ee77bf6efc1298962cbeca284db5b00a
Author: Noel Grandin <noelgran...@gmail.com>
Date: Tue Sep 24 21:38:51 2019 +0200
remove internal use of 16-bit packed formats
Change-Id: Iab6e4fc4b6bc4c83deac07d587bc8c996359e3d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180689
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index b7b1315159b4..d2f6fdbd265e 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -794,28 +794,15 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer(
BitmapAccessMode /*nMode*/ )
memcpy( pBuffer->maPalette.ImplGetColorBuffer(),
pBI->bmiColors, nPalCount * sizeof( RGBQUAD ) );
pBuffer->mpBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize + nPalCount * sizeof( RGBQUAD );
}
- else if( ( pBIH->biBitCount == 16 ) || ( pBIH->biBitCount ==
32 ) )
+ else if( pBIH->biBitCount == 32 )
{
- if( pBIH->biBitCount == 16 )
- {
- ColorMaskElement aRedMask(0x00007c00UL);
- aRedMask.CalcMaskShift();
- ColorMaskElement aGreenMask(0x000003e0UL);
- aGreenMask.CalcMaskShift();
- ColorMaskElement aBlueMask(0x0000001fUL);
- aBlueMask.CalcMaskShift();
- pBuffer->maColorMask = ColorMask(aRedMask, aGreenMask,
aBlueMask);
- }
- else
- {
- ColorMaskElement aRedMask(0x00ff0000UL);
- aRedMask.CalcMaskShift();
- ColorMaskElement aGreenMask(0x0000ff00UL);
- aGreenMask.CalcMaskShift();
- ColorMaskElement aBlueMask(0x000000ffUL);
- aBlueMask.CalcMaskShift();
- pBuffer->maColorMask = ColorMask(aRedMask, aGreenMask,
aBlueMask);
- }
+ ColorMaskElement aRedMask(0x00ff0000UL);
+ aRedMask.CalcMaskShift();
+ ColorMaskElement aGreenMask(0x0000ff00UL);
+ aGreenMask.CalcMaskShift();
+ ColorMaskElement aBlueMask(0x000000ffUL);
+ aBlueMask.CalcMaskShift();
+ pBuffer->maColorMask = ColorMask(aRedMask, aGreenMask,
aBlueMask);
pBuffer->mpBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize;
}
commit a1bda2919756c8a5ef5e7505614938033950f87c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 24 11:24:05 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 24 12:20:42 2025 +0100
BI_BITFIELDS in windows vcl backend is unused
all the way back to initial import
Change-Id: I2bfc75b2461496a1b7d127d211a7c358092ab2ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180688
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 3fe13d5254e3..b7b1315159b4 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -796,20 +796,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer(
BitmapAccessMode /*nMode*/ )
}
else if( ( pBIH->biBitCount == 16 ) || ( pBIH->biBitCount ==
32 ) )
{
- sal_uLong nOffset = 0;
-
- if( pBIH->biCompression == BI_BITFIELDS )
- {
- nOffset = 3 * sizeof( RGBQUAD );
- ColorMaskElement
aRedMask(*reinterpret_cast<UINT32*>(&pBI->bmiColors[ 0 ]));
- aRedMask.CalcMaskShift();
- ColorMaskElement
aGreenMask(*reinterpret_cast<UINT32*>(&pBI->bmiColors[ 1 ]));
- aGreenMask.CalcMaskShift();
- ColorMaskElement
aBlueMask(*reinterpret_cast<UINT32*>(&pBI->bmiColors[ 2 ]));
- aBlueMask.CalcMaskShift();
- pBuffer->maColorMask = ColorMask(aRedMask, aGreenMask,
aBlueMask);
- }
- else if( pBIH->biBitCount == 16 )
+ if( pBIH->biBitCount == 16 )
{
ColorMaskElement aRedMask(0x00007c00UL);
aRedMask.CalcMaskShift();
@@ -830,7 +817,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode
/*nMode*/ )
pBuffer->maColorMask = ColorMask(aRedMask, aGreenMask,
aBlueMask);
}
- pBuffer->mpBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize + nOffset;
+ pBuffer->mpBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize;
}
else
pBuffer->mpBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize;
