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

Fixing the joy of MSVC preprocessor

Browse Source 
Change-Id: I4e97f93de568b1704a58ab5e5c47e85e09327779
This commit is contained in:
Fridrich Štrba
2013-06-17 10:09:49 +02:00
parent 3d9e3cd2a2
commit 919684989d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/win/source/gdi/salbmp.cxx
View File

@@ -808,7 +808,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const
if( nColors ) if( nColors )
{ {
// copy the palette entries if any // copy the palette entries if any
const sal_uInt16 nMinCount = std::min( nColors, rPal.GetEntryCount() ); const sal_uInt16 nMinCount = (std::min)( nColors, rPal.GetEntryCount() );
if( nMinCount ) if( nMinCount )
memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount * sizeof(RGBQUAD) ); memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount * sizeof(RGBQUAD) );
} }
@@ -976,7 +976,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB ); PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
const sal_uInt16 nCount = pBuffer->maPalette.GetEntryCount(); const sal_uInt16 nCount = pBuffer->maPalette.GetEntryCount();
const sal_uInt16 nDIBColorCount = ImplGetDIBColorCount( mhDIB ); const sal_uInt16 nDIBColorCount = ImplGetDIBColorCount( mhDIB );
memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) ); memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), (std::min)( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) );
GlobalUnlock( mhDIB ); GlobalUnlock( mhDIB );
} }