X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=3baa33f87151f1fc8d3dfc5ff4fb18137ded03be;hb=a0c23e11cb8ea79e4fabd9d491d1716412746df4;hp=409ed967b82786ea886f2f3cad2ed13ea1ed5106;hpb=8d1ee53eb333a1d5bac422c3fbdf421da5f74900;p=swftools.git

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index 409ed96..3baa33f 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -150,8 +150,10 @@ int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*pal
 	}
 	lastcol32 = col32;
     }
-    if(palette_overflow)
+    if(palette_overflow) {
+	free(pal);
 	return width*height;
+    }
     if(palette) {
 	int i = 0;
 	for(t=0;t<256;t++) {
@@ -398,11 +400,128 @@ int swf_SetJPEGBits(TAG * t, char *fname, int quality)
     return 0;
 }
 
+typedef struct _JPEGFILEMGR {
+    struct jpeg_destination_mgr mgr;
+    JOCTET *buffer;
+    struct jpeg_compress_struct* cinfo;
+    struct jpeg_error_mgr* jerr;
+    FILE*fi;
+} JPEGFILEMGR;
+
+static void file_init_destination(j_compress_ptr cinfo) 
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    fmgr->buffer = (JOCTET*)rfx_alloc(OUTBUFFER_SIZE);
+    if(!fmgr->buffer) {
+	perror("malloc");
+	fprintf(stderr, "Out of memory!\n");
+	exit(1);
+    }
+
+    dmgr->next_output_byte = fmgr->buffer;
+    dmgr->free_in_buffer = OUTBUFFER_SIZE;
+}
+
+static boolean file_empty_output_buffer(j_compress_ptr cinfo)
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    if(fmgr->fi)
+	fwrite(fmgr->buffer, OUTBUFFER_SIZE, 1, fmgr->fi);
+
+    dmgr->next_output_byte = fmgr->buffer;
+    dmgr->free_in_buffer = OUTBUFFER_SIZE;
+    return 1;
+}
+
+static void file_term_destination(j_compress_ptr cinfo) 
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    if(fmgr->fi)
+        fwrite(fmgr->buffer, OUTBUFFER_SIZE-dmgr->free_in_buffer, 1, fmgr->fi);
+
+    rfx_free(fmgr->buffer);
+    fmgr->buffer = 0;
+    dmgr->free_in_buffer = 0;
+    dmgr->next_output_byte = 0;
+}
+
+void swf_SaveJPEG(char*filename, RGBA*pixels, int width, int height, int quality)
+{
+    JPEGFILEMGR fmgr;
+    struct jpeg_compress_struct cinfo;
+    struct jpeg_error_mgr jerr;
+    unsigned char*data2 = 0;
+    int y;
+
+    FILE*fi = fopen(filename, "wb");
+    if(!fi) {
+	char buf[256];
+	sprintf(buf, "rfxswf: Couldn't create %s", filename);
+	perror(buf);
+	return;
+    }
+    data2 = rfx_calloc(width*3);
+
+    memset(&cinfo, 0, sizeof(cinfo));
+    memset(&jerr, 0, sizeof(jerr));
+    memset(&fmgr, 0, sizeof(fmgr));
+    cinfo.err = jpeg_std_error(&jerr);
+    jpeg_create_compress(&cinfo);
+
+    fmgr.mgr.init_destination = file_init_destination;
+    fmgr.mgr.empty_output_buffer = file_empty_output_buffer;
+    fmgr.mgr.term_destination = file_term_destination;
+    fmgr.fi = fi;
+    fmgr.cinfo = &cinfo;
+    fmgr.jerr = &jerr;
+    cinfo.dest = (struct jpeg_destination_mgr*)&fmgr;
+
+    // init compression
+
+    cinfo.image_width  = width;
+    cinfo.image_height = height;
+    cinfo.input_components = 3;
+    cinfo.in_color_space = JCS_RGB;
+    jpeg_set_defaults(&cinfo);
+    cinfo.dct_method = JDCT_IFAST;
+    jpeg_set_quality(&cinfo,quality,TRUE);
+
+    //jpeg_write_tables(&cinfo);
+    //jpeg_suppress_tables(&cinfo, TRUE);
+    jpeg_start_compress(&cinfo, FALSE);
+
+    for(y=0;y<height;y++) {
+	int x;
+	RGBA*src = &pixels[y*width];
+	for(x=0;x<width;x++) {
+	    data2[x*3+0] = src[x].r;
+	    data2[x*3+1] = src[x].g;
+	    data2[x*3+2] = src[x].b;
+	}
+        jpeg_write_scanlines(&cinfo, &data2, 1);
+    }
+    rfx_free(data2);
+    jpeg_finish_compress(&cinfo);
+    jpeg_destroy_compress(&cinfo);
+
+    fclose(fi);
+}
+
 /*  jpeg_source_mgr functions */
 static void tag_init_source(struct jpeg_decompress_struct *cinfo)
 {
     TAG *tag = (TAG *) cinfo->client_data;
-    swf_SetTagPos(tag, 2);
+    if (tag->id == ST_DEFINEBITSJPEG3) {
+	swf_SetTagPos(tag, 6);
+    } else {
+	swf_SetTagPos(tag, 2);
+    }
     cinfo->src->bytes_in_buffer = 0;
 }
 static boolean tag_fill_input_buffer(struct jpeg_decompress_struct *cinfo)
