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

Revert GSXibLoader.m to revision 39488 due to TIFF loading issues

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40149 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-14 23:31:57 +00:00
parent 2ea1c891e3
commit c0edb89f8b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/GSXibLoader.m
View file

@ -37,6 +37,7 @@
#import <Foundation/NSXMLParser.h>
#import <Foundation/NSXMLDocument.h>
#import <Foundation/NSXMLElement.h>
#import <GNUstepBase/GSMime.h>
#import "AppKit/NSApplication.h"
#import "AppKit/NSNib.h"
@ -1033,7 +1034,7 @@
}
NS_HANDLER
{
NSLog(@"Exception occurred while loading model: %@",[localException reason]);
NSLog(@"Exception occured while loading model: %@",[localException reason]);
// TEST_RELEASE(unarchiver);
}
NS_ENDHANDLER
@ -1274,7 +1275,7 @@
}
NS_HANDLER
{
NSLog(@"Exception occurred while parsing Xib: %@",[localException reason]);
NSLog(@"Exception occured while parsing Xib: %@",[localException reason]);
DESTROY(self);
}
NS_ENDHANDLER
@ -1583,11 +1584,10 @@ didStartElement: (NSString*)elementName
if ([type isEqualToString: @"base64-UTF8"])
{
NSData *d = [[NSData alloc] initWithBase64EncodedString: new
options: 0];
NSData *d = [new dataUsingEncoding: NSASCIIStringEncoding];
d = [GSMimeDocument decodeBase64: d];
new = AUTORELEASE([[NSString alloc] initWithData: d
encoding: NSUTF8StringEncoding]);
RELEASE(d);
}
// empty strings are not nil!
@ -1698,8 +1698,9 @@ didStartElement: (NSString*)elementName
}
else if ([@"bytes" isEqualToString: elementName])
{
id new = AUTORELEASE([[NSData alloc] initWithBase64EncodedString: [element value]
options: 0]);
id new = [[element value] dataUsingEncoding: NSASCIIStringEncoding
allowLossyConversion: NO];
new = [GSMimeDocument decodeBase64: new];
if (objID != nil)
[decoded setObject: new forKey: objID];