diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-14 20:03:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-14 20:04:26 +0100 |
| commit | 0be8f5aed649d2de8ba858835ee70a440d66f6d7 (patch) | |
| tree | 39ebb62cc398526717fd34d8fe41e840e79b822e /vcl | |
| parent | 8a8b1ae3e9c1d782bf1cf170f5498992a4f680fe (diff) | |
if we have to define min/max then use those again
Change-Id: I631f0c872b7ec7e6dada1488e03eae3f75987fc6
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 72bc268d1d35..15b4698ab67c 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -796,7 +796,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 = min( nColors, rPal.GetEntryCount() ); if( nMinCount ) memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount * sizeof(RGBQUAD) ); } @@ -964,7 +964,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(), min( nDIBColorCount, nCount ) * sizeof( RGBQUAD ) ); GlobalUnlock( mhDIB ); } |