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

* Source/NSBezierPath.m: More keyed decoding.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36157 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-02-17 13:02:46 +00:00
parent 152b94069f
commit 4d953a5122
2 changed files with 125 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-02-17 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBezierPath.m: More keyed decoding.
2013-02-17 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSBrowser.h

122
Source/NSBezierPath.m
View file

@ -28,6 +28,7 @@
Boston, MA 02110-1301, USA.
*/
#import <Foundation/NSData.h>
#import <Foundation/NSDebug.h>
#import "AppKit/NSAffineTransform.h"
#import "AppKit/NSFont.h"
@ -1686,6 +1687,7 @@ static int winding_curve(double_point from, double_point to, double_point c1,
if ([aCoder allowsKeyedCoding])
{
[aCoder encodeFloat: (float)_flatness forKey: @"NSFlatness"];
// FIXME
}
else
{
@ -1752,7 +1754,125 @@ static int winding_curve(double_point from, double_point to, double_point c1,
}
if ([aCoder containsValueForKey: @"NSSegments"])
{
//NSData *d = [aCoder decodeObjectForKey: @"NSSegments"];
NSUInteger length;
const uint8_t *data;
NSData *d;
unsigned int cursor = 0;
data = [aCoder decodeBytesForKey: @"NSSegments"
returnedLength: &length];
d = [NSData dataWithBytes: data length: length];
//NSLog(@"decoded segments %@", d);
while (cursor < length)
{
char c;
float f, g;
NSPoint p, cp1, cp2;
[d deserializeDataAt: &c
ofObjCType: "c"
atCursor: &cursor
context: nil];
switch (c)
{
case NSMoveToBezierPathElement:
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
p = NSMakePoint(f, g);
[self moveToPoint: p];
//NSLog(@"Decoded move %@", NSStringFromPoint(p));
break;
case NSLineToBezierPathElement:
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
p = NSMakePoint(f, g);
[self lineToPoint: p];
//NSLog(@"Decoded line %@", NSStringFromPoint(p));
break;
case NSCurveToBezierPathElement:
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
cp1 = NSMakePoint(f, g);
[d deserializeDataAt: &c
ofObjCType: "c"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
cp2 = NSMakePoint(f, g);
[d deserializeDataAt: &c
ofObjCType: "c"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
p = NSMakePoint(f, g);
[self curveToPoint: p
controlPoint1: cp1
controlPoint2: cp2];
//NSLog(@"Decoded curve %@ %@ %@", NSStringFromPoint(p), NSStringFromPoint(cp1), NSStringFromPoint(cp2));
break;
case NSClosePathBezierPathElement:
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
p = NSMakePoint(f, g);
[d deserializeDataAt: &c
ofObjCType: "c"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &f
ofObjCType: "f"
atCursor: &cursor
context: nil];
[d deserializeDataAt: &g
ofObjCType: "f"
atCursor: &cursor
context: nil];
cp1 = NSMakePoint(f, g);
//NSLog(@"Decoded close %@ %@", NSStringFromPoint(p), NSStringFromPoint(cp1));
[self closePath];
break;
default:
break;
}
}
}
}
else