diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-17 10:09:49 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-17 10:12:20 +0200 |
| commit | 919684989da543d8884bb68d7d1c33c2cbe8a9b7 (patch) | |
| tree | 55b3bdd053a85628f6a62f036e8e86aa178c5753 /vcl | |
| parent | 3d9e3cd2a2d07327427b70d4afe1c628793dee8e (diff) | |
Fixing the joy of MSVC preprocessor
Change-Id: I4e97f93de568b1704a58ab5e5c47e85e09327779
Diffstat (limited to 'vcl')
| -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 2173e168df2a..2094dc6c8dd0 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -808,7 +808,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const if( nColors ) { // 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 ) memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount * sizeof(RGBQUAD) ); } @@ -976,7 +976,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB ); const sal_uInt16 nCount = pBuffer->maPalette.GetEntryCount(); 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 ); } |