diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/BitmapInfoAccess.hxx | 29 | ||||
| -rw-r--r-- | include/vcl/BitmapReadAccess.hxx | 5 |
2 files changed, 23 insertions, 11 deletions
diff --git a/include/vcl/BitmapInfoAccess.hxx b/include/vcl/BitmapInfoAccess.hxx index 86c4ada2ae16..a6bca5627aa2 100644 --- a/include/vcl/BitmapInfoAccess.hxx +++ b/include/vcl/BitmapInfoAccess.hxx @@ -87,40 +87,49 @@ public: bool HasPalette() const { - assert(mpBuffer && "Access is not valid!"); + const BitmapBuffer* pBuffer = mpBuffer; + + assert(pBuffer && "Access is not valid!"); - return mpBuffer && !!mpBuffer->maPalette; + return pBuffer && !!pBuffer->maPalette; } const BitmapPalette& GetPalette() const { - assert(mpBuffer && "Access is not valid!"); + const BitmapBuffer* pBuffer = mpBuffer; + + assert(pBuffer && "Access is not valid!"); - return mpBuffer->maPalette; + return pBuffer->maPalette; } sal_uInt16 GetPaletteEntryCount() const { + const BitmapBuffer* pBuffer = mpBuffer; + assert(HasPalette() && "Bitmap has no palette!"); - return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0; + return HasPalette() ? pBuffer->maPalette.GetEntryCount() : 0; } const BitmapColor& GetPaletteColor(sal_uInt16 nColor) const { - assert(mpBuffer && "Access is not valid!"); + const BitmapBuffer* pBuffer = mpBuffer; + assert(pBuffer && "Access is not valid!"); assert(HasPalette() && "Bitmap has no palette!"); - return mpBuffer->maPalette[nColor]; + return pBuffer->maPalette[nColor]; } sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const; - ColorMask& GetColorMask() const + const ColorMask& GetColorMask() const { - assert(mpBuffer && "Access is not valid!"); + const BitmapBuffer* pBuffer = mpBuffer; + + assert(pBuffer && "Access is not valid!"); - return mpBuffer->maColorMask; + return pBuffer->maColorMask; } private: diff --git a/include/vcl/BitmapReadAccess.hxx b/include/vcl/BitmapReadAccess.hxx index 2659a9960a51..159ff38b157e 100644 --- a/include/vcl/BitmapReadAccess.hxx +++ b/include/vcl/BitmapReadAccess.hxx @@ -88,7 +88,10 @@ public: BitmapColor GetColor(tools::Long nY, tools::Long nX) const { if (HasPalette()) - return mpBuffer->maPalette[GetPixelIndex(nY, nX)]; + { + const BitmapBuffer* pBuffer = mpBuffer; + return pBuffer->maPalette[GetPixelIndex(nY, nX)]; + } else return GetPixel(nY, nX); } |