diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2025-01-24 12:10:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2025-01-24 14:18:34 +0100 |
| commit | 973771c8cd1e9888f34511919070a0161e079229 (patch) | |
| tree | cf4843ca63c4fcb000eca209e479fcf7bd0a5129 /include/vcl | |
| parent | 9e77eefb0ef2d6a23a2d9833ad9783a194c37d1b (diff) | |
no need to store ColorMask in BitmapInfoAccess
when we already have it in the BitmapBuffer we point to
Change-Id: I64158251c113f9dd11f21f4f3f112248b82db5f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180700
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/BitmapInfoAccess.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/BitmapReadAccess.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/BitmapWriteAccess.hxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx index f3ac582b6a16..4e6f38081f7e 100644 --- a/include/vcl/BitmapInfoAccess.hxx +++ b/include/vcl/BitmapInfoAccess.hxx @@ -149,7 +149,6 @@ private: protected: Bitmap maBitmap; BitmapBuffer* mpBuffer; - ColorMask maColorMask; BitmapAccessMode mnAccessMode; }; diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx index 7e4a9e2b04c1..79b39cfc5b88 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, maColorMask); + return mFncGetPixel(pData, nX, mpBuffer->maColorMask); } 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, maColorMask); + mFncSetPixel(pData, nX, rBitmapColor, mpBuffer->maColorMask); } BitmapColor GetPixel(tools::Long nY, tools::Long nX) const diff --git a/include/vcl/BitmapWriteAccess.hxx b/include/vcl/BitmapWriteAccess.hxx index 631b097438bf..86936457295d 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, maColorMask); + mFncSetPixel(GetScanline(nY), nX, rBitmapColor, mpBuffer->maColorMask); } void SetPixelIndex(tools::Long nY, tools::Long nX, sal_uInt8 cIndex) |