mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add BitmapReadAccess::GetColorFromData

Browse Source 
Change-Id: Ie7eb0770dc6c5feaa7b4835bdaebfe688a3a381f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157580
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2023-10-04 14:51:37 +03:00
parent 98771c4a6d
commit b34fceb3ca
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/vcl/BitmapReadAccess.hxx
View File

@ -79,22 +79,25 @@ public:
{ {
assert(mpBuffer && "Access is not valid!"); assert(mpBuffer && "Access is not valid!");
assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!");
return mFncGetPixel(GetScanline(nY), nX, maColorMask); return GetPixelFromData(GetScanline(nY), nX);
} }
BitmapColor GetPixel(const Point& point) const { return GetPixel(point.Y(), point.X()); } BitmapColor GetPixel(const Point& point) const { return GetPixel(point.Y(), point.X()); }
BitmapColor GetColor(tools::Long nY, tools::Long nX) const BitmapColor GetColorFromData(sal_uInt8* pData, tools::Long nX) const
{ {
if (HasPalette()) if (HasPalette())
{ return GetPaletteColor(GetIndexFromData(pData, nX));
const BitmapBuffer* pBuffer = mpBuffer;
return pBuffer->maPalette[GetPixelIndex(nY, nX)];
}
else else
return GetPixel(nY, nX); return GetPixelFromData(pData, nX);
}
BitmapColor GetColor(tools::Long nY, tools::Long nX) const
{
assert(mpBuffer && "Access is not valid!");
assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!");
return GetColorFromData(GetScanline(nY), nX);
} }
BitmapColor GetColor(const Point& point) const { return GetColor(point.Y(), point.X()); } BitmapColor GetColor(const Point& point) const { return GetColor(point.Y(), point.X()); }