git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rescale prototype changed
[swftools.git]
/
lib
/
gfxtools.c
diff --git
a/lib/gfxtools.c
b/lib/gfxtools.c
index
06930ec
..
e3ab3e1
100644
(file)
--- a/
lib/gfxtools.c
+++ b/
lib/gfxtools.c
@@
-21,6
+21,7
@@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <stdio.h>
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 <memory.h>
#include <math.h>
#include <assert.h>
@@
-345,9
+346,10
@@
void gfxline_optimize(gfxline_t*line)
if(l->type == gfx_lineTo && next->type == gfx_lineTo) {
double dx = l->x-x;
double dy = l->y-y;
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) {
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) {
combine = 1;
}
} else if(l->type == gfx_splineTo && next->type == gfx_splineTo) {
@@
-779,10
+781,10
@@
void gfxfontlist_free(gfxfontlist_t*list, char deletefonts)
gfxfontlist_t*l = list;
while(l) {
gfxfontlist_t*next = l->next;
gfxfontlist_t*l = list;
while(l) {
gfxfontlist_t*next = l->next;
- memset(l, 0, sizeof(*l));
if(l->font) {
if(l->font) {
- gfxfont_free(l->font);
+ gfxfont_free(l->font);l->font;
}
}
+ l->next = 0;
free(l);
l = next;
}
free(l);
l = next;
}