include/vcl/BitmapBuffer.hxx | 2 -
include/vcl/BitmapInfoAccess.hxx | 14 +------
include/vcl/BitmapReadAccess.hxx | 64 +++++++++++++-------------------
include/vcl/BitmapWriteAccess.hxx | 2 -
vcl/headless/CairoCommon.cxx | 1
vcl/inc/unx/saldisp.hxx | 1
vcl/quartz/salbmp.cxx | 1
vcl/skia/salbmp.cxx | 2 -
vcl/source/bitmap/BitmapReadAccess.cxx | 60 ++++++++++++------------------
vcl/source/bitmap/BitmapWriteAccess.cxx | 3 -
vcl/source/bitmap/dibtools.cxx | 3 +
vcl/source/gdi/salmisc.cxx | 29 +++++---------
vcl/win/gdi/salbmp.cxx | 1
13 files changed, 67 insertions(+), 116 deletions(-)
New commits:
commit bc5e9c0d0afe0e7ffeb3d2c4475852620b3fc2e2
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 24 13:26:52 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 24 14:18:50 2025 +0100
remove some unnececessary ColorMask includes and forwards
Change-Id: I33c43e14e962991f89b960cd10519cf1a37cb84e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180702
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index f14893617598..81bfc830780a 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -50,7 +50,6 @@ typedef unsigned long Pixel;
class BitmapPalette;
class SalFrame;
-class ColorMask;
namespace vcl_sal { class WMAdaptor; }
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 82ef64db8ebe..4c6c57874f04 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -31,7 +31,6 @@
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapColor.hxx>
#include <vcl/BitmapPalette.hxx>
-#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
#include <bitmap/bmpfast.hxx>
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx
b/vcl/source/bitmap/BitmapReadAccess.cxx
index 5503156e3d8d..b009534cd6f4 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -19,7 +19,6 @@
#include <vcl/BitmapReadAccess.hxx>
#include <vcl/BitmapTools.hxx>
-#include <vcl/ColorMask.hxx>
#include <salbmp.hxx>
#include <svdata.hxx>
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index c0f9bf49ba06..4559e22f30ed 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -21,7 +21,6 @@
#include <vcl/BitmapAccessMode.hxx>
#include <vcl/BitmapBuffer.hxx>
#include <vcl/BitmapPalette.hxx>
-#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <win/wincomp.hxx>
commit 2b6d1050ffe1c538426e8365802439e0c1b9f313
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 24 13:19:38 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 24 14:18:42 2025 +0100
no need to use ColorMask in BitmapBuffer
ever since
commit 291c6d7626278e0d0db1b0bcd9e7c911eb8eeb83
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jan 24 11:55:11 2025 +0200
no need to use color mask in QuartzSalBitmap::AcquireBuffer
Change-Id: I3bdd5ec96d69a8ee75d92c46040ec0b352de1f2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180701
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx
index 8b6322b730ad..b5444afc877b 100644
--- a/include/vcl/BitmapBuffer.hxx
+++ b/include/vcl/BitmapBuffer.hxx
@@ -26,7 +26,6 @@
#include <vcl/dllapi.h>
#include <vcl/BitmapPalette.hxx>
-#include <vcl/ColorMask.hxx>
#include <vcl/Scanline.hxx>
#include <tools/long.hxx>
@@ -41,7 +40,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
sal_uInt8* mpBits;
ScanlineFormat meFormat = ScanlineFormat::NONE;
ScanlineDirection meDirection = ScanlineDirection::BottomUp;
- ColorMask maColorMask;
sal_uInt16 mnBitCount;
};
diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx
index 4e6f38081f7e..e01c2aba7a8f 100644
--- a/include/vcl/BitmapInfoAccess.hxx
+++ b/include/vcl/BitmapInfoAccess.hxx
@@ -27,9 +27,8 @@
bool Bitmap32IsPreMultipled();
-typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, tools::Long nX,
const ColorMask& rMask);
-typedef void (*FncSetPixel)(Scanline pScanline, tools::Long nX, const
BitmapColor& rBitmapColor,
- const ColorMask& rMask);
+typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, tools::Long nX);
+typedef void (*FncSetPixel)(Scanline pScanline, tools::Long nX, const
BitmapColor& rBitmapColor);
class VCL_DLLPUBLIC BitmapInfoAccess
{
@@ -133,15 +132,6 @@ public:
/// of the required color. Returns SAL_MAX_UINT16 if nothing found.
sal_uInt16 GetMatchingPaletteIndex(const BitmapColor& rBitmapColor) const;
- const ColorMask& GetColorMask() const
- {
- const BitmapBuffer* pBuffer = mpBuffer;
-
- assert(pBuffer && "Access is not valid!");
-
- return pBuffer->maColorMask;
- }
-
private:
BitmapInfoAccess(const BitmapInfoAccess&) = delete;
BitmapInfoAccess& operator=(const BitmapInfoAccess&) = delete;
diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx
index 79b39cfc5b88..3d6a47b33535 100644
--- a/include/vcl/BitmapReadAccess.hxx
+++ b/include/vcl/BitmapReadAccess.hxx
@@ -60,7 +60,7 @@ public:
{
assert(pData && "Access is not valid!");
- return mFncGetPixel(pData, nX, mpBuffer->maColorMask);
+ return mFncGetPixel(pData, nX);
}
sal_uInt8 GetIndexFromData(const sal_uInt8* pData, tools::Long nX) const
@@ -72,7 +72,7 @@ public:
{
assert(pData && "Access is not valid!");
- mFncSetPixel(pData, nX, rBitmapColor, mpBuffer->maColorMask);
+ mFncSetPixel(pData, nX, rBitmapColor);
}
BitmapColor GetPixel(tools::Long nY, tools::Long nX) const
@@ -131,55 +131,43 @@ protected:
public:
BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; }
- static BitmapColor GetPixelForN1BitMsbPal(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN8BitPal(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN24BitTcRgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcAbgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcXbgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcArgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcXrgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcBgra(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcBgrx(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcRgba(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
- static BitmapColor GetPixelForN32BitTcRgbx(ConstScanline pScanline,
tools::Long nX,
- const ColorMask& rMask);
+ static BitmapColor GetPixelForN1BitMsbPal(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN8BitPal(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN24BitTcRgb(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcAbgr(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcXbgr(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcArgb(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcXrgb(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcBgra(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcBgrx(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcRgba(ConstScanline pScanline,
tools::Long nX);
+ static BitmapColor GetPixelForN32BitTcRgbx(ConstScanline pScanline,
tools::Long nX);
static void SetPixelForN1BitMsbPal(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN8BitPal(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN24BitTcBgr(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN24BitTcRgb(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcAbgr(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcXbgr(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcArgb(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcXrgb(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcBgra(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcRgba(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static void SetPixelForN32BitTcRgbx(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor, const
ColorMask& rMask);
+ const BitmapColor& rBitmapColor);
static FncGetPixel GetPixelFunction(ScanlineFormat nFormat);
static FncSetPixel SetPixelFunction(ScanlineFormat nFormat);
diff --git a/include/vcl/BitmapWriteAccess.hxx
b/include/vcl/BitmapWriteAccess.hxx
index 86936457295d..97611b30d96f 100644
--- a/include/vcl/BitmapWriteAccess.hxx
+++ b/include/vcl/BitmapWriteAccess.hxx
@@ -54,7 +54,7 @@ public:
assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
- mFncSetPixel(GetScanline(nY), nX, rBitmapColor, mpBuffer->maColorMask);
+ mFncSetPixel(GetScanline(nY), nX, rBitmapColor);
}
void SetPixelIndex(tools::Long nY, tools::Long nX, sal_uInt8 cIndex)
diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx
index 78a16b729a9e..c92e78e558c7 100644
--- a/vcl/headless/CairoCommon.cxx
+++ b/vcl/headless/CairoCommon.cxx
@@ -1983,7 +1983,6 @@ std::optional<BitmapBuffer>
FastConvert24BitRgbTo32BitCairo(const BitmapBuffer*
pDst->mnWidth = nWidth;
pDst->mnHeight = nHeight;
pDst->mnBitCount = 32;
- pDst->maColorMask = pSrc->maColorMask;
pDst->maPalette = pSrc->maPalette;
tools::Long nScanlineBase;
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 144f3496d44b..6dee8b0b5252 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -1151,7 +1151,7 @@ void SkiaSalBitmap::PerformErase()
// Set first scanline, copy to others.
Scanline scanline = bitmapBuffer->mpBits;
for (tools::Long x = 0; x < bitmapBuffer->mnWidth; ++x)
- setPixel(scanline, x, mEraseColor, bitmapBuffer->maColorMask);
+ setPixel(scanline, x, mEraseColor);
for (tools::Long y = 1; y < bitmapBuffer->mnHeight; ++y)
memcpy(scanline + y * bitmapBuffer->mnScanlineSize, scanline,
bitmapBuffer->mnScanlineSize);
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx
b/vcl/source/bitmap/BitmapReadAccess.cxx
index 3588f097b20b..5503156e3d8d 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -19,6 +19,7 @@
#include <vcl/BitmapReadAccess.hxx>
#include <vcl/BitmapTools.hxx>
+#include <vcl/ColorMask.hxx>
#include <salbmp.hxx>
#include <svdata.hxx>
@@ -236,14 +237,13 @@ BitmapColor BitmapReadAccess::GetColorWithFallback(double
fY, double fX,
return GetColor(nY, nX);
}
-BitmapColor BitmapReadAccess::GetPixelForN1BitMsbPal(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN1BitMsbPal(ConstScanline pScanline,
tools::Long nX)
{
return BitmapColor(pScanline[nX >> 3] & (1 << (7 - (nX & 7))) ? 1 : 0);
}
void BitmapReadAccess::SetPixelForN1BitMsbPal(const Scanline pScanline,
tools::Long nX,
- const BitmapColor& rBitmapColor,
const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
sal_uInt8& rByte = pScanline[nX >> 3];
@@ -253,20 +253,18 @@ void BitmapReadAccess::SetPixelForN1BitMsbPal(const
Scanline pScanline, tools::L
rByte &= ~(1 << (7 - (nX & 7)));
}
-BitmapColor BitmapReadAccess::GetPixelForN8BitPal(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN8BitPal(ConstScanline pScanline,
tools::Long nX)
{
return BitmapColor(pScanline[nX]);
}
void BitmapReadAccess::SetPixelForN8BitPal(Scanline pScanline, tools::Long nX,
- const BitmapColor& rBitmapColor,
const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline[nX] = rBitmapColor.GetIndex();
}
-BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -279,7 +277,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, to
}
void BitmapReadAccess::SetPixelForN24BitTcBgr(Scanline pScanline, tools::Long
nX,
- const BitmapColor& rBitmapColor,
const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 3;
*pScanline++ = rBitmapColor.GetBlue();
@@ -287,8 +285,7 @@ void BitmapReadAccess::SetPixelForN24BitTcBgr(Scanline
pScanline, tools::Long nX
*pScanline = rBitmapColor.GetRed();
}
-BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -301,7 +298,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN24BitTcRgb(ConstScanline pScanline, to
}
void BitmapReadAccess::SetPixelForN24BitTcRgb(Scanline pScanline, tools::Long
nX,
- const BitmapColor& rBitmapColor,
const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 3;
*pScanline++ = rBitmapColor.GetRed();
@@ -309,8 +306,7 @@ void BitmapReadAccess::SetPixelForN24BitTcRgb(Scanline
pScanline, tools::Long nX
*pScanline = rBitmapColor.GetBlue();
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline,
tools::Long nX)
{
pScanline = pScanline + nX * 4;
@@ -323,8 +319,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, t
vcl::bitmap::unpremultiply(g, a),
vcl::bitmap::unpremultiply(b, a), a);
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcXbgr(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcXbgr(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -337,7 +332,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcXbgr(ConstScanline pScanline, t
}
void BitmapReadAccess::SetPixelForN32BitTcAbgr(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 4;
@@ -349,7 +344,7 @@ void BitmapReadAccess::SetPixelForN32BitTcAbgr(Scanline
pScanline, tools::Long n
}
void BitmapReadAccess::SetPixelForN32BitTcXbgr(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + (nX << 2);
*pScanline++ = 0xFF;
@@ -358,8 +353,7 @@ void BitmapReadAccess::SetPixelForN32BitTcXbgr(Scanline
pScanline, tools::Long n
*pScanline = rBitmapColor.GetRed();
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline,
tools::Long nX)
{
pScanline = pScanline + nX * 4;
@@ -372,8 +366,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcArgb(ConstScanline pScanline, t
vcl::bitmap::unpremultiply(g, a),
vcl::bitmap::unpremultiply(b, a), a);
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcXrgb(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcXrgb(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -386,7 +379,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcXrgb(ConstScanline pScanline, t
}
void BitmapReadAccess::SetPixelForN32BitTcArgb(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 4;
@@ -398,7 +391,7 @@ void BitmapReadAccess::SetPixelForN32BitTcArgb(Scanline
pScanline, tools::Long n
}
void BitmapReadAccess::SetPixelForN32BitTcXrgb(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + (nX << 2);
*pScanline++ = 0xFF;
@@ -407,8 +400,7 @@ void BitmapReadAccess::SetPixelForN32BitTcXrgb(Scanline
pScanline, tools::Long n
*pScanline = rBitmapColor.GetBlue();
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline,
tools::Long nX)
{
pScanline = pScanline + nX * 4;
@@ -421,8 +413,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcBgra(ConstScanline pScanline, t
vcl::bitmap::unpremultiply(g, a),
vcl::bitmap::unpremultiply(b, a), a);
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -435,7 +426,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline, t
}
void BitmapReadAccess::SetPixelForN32BitTcBgra(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 4;
@@ -447,7 +438,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgra(Scanline
pScanline, tools::Long n
}
void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + (nX << 2);
*pScanline++ = rBitmapColor.GetBlue();
@@ -456,8 +447,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline
pScanline, tools::Long n
*pScanline = 0xFF;
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline,
tools::Long nX)
{
pScanline = pScanline + nX * 4;
@@ -470,8 +460,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, t
vcl::bitmap::unpremultiply(g, a),
vcl::bitmap::unpremultiply(b, a), a);
}
-BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgbx(ConstScanline pScanline,
tools::Long nX,
- const ColorMask&)
+BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgbx(ConstScanline pScanline,
tools::Long nX)
{
BitmapColor aBitmapColor;
@@ -484,7 +473,7 @@ BitmapColor
BitmapReadAccess::GetPixelForN32BitTcRgbx(ConstScanline pScanline, t
}
void BitmapReadAccess::SetPixelForN32BitTcRgba(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + nX * 4;
@@ -496,7 +485,7 @@ void BitmapReadAccess::SetPixelForN32BitTcRgba(Scanline
pScanline, tools::Long n
}
void BitmapReadAccess::SetPixelForN32BitTcRgbx(Scanline pScanline, tools::Long
nX,
- const BitmapColor&
rBitmapColor, const ColorMask&)
+ const BitmapColor& rBitmapColor)
{
pScanline = pScanline + (nX << 2);
*pScanline++ = rBitmapColor.GetRed();
diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx
b/vcl/source/bitmap/BitmapWriteAccess.cxx
index 1d905d763804..cf5686e031fe 100644
--- a/vcl/source/bitmap/BitmapWriteAccess.cxx
+++ b/vcl/source/bitmap/BitmapWriteAccess.cxx
@@ -141,10 +141,9 @@ void BitmapWriteAccess::CopyScanline(tools::Long nY,
ConstScanline aSrcScanline,
if (pFncGetPixel)
{
- const ColorMask aDummyMask;
Scanline pScanline = GetScanline(nY);
for (tools::Long nX = 0, nWidth = mpBuffer->mnWidth; nX < nWidth;
++nX)
- SetPixelOnData(pScanline, nX, pFncGetPixel(aSrcScanline, nX,
aDummyMask));
+ SetPixelOnData(pScanline, nX, pFncGetPixel(aSrcScanline, nX));
}
}
}
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 4b503b77ac87..e7a0d4ed8c7f 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -34,6 +34,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/outdev.hxx>
#include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/ColorMask.hxx>
#include <memory>
#define DIBCOREHEADERSIZE ( 12UL )
@@ -1227,7 +1228,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess
const & rAcc, sal_uLong
{
if(BITFIELDS == nCompression)
{
- const ColorMask& rMask = rAcc.GetColorMask();
+ ColorMask rMask;
SVBT32 aVal32;
UInt32ToSVBT32( rMask.GetRedMask(), aVal32 );
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 1ac8a7a98f75..05cae7ee3e21 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -55,8 +55,6 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer,
BitmapBuffer& rDstBuff
Scanline* pSrcScanMap, Scanline* pDstScanMap,
sal_Int32 const * pMapX, const sal_Int32* pMapY )
{
const tools::Long nHeight1 = rDstBuffer.mnHeight - 1;
- const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
- const ColorMask& rDstMask = rDstBuffer.maColorMask;
BitmapPalette aColMap( rSrcBuffer.maPalette.GetEntryCount() );
BitmapColor* pColMapBuf = aColMap.ImplGetColorBuffer();
BitmapColor aIndex( 0 );
@@ -77,7 +75,7 @@ static void ImplPALToPAL( const BitmapBuffer& rSrcBuffer,
BitmapBuffer& rDstBuff
Scanline pSrcScan(pSrcScanMap[nMapY]), pDstScan(pDstScanMap[nActY]);
for (tools::Long nX = 0; nX < rDstBuffer.mnWidth; ++nX)
- pFncSetPixel( pDstScan, nX, pColMapBuf[ pFncGetPixel( pSrcScan,
pMapX[ nX ], rSrcMask ).GetIndex() ], rDstMask );
+ pFncSetPixel( pDstScan, nX, pColMapBuf[ pFncGetPixel( pSrcScan,
pMapX[ nX ] ).GetIndex() ] );
DOUBLE_SCANLINES();
}
@@ -88,8 +86,6 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rD
Scanline* pSrcScanMap, Scanline* pDstScanMap,
sal_Int32 const * pMapX, const sal_Int32* pMapY )
{
const tools::Long nHeight1 = rDstBuffer.mnHeight - 1;
- const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
- const ColorMask& rDstMask = rDstBuffer.maColorMask;
const BitmapColor* pColBuf = rSrcBuffer.maPalette.ImplGetColorBuffer();
if (rSrcBuffer.meFormat == ScanlineFormat::N1BitMsbPal)
@@ -107,8 +103,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rD
{
nMapX = pMapX[ nX ];
pFncSetPixel( pDstScan, nX++,
- pSrcScan[ nMapX >> 3 ] & ( 1 << ( 7 - ( nMapX &
7 ) ) ) ? aCol1 : aCol0,
- rDstMask );
+ pSrcScan[ nMapX >> 3 ] & ( 1 << ( 7 - ( nMapX &
7 ) ) ) ? aCol1 : aCol0 );
}
DOUBLE_SCANLINES();
@@ -122,7 +117,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rD
Scanline pSrcScan(pSrcScanMap[nMapY]),
pDstScan(pDstScanMap[nActY]);
for (tools::Long nX = 0; nX < rDstBuffer.mnWidth; ++nX)
- pFncSetPixel( pDstScan, nX, pColBuf[ pSrcScan[ pMapX[ nX ] ]
], rDstMask );
+ pFncSetPixel( pDstScan, nX, pColBuf[ pSrcScan[ pMapX[ nX ] ] ]
);
DOUBLE_SCANLINES();
}
@@ -135,7 +130,7 @@ static void ImplPALToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rD
Scanline pSrcScan(pSrcScanMap[nMapY]),
pDstScan(pDstScanMap[nActY]);
for (tools::Long nX = 0; nX < rDstBuffer.mnWidth; ++nX)
- pFncSetPixel( pDstScan, nX, pColBuf[ pFncGetPixel( pSrcScan,
pMapX[ nX ], rSrcMask ).GetIndex() ], rDstMask );
+ pFncSetPixel( pDstScan, nX, pColBuf[ pFncGetPixel( pSrcScan,
pMapX[ nX ] ).GetIndex() ] );
DOUBLE_SCANLINES();
}
@@ -147,8 +142,6 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rDs
Scanline* pSrcScanMap, Scanline* pDstScanMap,
sal_Int32 const * pMapX, const sal_Int32* pMapY )
{
const tools::Long nHeight1 = rDstBuffer.mnHeight - 1;
- const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
- const ColorMask& rDstMask = rDstBuffer.maColorMask;
if (rSrcBuffer.meFormat == ScanlineFormat::N24BitTcBgr)
{
@@ -166,7 +159,7 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rDs
aCol.SetBlue( *pPixel++ );
aCol.SetGreen( *pPixel++ );
aCol.SetRed( *pPixel );
- pFncSetPixel( pDstScan, nX, aCol, rDstMask );
+ pFncSetPixel( pDstScan, nX, aCol );
}
DOUBLE_SCANLINES()
@@ -180,20 +173,18 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rDs
Scanline pSrcScan(pSrcScanMap[nMapY]),
pDstScan(pDstScanMap[nActY]);
for (tools::Long nX = 0; nX < rDstBuffer.mnWidth; ++nX)
- pFncSetPixel( pDstScan, nX, pFncGetPixel( pSrcScan, pMapX[ nX
], rSrcMask ), rDstMask );
+ pFncSetPixel( pDstScan, nX, pFncGetPixel( pSrcScan, pMapX[ nX
] ) );
DOUBLE_SCANLINES();
}
}
}
-static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer, BitmapBuffer const &
rDstBuffer,
+static void ImplTCToPAL( BitmapBuffer const & rDstBuffer,
FncGetPixel pFncGetPixel, FncSetPixel pFncSetPixel,
Scanline* pSrcScanMap, Scanline* pDstScanMap,
sal_Int32 const * pMapX, const sal_Int32* pMapY )
{
const tools::Long nHeight1 = rDstBuffer.mnHeight- 1;
- const ColorMask& rSrcMask = rSrcBuffer.maColorMask;
- const ColorMask& rDstMask = rDstBuffer.maColorMask;
std::unique_ptr<sal_uInt8[]> pColToPalMap(new sal_uInt8[ TC_TO_PAL_COLORS
]);
BitmapColor aIndex( 0 );
@@ -218,8 +209,8 @@ static void ImplTCToPAL( const BitmapBuffer& rSrcBuffer,
BitmapBuffer const & rD
for (tools::Long nX = 0; nX < rDstBuffer.mnWidth; ++nX)
{
- aIndex.SetIndex( pColToPalMap[ ImplIndexFromColor( pFncGetPixel(
pSrcScan, pMapX[ nX ], rSrcMask ) ) ] );
- pFncSetPixel( pDstScan, nX, aIndex, rDstMask );
+ aIndex.SetIndex( pColToPalMap[ ImplIndexFromColor( pFncGetPixel(
pSrcScan, pMapX[ nX ] ) ) ] );
+ pFncSetPixel( pDstScan, nX, aIndex );
}
DOUBLE_SCANLINES();
@@ -418,7 +409,7 @@ std::optional<BitmapBuffer> StretchAndConvert(
}
else
{
- ImplTCToPAL( rSrcBuffer, *pDstBuffer, pFncGetPixel, pFncSetPixel,
+ ImplTCToPAL( *pDstBuffer, pFncGetPixel, pFncSetPixel,
pSrcScan.get(), pDstScan.get(), pMapX.get(), pMapY.get()
);
}
