X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fdevices%2Frender.c;h=c1c803c91caecab1d1c78d1b4e692e6109b92c50;hp=ae7528a410cb65acc494e6598f0439c63f4900ff;hb=6f78b0ef3998e959ce09c5ef11d46149756b682b;hpb=850539159f5e5f37d537ad6d96fda5ba5ea55d6e

diff --git a/lib/devices/render.c b/lib/devices/render.c
index ae7528a..c1c803c 100644
--- a/lib/devices/render.c
+++ b/lib/devices/render.c
@@ -25,9 +25,8 @@
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
 #include "../mem.h"
-#define PNG_INLINE_EXPORTS
 #include "../types.h"
-#include "../png.c"
+#include "../png.h"
 #include "../log.h"
 #include "render.h"
 
@@ -609,7 +608,7 @@ void render_stroke(struct _gfxdevice*dev, gfxline_t*line, gfxcoord_t width, gfxc
 static void draw_line(gfxdevice_t*dev, gfxline_t*line)
 {
     internal_t*i = (internal_t*)dev->internal;
-    double x,y;
+    double x=0,y=0;
 
     while(line)
     {
@@ -801,18 +800,18 @@ int render_result_save(gfxresult_t*r, const char*filename)
 	while(i->next) {
 	    sprintf(filenamebuf, "%s.%d.png", origname, nr);
             if(!i->palette) {
-	        writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+	        png_write(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
             } else {
-	        writePalettePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+	        png_write_palette_based_2(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
             }
 	    nr++;
 	}
 	free(origname);
     } else {
         if(!i->palette) {
-	    writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+	    png_write(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
 	} else {
-	    writePalettePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+	    png_write_palette_based_2(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
 	}
     }
     return 1;