@@ -446,18 +565,24 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     struct jpeg_source_mgr mgr;
     RGBA *dest;
     int y;
+    int offset = 0;
+    int oldtaglen = 0;
     *width = 0;
     *height = 0;
 
     if (tag->id == ST_DEFINEBITSJPEG) {
-	fprintf(stderr,
-		"rfxswf: extracting from definebitsjpeg not yet supported");
+	fprintf(stderr, "rfxswf: extracting from definebitsjpeg not yet supported\n");
 	return 0;
     }
     if (tag->id == ST_DEFINEBITSJPEG3) {
-	fprintf(stderr,
-		"rfxswf: extracting from definebitsjpeg3 not yet supported");
+#ifdef HAVE_ZLIB
+	offset = swf_GetU32(tag);
+	oldtaglen = tag->len;
+	tag->len = offset+6;
+#else
+	fprintf(stderr, "rfxswf: extracting from definebitsjpeg3 not possible: no zlib\n");
 	return 0;
+#endif
     }
 
     cinfo.err = jpeg_std_error(&jerr);
@@ -498,6 +623,30 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     jpeg_finish_decompress(&cinfo);
 
     jpeg_destroy_decompress(&cinfo);
+
+#ifdef HAVE_ZLIB
+    if(offset) {
+	U32 datalen = cinfo.output_width*cinfo.output_height;
+	U8* alphadata = (U8*)rfx_alloc(datalen);
+	int error;
+	tag->len = oldtaglen;
+	swf_SetTagPos(tag, 6+offset);
+	error = uncompress(alphadata, &datalen, &tag->data[tag->pos], tag->len - tag->pos);
+	if (error != Z_OK) {
+	    fprintf(stderr, "rfxswf: Zlib error %d while extracting definejpeg3\n", error);
+	    return 0;
+	}
+	for(y=0;y<cinfo.output_height;y++) {
+	    RGBA*line = &dest[y*cinfo.output_width];
+	    U8*aline = &alphadata[y*cinfo.output_width];
+	    int x;
+	    for(x=0;x<cinfo.output_width;x++) {
+		line[x].a = aline[x];
+	    }
+	}
+	free(alphadata);
+    }
+#endif
     return dest;
 }
 
@@ -861,9 +1010,16 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 		       dest[pos2].r = data[pos + 1];
 		       dest[pos2].g = data[pos + 2];
 		       dest[pos2].b = data[pos + 3];*/
-		    dest[pos2].r = ((int)data[pos + 1]*255)/(int)data[pos+0];
-		    dest[pos2].g = ((int)data[pos + 2]*255)/(int)data[pos+0];
-		    dest[pos2].b = ((int)data[pos + 3]*255)/(int)data[pos+0];
+		    int alpha = data[pos+0];
+		    if(alpha) {
+			dest[pos2].r = ((int)data[pos + 1]*255)/alpha;
+			dest[pos2].g = ((int)data[pos + 2]*255)/alpha;
+			dest[pos2].b = ((int)data[pos + 3]*255)/alpha;
+		    } else {
+			dest[pos2].r = data[pos + 1];
+			dest[pos2].g = data[pos + 2];
+			dest[pos2].b = data[pos + 3];
+		    }
 		    dest[pos2].a = data[pos + 0];	//alpha
 		    pos2++;
 		    pos += 4;
@@ -1010,6 +1166,9 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
 RGBA *swf_ExtractImage(TAG * tag, int *dwidth, int *dheight)
 {
     RGBA *img;
+    
+    swf_SetTagPos(tag, 2); // id is 2 bytes
+
     if (tag->id == ST_DEFINEBITSJPEG ||
 	tag->id == ST_DEFINEBITSJPEG2 || tag->id == ST_DEFINEBITSJPEG3) {
 #ifdef HAVE_JPEGLIB
@@ -1132,6 +1291,7 @@ static scale_lookup_t**make_scale_lookup(int width, int newwidth)
     lblockx[newwidth] = p_x;
     return lblockx;
 }
+static int monochrome_warning = 0;
 RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight)
 {
     int x,y;
@@ -1145,8 +1305,12 @@ RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheig
     /* this is bad because this scaler doesn't yet handle monochrome
        images with 2 colors in a way that the final image hasn't more
        than 256 colors */
-    if(swf_ImageGetNumberOfPaletteEntries2(data, width, height) == 2)
-	fprintf(stderr, "Warning: scaling monochrome image\n");
+    if(swf_ImageGetNumberOfPaletteEntries2(data, width, height) == 2) {
+	if(!monochrome_warning) {
+	    fprintf(stderr, "Warning: scaling monochrome image\n");
+	    monochrome_warning = 1;
+	}
+    }
 
     tmpline = (rgba_int_t*)malloc(width*sizeof(rgba_int_t));
     newdata = (RGBA*)malloc(newwidth*newheight*sizeof(RGBA));
@@ -1207,3 +1371,4 @@ RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheig
     return newdata;
 }
 
+