gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 20:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

If an unknown named image is unarchived, keep the name

Browse source
This commit is contained in:
Graham Lee 2017-10-28 08:45:05 +01:00
parent e3d51643ca
commit 5e3ed6dff7
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/NSImage.m
View file

@ -484,8 +484,8 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
initByReferencingFile: path];
if (image != nil)
{
[image setName: realName];
image->_flags.archiveByName = YES;
[image setName: realName];
image->_flags.archiveByName = YES;
AUTORELEASE(image);
}
}
@ -1967,15 +1967,24 @@ static NSSize GSResolutionOfImageRep(NSImageRep *rep)
- (id) initWithCoder: (NSCoder*)coder
{
BOOL flag;
NSImage *replacementImage;
NSString *imageName;
_reps = [[NSMutableArray alloc] initWithCapacity: 2];
if ([coder allowsKeyedCoding])
{
if ([coder containsValueForKey: @"NSName"])
{
RELEASE(self);
return RETAIN([NSImage imageNamed:
[coder decodeObjectForKey: @"NSName"]]);
imageName = [coder decodeObjectForKey: @"NSName"];
replacementImage = [NSImage imageNamed: imageName];
if (replacementImage)
{
return RETAIN(replacementImage);
}
replacementImage = [[NSImage alloc] init];
[replacementImage setName: imageName];
replacementImage->_flags.archiveByName = YES;
}
if ([coder containsValueForKey: @"NSColor"])
{
@ -2055,7 +2064,17 @@ static NSSize GSResolutionOfImageRep(NSImageRep *rep)
NSString *theName = [coder decodeObject];
RELEASE(self);
self = RETAIN([NSImage imageNamed: theName]);
replacementImage = [NSImage imageNamed: theName];
if (replacementImage)
{
self = RETAIN(replacementImage);
}
else
{
self = [[NSImage alloc] init];
[self setName: theName];
self->_flags.archiveByName = YES;
}
}
else
{