mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Changed some 'int's to 'size_t's, to improve 64-bit compatibility. Also changed jmin and jmax to use templates, so they can take any type. These changes might mean that you'll need to add some more explicit casts to get your existing code to compile, but this is actually a good thing - it brought to light a few dodgy implicit casts in my code, and may do the same in yours. Also added a function roundToInt(), which replaces roundDoubleToInt() and roundFloatToInt(), but takes any size of floating point number (I've left the old roundDoubleToInt() and roundFloatToInt() functions there for convenience, but will probably remove them in the future).

Browse source
This commit is contained in:
Julian Storer 2010-01-14 14:49:25 +00:00
parent 0abb313d40
commit e61e8f6775
131 changed files with 562 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/io/streams/juce_MemoryOutputStream.cpp
View file

@ -32,13 +32,13 @@ BEGIN_JUCE_NAMESPACE
//==============================================================================
MemoryOutputStream::MemoryOutputStream (const int initialSize,
const int blockSizeToIncreaseBy,
MemoryOutputStream::MemoryOutputStream (const size_t initialSize,
const size_t blockSizeToIncreaseBy,
MemoryBlock* const memoryBlockToWriteTo) throw()
: data (memoryBlockToWriteTo),
position (0),
size (0),
blockSize (jmax (16, blockSizeToIncreaseBy))
blockSize (jmax ((size_t) 16, blockSizeToIncreaseBy))
{
if (data == 0)
dataToDelete = data = new MemoryBlock (initialSize);
@ -67,7 +67,7 @@ bool MemoryOutputStream::write (const void* buffer, int howMany)
{
if (howMany > 0)
{
int storageNeeded = position + howMany;
size_t storageNeeded = position + howMany;
if (storageNeeded >= data->getSize())
{
@ -78,7 +78,7 @@ bool MemoryOutputStream::write (const void* buffer, int howMany)
data->ensureSize (storageNeeded);
}
data->copyFrom (buffer, position, howMany);
data->copyFrom (buffer, (int) position, howMany);
position += howMany;
size = jmax (size, position);
}
@ -94,7 +94,7 @@ const char* MemoryOutputStream::getData() throw()
return (const char*) data->getData();
}
int MemoryOutputStream::getDataSize() const throw()
size_t MemoryOutputStream::getDataSize() const throw()
{
return size;
}
@ -106,10 +106,10 @@ int64 MemoryOutputStream::getPosition()
bool MemoryOutputStream::setPosition (int64 newPosition)
{
if (newPosition <= size)
if (newPosition <= (int64) size)
{
// ok to seek backwards
position = jlimit (0, size, (int) newPosition);
position = jlimit ((size_t) 0, size, (size_t) newPosition);
return true;
}
else