git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented url resolving in namespaces
[swftools.git]
/
lib
/
modules
/
swfdraw.c
diff --git
a/lib/modules/swfdraw.c
b/lib/modules/swfdraw.c
index
66f169c
..
333fdb9
100644
(file)
--- a/
lib/modules/swfdraw.c
+++ b/
lib/modules/swfdraw.c
@@
-1,5
+1,7
@@
// swfdraw.c
// swfdraw.c
+#include "../rfxswf.h"
+
typedef struct _SWFSHAPEDRAWER
{
SHAPE*shape;
typedef struct _SWFSHAPEDRAWER
{
SHAPE*shape;
@@
-23,7
+25,7
@@
static void swf_ShapeDrawerClear(drawer_t*draw);
static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int linestylebits)
{
static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int linestylebits)
{
- SWFSHAPEDRAWER*sdraw = rfx_calloc(sizeof(SWFSHAPEDRAWER));
+ SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)rfx_calloc(sizeof(SWFSHAPEDRAWER));
draw->internal = sdraw;
draw->setLineStyle = swf_ShapeDrawerSetLineStyle;
draw->internal = sdraw;
draw->setLineStyle = swf_ShapeDrawerSetLineStyle;
@@
-95,8
+97,8
@@
static void fixEndPoint(drawer_t*draw)
static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int x = to->x*20;
- int y = to->y*20;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
/* we need to write moveto always- it
might be that it signals the end of a polygon, otherwise
/* we need to write moveto always- it
might be that it signals the end of a polygon, otherwise
@@
-117,8
+119,8
@@
static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int x = to->x*20;
- int y = to->y*20;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
@@
-135,10
+137,10
@@
static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT* to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT* to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int tx = c1->x*20;
- int ty = c1->y*20;
- int x = to->x*20;
- int y = to->y*20;
+ int tx = c1->x*20+0.001;
+ int ty = c1->y*20+0.001;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
@@
-177,7
+179,7
@@
static void swf_ShapeDrawerClear(drawer_t*draw)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
if(sdraw->tagfree) {
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
if(sdraw->tagfree) {
- swf_DeleteTag(sdraw->tag);
+ swf_DeleteTag(0, sdraw->tag);
sdraw->tag = 0;
}
swf_ShapeFree(sdraw->shape);
sdraw->tag = 0;
}
swf_ShapeFree(sdraw->shape);
@@
-196,7
+198,7
@@
SRECT swf_ShapeDrawerGetBBox(drawer_t*draw)
SHAPE* swf_ShapeDrawerToShape(drawer_t*draw)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
SHAPE* swf_ShapeDrawerToShape(drawer_t*draw)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- SHAPE* shape = rfx_alloc(sizeof(SHAPE));
+ SHAPE* shape = (SHAPE*)rfx_alloc(sizeof(SHAPE));
if(!sdraw->isfinished) {
fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
swf_ShapeDrawerFinish(draw);
if(!sdraw->isfinished) {
fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
swf_ShapeDrawerFinish(draw);