[Libreoffice-commits] core.git: vcl/win

[Fridrich Å trba]

 vcl/win/source/gdi/salbmp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b27b03d03c94b86d5664c1e08941b0df97181a9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jun 17 08:52:26 2013 +0200

    min -> std::min in order to unbreak windows build
    
    Change-Id: I4b7b2acf0f1c3173393841ae1047240e991fb837

diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index ac7162d..2173e16 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 );
             }