[Libreoffice-commits] core.git: basic/source filter/source

[Matúš Kukan]

 basic/source/runtime/iosys.cxx              |    4 ++--
 filter/source/graphicfilter/itiff/itiff.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d761d5e219d745c10997c4accfbfc9eb5717d0e8
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Sat Mar 29 12:08:09 2014 +0100

    error: no matching function for call to..
    
    Change-Id: I4792f9deb162c5e7bde16e54a55f80a83eb90b70

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c4bd913..940d6d5 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -359,14 +359,14 @@ OslStream::~OslStream()
 
 sal_Size OslStream::GetData(void* pData, sal_Size nSize)
 {
-    sal_Size nBytesRead = nSize;
+    sal_uInt64 nBytesRead = nSize;
     maFile.read( pData, nBytesRead, nBytesRead );
     return nBytesRead;
 }
 
 sal_Size OslStream::PutData(const void* pData, sal_Size nSize)
 {
-    sal_Size nBytesWritten;
+    sal_uInt64 nBytesWritten;
     maFile.write( pData, nSize, nBytesWritten );
     return nBytesWritten;
 }
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index dc27652..fb24548 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1110,7 +1110,7 @@ bool TIFFReader::HasAlphaChannel() const
 sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
 {
     sal_uInt16  i, nNumTags, nTagType;
-    sal_uLong   nMaxPos;
+    sal_uInt64  nMaxPos;
     sal_uLong   nPos;
     sal_uInt32 nFirstIfd, nDataLen;