darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-27 14:00:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cached Image Reps of partial/flipped NSImage are built & kept everytime we draw the image, while they are never reused, leading to crazy memory use (then crash)

Browse Source
This commit is contained in:
Airy ANDRE 2012-08-10 18:51:18 +02:00
parent 39c1bb7d21
commit be05439632
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AppKit/NSImage.m
View File

@ -755,10 +755,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
NSImageRep *any=[[[self _bestUncachedFallbackCachedRepresentationForDevice:nil size:rect.size] retain] autorelease];
NSImageRep *cachedRep=nil;
CGContextRef context;
if(NSIsEmptyRect(source) && !_isFlipped) {
// If we're drawing a subset of the image and the image isn't flipped then
// we can just draw from a cached rep or a bitmap rep(assuming we have one)
NSRect fullRect = { .origin = NSZeroPoint, .size = self.size };
BOOL drawFullImage = (NSIsEmptyRect(source) || NSEqualRects(source, fullRect));
BOOL canCache = drawFullImage && !_isFlipped;
if (canCache) {
// If we're drawing the full image unflipped then we can just draw from a cached rep or a bitmap rep (assuming we have one)
if([any isKindOfClass:[NSCachedImageRep class]] ||
[any isKindOfClass:[NSBitmapImageRep class]]) {
cachedRep=any;
@ -793,8 +795,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
[self unlockFocus];
// And add it
[self addRepresentation: cached];
// And keep it if it makes sense
if (canCache) {
[self addRepresentation: cached];
}
cachedRep=cached;
}