git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added avifile_initialized flag.
[swftools.git]
/
lib
/
drawer.c
diff --git
a/lib/drawer.c
b/lib/drawer.c
index
e02fed4
..
3ff0299
100644
(file)
--- a/
lib/drawer.c
+++ b/
lib/drawer.c
@@
-84,6
+84,14
@@
void draw_string(drawer_t*draw, const char*string)
to.y = atoi(getToken(&p));
draw->splineTo(draw, &mid, &to);
}
to.y = atoi(getToken(&p));
draw->splineTo(draw, &mid, &to);
}
+ else if(!strncmp(token, "conicTo", 5)) {
+ FPOINT mid,to;
+ mid.x = atoi(getToken(&p));
+ mid.y = atoi(getToken(&p));
+ to.x = atoi(getToken(&p));
+ to.y = atoi(getToken(&p));
+ draw_conicTo(draw, &mid, &to);
+ }
else if(!strncmp(token, "cubicTo", 5)) {
FPOINT mid1,mid2,to;
mid1.x = atoi(getToken(&p));
else if(!strncmp(token, "cubicTo", 5)) {
FPOINT mid1,mid2,to;
mid1.x = atoi(getToken(&p));
@@
-94,7
+102,7
@@
void draw_string(drawer_t*draw, const char*string)
to.y = atoi(getToken(&p));
draw_cubicTo(draw, &mid1, &mid2, &to);
}
to.y = atoi(getToken(&p));
draw_cubicTo(draw, &mid1, &mid2, &to);
}
- else fprintf(stderr, "drawer: Warning: unknown primitive '%s'", token);
+ else fprintf(stderr, "drawer: Warning: unknown primitive '%s'\n", token);
free(token);
}
free(token);
}
@@
-245,9
+253,7
@@
void draw_cubicTo(drawer_t*draw, FPOINT* control1, FPOINT* control2, FPOINT* t
struct cspline c;
double quality = 80;
double maxerror = (500-(quality*5)>1?500-(quality*5):1)/20.0;
struct cspline c;
double quality = 80;
double maxerror = (500-(quality*5)>1?500-(quality*5):1)/20.0;
-
- int num = approximate3(&c, q, 128, maxerror*maxerror);
- int t;
+ int t,num;
c.start.x = draw->pos.x;
c.start.y = draw->pos.y;
c.start.x = draw->pos.x;
c.start.y = draw->pos.y;
@@
-257,6
+263,8
@@
void draw_cubicTo(drawer_t*draw, FPOINT* control1, FPOINT* control2, FPOINT* t
c.control2.y = control2->y;
c.end.x = to->x;
c.end.y = to->y;
c.control2.y = control2->y;
c.end.x = to->x;
c.end.y = to->y;
+
+ num = approximate3(&c, q, 128, maxerror*maxerror);
for(t=0;t<num;t++) {
FPOINT mid;
for(t=0;t<num;t++) {
FPOINT mid;