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 <string.h>
#include <assert.h>
#include "gfxtools.h"
+#include "gfxfont.h"
typedef struct _linedraw_internal
{
static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
{
linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
- gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+ gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
l->type = gfx_moveTo;
if((int)((d->x * 5120) == (int)(x * 5120)) &&
(int)((d->y * 5120) == (int)(y * 5120))) {
return;
}
+ l->sx = l->sy = 0;
d->x = l->x = x;
d->y = l->y = y;
l->next = 0;
static void linedraw_lineTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
{
linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
- gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+ gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
if(!i->start) {
/* starts with a line, not with a moveto. That needs we first
static void linedraw_splineTo(gfxdrawer_t*d, gfxcoord_t sx, gfxcoord_t sy, gfxcoord_t x, gfxcoord_t y)
{
linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
- gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
+ gfxline_t*l = (gfxline_t*)rfx_alloc(sizeof(gfxline_t));
if(!i->start) {
/* starts with a line, not with a moveto. That needs we first
gfxline_t*dest = 0;
gfxline_t*pos = 0;
while(line) {
- gfxline_t*n = rfx_calloc(sizeof(gfxline_t));
+ gfxline_t*n = (gfxline_t*)rfx_calloc(sizeof(gfxline_t));
*n = *line;
n->next = 0;
if(!pos) {
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) {
combine = 1;
}
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(deletefonts && l->font) {
+ gfxfont_free(l->font);l->font=0;
+ }
+ l->next = 0;
free(l);
l = next;
}