X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fconvert.c;h=bb019422e9e9fe9ad2401f4a8c7eb2c236bc266f;hp=28c3b7ac778856f85f38fa693a88e9c6bb891d67;hb=9b4a07900f07d05f0f39c511c189489114817aba;hpb=879d0eec420fe0fd5ddcd56c8fe62b82a6744edd diff --git a/lib/gfxpoly/convert.c b/lib/gfxpoly/convert.c index 28c3b7a..bb01942 100644 --- a/lib/gfxpoly/convert.c +++ b/lib/gfxpoly/convert.c @@ -167,19 +167,29 @@ static void compactmoveto(polywriter_t*w, int32_t x, int32_t y) } 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; }