X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=76525ea502ed72578aa21390bbd6c6c234334aa7;hb=a5c6cfc6f6b4ffdcee8e63116b0c507b0388cac0;hp=60d3f303be894e4f6b53c333c8e659499bda5727;hpb=30d759dca916b6ac62eebeaf420d0318f3491d1f;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index 60d3f30..76525ea 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -315,6 +315,57 @@ gfxline_t * gfxline_clone(gfxline_t*line)
     }
     return dest;
 }
+void gfxline_optimize(gfxline_t*line)
+{
+    gfxline_t*l = line;
+    /* step 1: convert splines to lines, where possible */
+    double x=0,y=0;
+    while(l) {
+	if(l->type == gfx_splineTo) {
+	    double dx = l->x-x;
+	    double dy = l->y-y;
+	    double sx = l->sx-x;
+	    double sy = l->sy-y;
+	    if(fabs(dx*sy - dy*sx) < 0.000001 && (dx*sx + dy*sy) >= 0) {
+		l->type = gfx_lineTo;
+	    }
+	}
+	x = l->x;
+	y = l->y;
+	l = l->next;
+    }
+    /* step 2: combine adjacent lines and splines, where possible */
+    l = line;
+    while(l && l->next) {
+	gfxline_t*next = l->next;
+	char combine = 0;
+	double sx=0,sy=0;
+	if(l->type == gfx_lineTo && next->type == gfx_lineTo) {
+	    double dx = l->x-x;
+	    double dy = l->y-y;
+	    double nx = next->x-x;
+	    double ny = next->y-y;
+	    if(fabs(dx*ny - dy*nx) < 0.000001 && (dx*nx + dy*ny) >= 0) {
+		combine = 1;
+	    }
+	} else if(l->type == gfx_splineTo && next->type == gfx_splineTo) {
+	    /* TODO */
+	}
+	if(combine) {
+	    l->next = next->next;
+	    next->next = 0;
+	    l->x = next->x;
+	    l->y = next->y;
+	    l->sx = sx;
+	    l->sy = sy;
+	    rfx_free(next);
+	} else {
+	    x = l->x;
+	    y = l->y;
+	    l = l->next;
+	}
+    }
+}
 
 gfxline_t* gfxtool_dash_line(gfxline_t*line, float*dashes, float phase)
 {
@@ -344,12 +395,17 @@ void gfxline_show(gfxline_t*l, FILE*fi)
 
 void gfxline_free(gfxline_t*l)
 {
-    gfxline_t*next;
-    while(l) {
-	next = l->next;
-	l->next = 0;
+    if(l && (l+1) == l->next) {
+	/* flattened */
 	rfx_free(l);
-	l = next;
+    } else {
+	gfxline_t*next;
+	while(l) {
+	    next = l->next;
+	    l->next = 0;
+	    rfx_free(l);
+	    l = next;
+	}
     }
 }
 
@@ -628,3 +684,87 @@ void gfxmatrix_dump(gfxmatrix_t*m, FILE*fi, char*prefix)
     fprintf(fi, "%f %f | %f\n", m->m00, m->m10, m->tx);
     fprintf(fi, "%f %f | %f\n", m->m01, m->m11, m->ty);
 }
+
+void gfxmatrix_transform(gfxmatrix_t*m, double* v, double*dest)
+{
+    dest[0] = m->m00*v[0] + m->m10*v[1] + m->tx;
+    dest[1] = m->m01*v[0] + m->m11*v[1] + m->ty;
+}
+void gfxmatrix_invert(gfxmatrix_t*m, gfxmatrix_t*dest)
+{
+    double det = m->m00 * m->m11 - m->m10 * m->m01;
+    if(!det) {
+	memset(dest, 0, sizeof(gfxmatrix_t));
+	return;
+    }
+    det = 1/det;
+    dest->m00 = m->m11 * det;
+    dest->m01 = -m->m01 * det;
+    dest->m10 = -m->m10 * det;
+    dest->m11 = m->m00 * det;
+    dest->tx = -(dest->m00 * m->tx + dest->m10 * m->ty);
+    dest->ty = -(dest->m01 * m->tx + dest->m11 * m->ty);
+}
+
+gfxfontlist_t* gfxfontlist_create()
+{
+    /* Initial list ist empty */
+    return 0;
+}
+
+gfxfont_t*gfxfontlist_findfont(gfxfontlist_t*list, char*id)
+{
+    gfxfontlist_t*l = list;
+    while(l) {
+	if(!strcmp((char*)l->font->id, id)) {
+	    return l->font;
+	}
+	l = l->next;
+    }
+    return 0;
+}
+char gfxfontlist_hasfont(gfxfontlist_t*list, gfxfont_t*font)
+{
+    gfxfontlist_t*l = list;
+    while(l) {
+	if(!strcmp((char*)l->font->id, font->id)) {
+	    return 1;
+	}
+	l = l->next;
+    }
+    return 0;
+}
+gfxfontlist_t*gfxfontlist_addfont(gfxfontlist_t*list, gfxfont_t*font)
+{
+    gfxfontlist_t*last=0,*l = list;
+    while(l) {
+	last = l;
+	if(!strcmp((char*)l->font->id, font->id)) {
+	    return list; // we already know this font
+	}
+	l = l->next;
+    }
+    if(!font) {
+	fprintf(stderr, "Tried to add zero font\n");
+    }
+    l = (gfxfontlist_t*)rfx_calloc(sizeof(gfxfontlist_t));
+    l->font = font;
+    l->next = 0;
+    if(last) {
+	last->next = l;
+	return list;
+    } else {
+	return l;
+    }
+}
+
+gfxline_t*gfxline_makerectangle(int x1,int y1,int x2, int y2)
+{
+    gfxline_t* line = (gfxline_t*)rfx_calloc(sizeof(gfxline_t)*5);
+    line[0].x = x1;line[0].y = y1;line[0].type = gfx_moveTo;line[0].next = &line[1];
+    line[1].x = x2;line[1].y = y1;line[1].type = gfx_lineTo;line[1].next = &line[2];
+    line[2].x = x2;line[2].y = y2;line[2].type = gfx_lineTo;line[2].next = &line[3];
+    line[3].x = x1;line[3].y = y2;line[3].type = gfx_lineTo;line[3].next = &line[4];
+    line[4].x = x1;line[4].y = y1;line[4].type = gfx_lineTo;
+    return line;
+}