Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <stdio.h>
+#include <stdlib.h>
#include <memory.h>
#include <math.h>
#include <assert.h>
#include "gfxtools.h"
+#include "gfxfont.h"
typedef struct _linedraw_internal
{
return;
}
+ l->sx = l->sy = 0;
d->x = l->x = x;
d->y = l->y = y;
l->next = 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;
+ double nx = next->x-l->x;
+ double ny = next->y-l->y;
if(fabs(dx*ny - dy*nx) < 0.000001 && (dx*nx + dy*ny) >= 0) {
+ printf("(%f %f) (%f %f)\n", dx, dy, nx, ny);
combine = 1;
}
} else if(l->type == gfx_splineTo && next->type == gfx_splineTo) {
return l;
}
}
-void gfxfontlist_free(gfxfontlist_t*list)
+void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
{
gfxfontlist_t*l = list;
while(l) {
- gfxfontlist_t*next = l;
- memset(l, 0, sizeof(*l));
+ gfxfontlist_t*next = l->next;
+ if(l->font) {
+ gfxfont_free(l->font);l->font;
+ }
+ l->next = 0;
free(l);
l = next;
}