author: yoya

zlib compress level を swf_object_t で管理する (2つ漏れてたので対応)

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/swfed/trunk@452 7c90b180-03d5-4157-b861-58a559ae9d1e

diff --git a/src/swf_tag_jpeg.c b/src/swf_tag_jpeg.c
index 99dc072..86564e2 100644 (file)
--- a/src/swf_tag_jpeg.c
+++ b/src/swf_tag_jpeg.c
@@ -310,7 +310,7 @@ swf_tag_jpeg3_output_detail(swf_tag_t *tag, unsigned long *length,
     compsize = old_size * 1.001 + 12; // 稀に増える事もあるので
     new_buff = malloc(compsize);
     //    result = compress2(new_buff, &compsize, swf_tag_jpeg->alpha_data, old_size, swf->compress_level);
-    result = compress(new_buff, &compsize, swf_tag_jpeg->alpha_data, old_size);
+    result = compress2(new_buff, &compsize, swf_tag_jpeg->alpha_data, old_size, swf->compress_level);
     if (result != Z_OK) {
         if (result == Z_MEM_ERROR) {
             fprintf(stderr, "swf_tag_jpeg_output_detail: compress Z_MEM_ERROR: can't malloc\n");

diff --git a/src/swf_tag_lossless.c b/src/swf_tag_lossless.c
index e21b2a2..5406a3b 100644 (file)
--- a/src/swf_tag_lossless.c
+++ b/src/swf_tag_lossless.c
@@ -309,7 +309,7 @@ swf_tag_lossless_output_detail(swf_tag_t *tag, unsigned long *length,
         old_size = bitstream_length(bs2);
         compsize = old_size * 1.001 + 12; // 稀に増える事もあるので
         tmp_buff = malloc(compsize);
-        result = compress(tmp_buff, &compsize, old_buff_ref, old_size);
+        result = compress2(tmp_buff, &compsize, old_buff_ref, old_size, swf->compress_level);
         if (result != Z_OK) {
             if (result == Z_MEM_ERROR) {
                 fprintf(stderr, "swf_tag_lossless_output_detail: compress Z_MEM_ERROR: can't malloc\n");