break;
double x,y;
char s[256];
- if(sscanf(line, "%lf %lf %s", &x, &y, &s) == 3) {
- if(s && !strcmp(s,"moveto")) {
+ if(sscanf(line, "%lf %lf %s", &x, &y, (char*)&s) == 3) {
+ if(!strcmp(s,"moveto")) {
w->moveto(w, convert_coord(x,z), convert_coord(y,z));
count++;
- } else if(s && !strcmp(s,"lineto")) {
+ } else if(!strcmp(s,"lineto")) {
w->lineto(w, convert_coord(x,z), convert_coord(y,z));
count++;
} else {
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;
}
data->last = p;
}
+
+static inline int direction(point_t p1, point_t p2)
+{
+ int diff = p1.y - p2.y;
+ if(diff) return diff;
+ return p1.x - p2.x;
+}
+
static void compactlineto(polywriter_t*w, int32_t x, int32_t y)
{
compactpoly_t*data = (compactpoly_t*)w->internal;
point_t p;
p.x = x;
p.y = y;
- if(p.x == data->last.x && p.y == data->last.y)
+
+ int diff = direction(p, data->last);
+ if(!diff)
return;
+ segment_dir_t dir = diff<0?DIR_UP:DIR_DOWN;
- if((p.y < data->last.y && data->dir != DIR_UP) ||
- (p.y > data->last.y && data->dir != DIR_DOWN) || data->new) {
+ if(dir!=data->dir || data->new) {
finish_segment(data);
- data->dir = p.y > data->last.y ? DIR_DOWN : DIR_UP;
+ data->dir = dir;
data->points[0] = data->last;
data->num_points = 1;
}
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);
}