diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-06 22:36:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-07 08:19:51 +0100 |
commit | 0672b7a929576f902c48058e712c7d1a5711ac64 (patch) | |
tree | 57f642f6ecedf1ec03304b4a6c4137e3b0d1ebfe /vcl/unx | |
parent | e35b1d8b0913514becb9e5d2845c74a927b4a272 (diff) |
silence more valgrind spew on scanline-extended deadspace
Change-Id: I8607d9d405a3996699ef85564938628624987385
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index d48cf985fcc5..e2f9e9743ffa 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -118,15 +118,18 @@ void X11SalBitmap::ImplRemovedFromCache() } #if defined(HAVE_MEMCHECK_H) -void blankExtraSpace(BitmapBuffer* pDIB) +namespace { - size_t nExtraSpaceInScanLine = pDIB->mnScanlineSize - pDIB->mnWidth * pDIB->mnBitCount / 8; - if (nExtraSpaceInScanLine) + void blankExtraSpace(BitmapBuffer* pDIB) { - for (long i = 0; i < pDIB->mnHeight; ++i) + size_t nExtraSpaceInScanLine = pDIB->mnScanlineSize - pDIB->mnWidth * pDIB->mnBitCount / 8; + if (nExtraSpaceInScanLine) { - sal_uInt8 *pRow = pDIB->mpBits + (i * pDIB->mnScanlineSize); - memset(pRow + (pDIB->mnScanlineSize - nExtraSpaceInScanLine), 0, nExtraSpaceInScanLine); + for (long i = 0; i < pDIB->mnHeight; ++i) + { + sal_uInt8 *pRow = pDIB->mpBits + (i * pDIB->mnScanlineSize); + memset(pRow + (pDIB->mnScanlineSize - nExtraSpaceInScanLine), 0, nExtraSpaceInScanLine); + } } } } |