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

Caolán McNamara caolanm at redhat.com
Sun Jan 24 13:01:35 PST 2016


 vcl/source/gdi/dibtools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05e078fd9578a63a302fce616227f3bd1bdbea6a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 24 20:59:59 2016 +0000

    fix build
    
    Change-Id: I3c8874787c1828ef3d3f02684384bd5634545d18

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index cfc31e9..f9258ce 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -798,7 +798,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
                 while (nUncodedSize > nDataPos)
                 {
                     assert(aData.size() > nDataPos);
-                    const size_t nToRead((std::min)(nUncodedSize - nDataPos, aData.size() - nDataPos));
+                    const size_t nToRead(std::min<size_t>(nUncodedSize - nDataPos, aData.size() - nDataPos));
                     assert(nToRead > 0);
                     assert(!aData.empty());
                     const long nRead = aCodec.Read(rIStm, &aData.front() + nDataPos, sal_uInt32(nToRead));


More information about the Libreoffice-commits mailing list