X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Farts.c;h=ca03a80aa70870b230ca067a22756f6196080481;hb=0784a8a882e7b98299fb6a90f0f9a7ebb322562b;hp=510df3e5bf5ac883b73513593f6ea954e53959cf;hpb=70c85e8a814e75b29883fc347a65f83af370249b;p=swftools.git

diff --git a/lib/devices/arts.c b/lib/devices/arts.c
index 510df3e..ca03a80 100644
--- a/lib/devices/arts.c
+++ b/lib/devices/arts.c
@@ -21,13 +21,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <memory.h>
+#include <string.h>
+#include <math.h>
 #include "../mem.h"
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
 #include "../art/libart.h"
-#include "artsutils.c"
+#include "arts.h"
+#include "artsutils.h"
 
 typedef struct _clip {
     ArtSVP*svp;
@@ -41,6 +46,7 @@ typedef struct _internal {
 } internal_t;
 
 static int verbose = 0;
+
 static void dbg(char*format, ...)
 {
     if(!verbose)
@@ -179,68 +185,6 @@ void arts_fillbitmap(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxm
     internal_t*i = (internal_t*)dev->internal;
     ArtSVP* svp = gfxfillToSVP(line, 1);
 
-    // We need to make sure that the SVP we now have bounds an area (i.e. the
-    // source line wound anticlockwise) rather than excludes an area (i.e. the
-    // line wound clockwise). It seems that PDF (or xpdf) is less strict about
-    // this for bitmaps than it is for fill areas.
-    //
-    // To check this, we'll sum the cross products of all pairs of adjacent
-    // lines. If the result is positive, the direction is correct; if not, we
-    // need to reverse the sense of the SVP generated. The easiest way to do
-    // this is to flip the up/down flags of all the segments.
-    //
-    // This is approximate; since the gfxline_t structure can contain any
-    // combination of moveTo, lineTo and splineTo in any order, not all pairs
-    // of lines in the shape that share a point need be described next to each
-    // other in the sequence. For ease, we'll consider only pairs of lines
-    // stored as lineTos and splineTos without intervening moveTos.
-    //
-    // TODO is this a valid algorithm? My vector maths is rusty.
-    //
-    // It may be more correct to instead reverse the line before we feed it
-    // into gfxfilltoSVP. However, this seems equivalent and is easier to
-    // implement!
-    double total_cross_product = 0.0;
-    gfxline_t* cursor = line;
-    if (cursor != NULL)
-    {
-	double x_last = cursor->x;
-	double y_last = cursor->y;
-	cursor = cursor->next;
-
-	while((cursor != NULL) && (cursor->next != NULL))
-	{
-	    if (((cursor->type == gfx_lineTo) || (cursor->type == gfx_splineTo))
-		&& ((cursor->next->type == gfx_lineTo) || (cursor->next->type == gfx_splineTo)))
-	    {
-		// Process these lines
-		//
-		// In this space (x right, y down) the cross-product is
-		// (x1 * y0) - (x0 * y1)
-		double x0 = cursor->x - x_last;
-		double y0 = cursor->y - y_last;
-		double x1 = cursor->next->x - cursor->x;
-		double y1 = cursor->next->y - cursor->y;
-		total_cross_product += (x1 * y0) - (x0 * y1);
-	    }
-
-	    x_last = cursor->x;
-	    y_last = cursor->y;
-	    cursor = cursor->next;
-	}
-    }
-    if (total_cross_product < 0.0)
-    {
-	int i = 0;
-	for(; i < svp->n_segs; ++i)
-	{
-	    if (svp->segs[i].dir != 0)
-		svp->segs[i].dir = 0;
-	    else
-		svp->segs[i].dir = 1;
-	}
-    }
-
     if(i->clip) {
 	ArtSVP*old = svp;
 	svp = art_svp_intersect(svp, i->clip->svp);
@@ -280,6 +224,8 @@ void arts_addfont(struct _gfxdevice*dev, gfxfont_t*font)
 void arts_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*color, gfxmatrix_t*matrix)
 {
     dbg("arts_drawchar");
+    if(!font)
+	return;
     internal_t*i = (internal_t*)dev->internal;
     gfxline_t*glyph = gfxline_clone(font->glyphs[glyphnr].line);
     gfxline_transform(glyph, matrix);
@@ -312,7 +258,7 @@ void arts_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcolor_
     gfxline_free(glyph);
 }
 
-void arts_drawlink(struct _gfxdevice*dev, gfxline_t*line, char*action)
+void arts_drawlink(struct _gfxdevice*dev, gfxline_t*line, const char*action)
 {
     dbg("arts_drawlink");
     internal_t*i = (internal_t*)dev->internal;
@@ -396,6 +342,6 @@ void gfxdevice_union_init(gfxdevice_t*dev,gfxdevice_t*out)
     dev->finish = arts_finish;
 
     i->out = out;
-    i->svpunion = gfxstrokeToSVP(0, 0, 0, 0, 0);
+    i->svpunion = gfxstrokeToSVP(0, 0, gfx_capButt, gfx_joinMiter, 0);
 }