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

Workarounds for a couple of MSVC quirks.

Browse source
This commit is contained in:
jules 2014-03-29 13:56:16 +00:00
parent 783af9c332
commit e449f1a8af
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_core/network/juce_URL.h
View file

@ -360,6 +360,7 @@ private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Upload)
};
friend struct ContainerDeletePolicy<Upload>;
ReferenceCountedArray<Upload> filesToUpload;
URL (const String&, int);

44
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -85,28 +85,6 @@ struct CachedImageList : public ReferenceCountedObject,
return c->getTextureInfo();
}
typedef ReferenceCountedObjectPtr<CachedImageList> Ptr;
private:
void imageDataChanged (ImagePixelData* im) override
{
if (CachedImage* c = findCachedImage (im))
c->texture.release();
}
void imageDataBeingDeleted (ImagePixelData* im) override
{
for (int i = images.size(); --i >= 0;)
{
if (images.getUnchecked(i)->pixelData == im)
{
totalSize -= images.getUnchecked(i)->imageSize;
images.remove (i);
break;
}
}
}
struct CachedImage
{
CachedImage (CachedImageList& list, ImagePixelData* im)
@ -150,6 +128,28 @@ private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CachedImage)
};
typedef ReferenceCountedObjectPtr<CachedImageList> Ptr;
private:
void imageDataChanged (ImagePixelData* im) override
{
if (CachedImage* c = findCachedImage (im))
c->texture.release();
}
void imageDataBeingDeleted (ImagePixelData* im) override
{
for (int i = images.size(); --i >= 0;)
{
if (images.getUnchecked(i)->pixelData == im)
{
totalSize -= images.getUnchecked(i)->imageSize;
images.remove (i);
break;
}
}
}
OwnedArray<CachedImage> images;
size_t totalSize, maxCacheSize;