diff options
| author | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2010-11-05 10:17:51 +0100 |
|---|---|---|
| committer | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2010-11-05 10:17:51 +0100 |
| commit | 34c72d32a6fe0960291ebe61820defcda5cacd8e (patch) | |
| tree | fc6367c37c653d019e3250153896c57257184a63 /vcl/win/source/gdi/salbmp.cxx | |
| parent | a7b3942c0f04f24455ab85ec0c0a8c2a0014da0f (diff) | |
| parent | 95f71183414a50d12cd4bbacf47d711672e63268 (diff) | |
impress195: merge with DEV300_m92
Diffstat (limited to 'vcl/win/source/gdi/salbmp.cxx')
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 444df039dd69..141c812dcd31 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -509,8 +509,8 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB ); const USHORT nCount = pBuffer->maPalette.GetEntryCount(); - - memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), nCount * sizeof( RGBQUAD ) ); + const USHORT nDIBColorCount = ImplGetDIBColorCount( mhDIB ); + memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), Min( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) ); GlobalUnlock( mhDIB ); } |