git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made segment direction fill-sensitive
[swftools.git]
/
lib
/
gfxpoly
/
convert.c
diff --git
a/lib/gfxpoly/convert.c
b/lib/gfxpoly/convert.c
index
39517d7
..
28c3b7a
100644
(file)
--- a/
lib/gfxpoly/convert.c
+++ b/
lib/gfxpoly/convert.c
@@
-92,7
+92,7
@@
static void convert_file(const char*filename, polywriter_t*w, double gridsize)
break;
double x,y;
char s[256];
break;
double x,y;
char s[256];
- if(sscanf(line, "%lf %lf %s", &x, &y, &s) == 3) {
+ if(sscanf(line, "%lf %lf %s", &x, &y, (char*)&s) == 3) {
if(s && !strcmp(s,"moveto")) {
w->moveto(w, convert_coord(x,z), convert_coord(y,z));
count++;
if(s && !strcmp(s,"moveto")) {
w->moveto(w, convert_coord(x,z), convert_coord(y,z));
count++;
@@
-133,6
+133,7
@@
void finish_segment(compactpoly_t*data)
return;
point_t*p = malloc(sizeof(point_t)*data->num_points);
gfxpolystroke_t*s = rfx_calloc(sizeof(gfxpolystroke_t));
return;
point_t*p = malloc(sizeof(point_t)*data->num_points);
gfxpolystroke_t*s = rfx_calloc(sizeof(gfxpolystroke_t));
+ s->fs = &edgestyle_default;
s->next = data->poly->strokes;
data->poly->strokes = s;
s->num_points = s->points_size = data->num_points;
s->next = data->poly->strokes;
data->poly->strokes = s;
s->num_points = s->points_size = data->num_points;
@@
-513,7
+514,7
@@
gfxline_t*gfxline_from_gfxpoly(gfxpoly_t*poly)
return mkgfxline(poly, 0);
}
return mkgfxline(poly, 0);
}
-gfxline_t*gfxline_from_gfxpoly_updown(gfxpoly_t*poly)
+gfxline_t*gfxline_from_gfxpoly_with_direction(gfxpoly_t*poly)
{
return mkgfxline(poly, 1);
}
{
return mkgfxline(poly, 1);
}