From: Matthias Kramm <kramm@quiss.org>
Date: Wed, 31 Mar 2010 18:44:41 +0000 (-0700)
Subject: minor speedups/bugfixes
X-Git-Tag: version-0-9-1~61^2
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=f25fd347b67d4f6cb2076c2a4455a6ff55a4b61a

minor speedups/bugfixes
---

diff --git a/lib/devices/record.c b/lib/devices/record.c
index 796e086..165e4c5 100644
--- a/lib/devices/record.c
+++ b/lib/devices/record.c
@@ -185,6 +185,7 @@ static void dumpImage(writer_t*w, state_t*state, gfximage_t*img)
     //48.0% images (3488650 bytes) (without filter, Z_BEST_SPEED)
     //55.3% images (4665889 bytes) (without filter, fastlz level 2)
     //55.6% images (4726334 bytes) (without filter, fastlz level 1)
+    //83.0% images (18091804 bytes) (no compression)
 
     gfxcolor_t*image;
 #ifdef FILTER_IMAGES
@@ -206,7 +207,7 @@ static void dumpImage(writer_t*w, state_t*state, gfximage_t*img)
 #ifdef HAVE_FASTLZ
     compressdata_size = fastlz_compress_level(2, (void*)image, size*sizeof(gfxcolor_t), compressdata);
 #else
-    compress2(compressdata, &compressdata_size, (void*)image, sizeof(gfxcolor_t)*size, 6);
+    compress2(compressdata, &compressdata_size, (void*)image, sizeof(gfxcolor_t)*size, Z_BEST_SPEED);
 #endif
 
     writer_writeU32(w, compressdata_size);
diff --git a/lib/png.c b/lib/png.c
index b899d98..d917cbd 100644
--- a/lib/png.c
+++ b/lib/png.c
@@ -1513,11 +1513,11 @@ static int png_apply_filter(unsigned char*dest, unsigned char*src, int width, in
 
 int png_apply_filter_8(unsigned char*dest, unsigned char*src, int width, int y)
 {
-    png_apply_filter(dest, src, width, y, 8);
+    return png_apply_filter(dest, src, width, y, 8);
 }
 int png_apply_filter_32(unsigned char*dest, unsigned char*src, int width, int y)
 {
-    png_apply_filter(dest, src, width, y, 32);
+    return png_apply_filter(dest, src, width, y, 32);
 }
 
 EXPORT void savePNG(const char*filename, unsigned char*data, int width, int height, int numcolors)