mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-17 00:44:19 +00:00
Code Activity

Major change to the way the Image class works, making it use value semantics and internally shared data (see the forum notes for more info on this). Also minor changes to win32 browser plugin object ref counting and linux millisecond timers.

Browse source
This commit is contained in:
Julian Storer 2010-06-01 18:01:13 +01:00
parent 1baaa016bd
commit 24673283eb
121 changed files with 2763 additions and 2930 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/gui/graphics/imaging/juce_ImageFileFormat.cpp
View file

@ -57,7 +57,7 @@ public:
&& header[2] == 'F';
}
Image* decodeImage (InputStream& in)
const Image decodeImage (InputStream& in)
{
const ScopedPointer <GIFLoader> loader (new GIFLoader (in));
return loader->getImage();
@ -99,17 +99,17 @@ ImageFileFormat* ImageFileFormat::findImageFormatForStream (InputStream& input)
}
//==============================================================================
Image* ImageFileFormat::loadFrom (InputStream& input)
const Image ImageFileFormat::loadFrom (InputStream& input)
{
ImageFileFormat* const format = findImageFormatForStream (input);
if (format != 0)
return format->decodeImage (input);
return 0;
return Image();
}
Image* ImageFileFormat::loadFrom (const File& file)
const Image ImageFileFormat::loadFrom (const File& file)
{
InputStream* const in = file.createInputStream();
@ -119,10 +119,10 @@ Image* ImageFileFormat::loadFrom (const File& file)
return loadFrom (b);
}
return 0;
return Image();
}
Image* ImageFileFormat::loadFrom (const void* rawData, const int numBytes)
const Image ImageFileFormat::loadFrom (const void* rawData, const int numBytes)
{
if (rawData != 0 && numBytes > 4)
{
@ -130,7 +130,7 @@ Image* ImageFileFormat::loadFrom (const void* rawData, const int numBytes)
return loadFrom (stream);
}
return 0;
return Image();
}
END_JUCE_NAMESPACE