mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-25 02:04:23 +00:00
Code Activity

Couple of minor fixes and clean-ups to various components.

Browse source
This commit is contained in:
Julian Storer 2010-10-24 16:27:44 +01:00
parent 4e1c66b02e
commit 0a1f3857ae
30 changed files with 955 additions and 1224 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/io/files/juce_ZipFile.cpp
View file

@ -62,7 +62,7 @@ public:
if (file_.inputSource != 0)
{
inputStream = file.inputSource->createInputStream();
inputStream = streamToDelete = file.inputSource->createInputStream();
}
else
{
@ -89,9 +89,6 @@ public:
if (inputStream != 0 && inputStream == file.inputStream)
file.numOpenStreams--;
#endif
if (inputStream != file.inputStream)
delete inputStream;
}
int64 getTotalLength()
@ -151,6 +148,7 @@ private:
int64 pos;
int headerSize;
InputStream* inputStream;
ScopedPointer<InputStream> streamToDelete;
ZipInputStream (const ZipInputStream&);
ZipInputStream& operator= (const ZipInputStream&);
@ -195,11 +193,11 @@ ZipFile::~ZipFile()
#if JUCE_DEBUG
entries.clear();
// If you hit this assertion, it means you've created a stream to read
// one of the items in the zipfile, but you've forgotten to delete that
// stream object before deleting the file.. Streams can't be kept open
// after the file is deleted because they need to share the input
// stream that the file uses to read itself.
/* If you hit this assertion, it means you've created a stream to read one of the items in the
zipfile, but you've forgotten to delete that stream object before deleting the file..
Streams can't be kept open after the file is deleted because they need to share the input
stream that the file uses to read itself.
*/
jassert (numOpenStreams == 0);
#endif
}