diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-17 08:52:26 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-17 08:52:41 +0200 |
| commit | 0b27b03d03c94b86d5664c1e08941b0df97181a9 (patch) | |
| tree | fbcbbc3dee5c73f54baf21874809292218ca65fb /vcl | |
| parent | e9fd9c25269abe171e5f693a8c70b33ab5a01c85 (diff) | |
min -> std::min in order to unbreak windows build
Change-Id: I4b7b2acf0f1c3173393841ae1047240e991fb837
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 ac7162d00e88..2173e168df2a 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 = 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(), min( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) ); + memcpy( pBI->bmiColors, pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) ); GlobalUnlock( mhDIB ); } |