diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 8ff3c9e535..7a650a815e 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -8104,8 +8104,6 @@ int64 FileInputStream::getTotalLength() int FileInputStream::read (void* buffer, int bytesToRead) { - int num = 0; - if (needToSeek) { if (juce_fileSetPosition (fileHandle, currentPosition) < 0) @@ -8114,10 +8112,10 @@ int FileInputStream::read (void* buffer, int bytesToRead) needToSeek = false; } - num = readInternal (buffer, bytesToRead); + const size_t num = readInternal (buffer, bytesToRead); currentPosition += num; - return num; + return (int) num; } bool FileInputStream::isExhausted() @@ -9279,7 +9277,7 @@ namespace URLHelpers // just a short text attachment, so use simple url encoding.. headers << "Content-Type: application/x-www-form-urlencoded\r\nContent-length: " - << postData.getSize() << "\r\n"; + << (unsigned int) postData.getSize() << "\r\n"; } } } @@ -9984,7 +9982,7 @@ bool MemoryOutputStream::write (const void* const buffer, int howMany) const size_t storageNeeded = position + howMany; if (storageNeeded >= data.getSize()) - data.ensureSize ((storageNeeded + jmin (storageNeeded / 2, (size_t) (1024 * 1024)) + 32) & ~31); + data.ensureSize ((storageNeeded + jmin ((int) (storageNeeded / 2), 1024 * 1024) + 32) & ~31); memcpy (static_cast (data.getData()) + position, buffer, howMany); position += howMany; @@ -10042,12 +10040,12 @@ const String MemoryOutputStream::toUTF8() const const String MemoryOutputStream::toString() const { - return String::createStringFromData (getData(), getDataSize()); + return String::createStringFromData (getData(), (int) getDataSize()); } OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryOutputStream& streamToRead) { - stream.write (streamToRead.getData(), streamToRead.getDataSize()); + stream.write (streamToRead.getData(), (int) streamToRead.getDataSize()); return stream; } diff --git a/src/io/files/juce_FileInputStream.cpp b/src/io/files/juce_FileInputStream.cpp index 20508f32c0..2a9885b267 100644 --- a/src/io/files/juce_FileInputStream.cpp +++ b/src/io/files/juce_FileInputStream.cpp @@ -58,8 +58,6 @@ int64 FileInputStream::getTotalLength() int FileInputStream::read (void* buffer, int bytesToRead) { - int num = 0; - if (needToSeek) { if (juce_fileSetPosition (fileHandle, currentPosition) < 0) @@ -68,10 +66,10 @@ int FileInputStream::read (void* buffer, int bytesToRead) needToSeek = false; } - num = readInternal (buffer, bytesToRead); + const size_t num = readInternal (buffer, bytesToRead); currentPosition += num; - return num; + return (int) num; } bool FileInputStream::isExhausted() diff --git a/src/io/network/juce_URL.cpp b/src/io/network/juce_URL.cpp index fd6da778a4..d5363769f2 100644 --- a/src/io/network/juce_URL.cpp +++ b/src/io/network/juce_URL.cpp @@ -179,7 +179,7 @@ namespace URLHelpers // just a short text attachment, so use simple url encoding.. headers << "Content-Type: application/x-www-form-urlencoded\r\nContent-length: " - << postData.getSize() << "\r\n"; + << (unsigned int) postData.getSize() << "\r\n"; } } } diff --git a/src/io/streams/juce_MemoryOutputStream.cpp b/src/io/streams/juce_MemoryOutputStream.cpp index 900f346a38..4553831c06 100644 --- a/src/io/streams/juce_MemoryOutputStream.cpp +++ b/src/io/streams/juce_MemoryOutputStream.cpp @@ -78,7 +78,7 @@ bool MemoryOutputStream::write (const void* const buffer, int howMany) const size_t storageNeeded = position + howMany; if (storageNeeded >= data.getSize()) - data.ensureSize ((storageNeeded + jmin (storageNeeded / 2, (size_t) (1024 * 1024)) + 32) & ~31); + data.ensureSize ((storageNeeded + jmin ((int) (storageNeeded / 2), 1024 * 1024) + 32) & ~31); memcpy (static_cast (data.getData()) + position, buffer, howMany); position += howMany; @@ -136,12 +136,12 @@ const String MemoryOutputStream::toUTF8() const const String MemoryOutputStream::toString() const { - return String::createStringFromData (getData(), getDataSize()); + return String::createStringFromData (getData(), (int) getDataSize()); } OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const MemoryOutputStream& streamToRead) { - stream.write (streamToRead.getData(), streamToRead.getDataSize()); + stream.write (streamToRead.getData(), (int) streamToRead.getDataSize()); return stream; }