X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=bbd8641c0ff745d1a8542db4d1ea2373a711e69b;hb=6c3ab5574d31504d24710c2756899d49275c1a37;hp=1d9d4121147f5fa5f366a9ea773a90f94f752ea8;hpb=493a94f9e3719d48921a3b1e32c0c1552a7bceff;p=swftools.git diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c index 1d9d412..bbd8641 100644 --- a/lib/modules/swfbits.c +++ b/lib/modules/swfbits.c @@ -21,6 +21,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef __cplusplus +extern "C" { +#endif +#include "jpeglib.h" +#ifdef __cplusplus +} +#endif + #define OUTBUFFER_SIZE 0x8000 int swf_ImageHasAlpha(RGBA*img, int width, int height) @@ -112,7 +120,7 @@ int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*pal int palette_overflow = 0; U32 lastcol32 = 0; - pal = malloc(65536*sizeof(U32)); + pal = (U32*)malloc(65536*sizeof(U32)); memset(size, 0, sizeof(size)); @@ -270,6 +278,7 @@ int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits) if (!jpeg) return -1; jpeg_finish_compress(&jpeg->cinfo); + jpeg_destroy_compress(&jpeg->cinfo); rfx_free(jpeg); return 0; } @@ -393,6 +402,7 @@ int swf_SetJPEGBits(TAG * t, char *fname, int quality) } } + rfx_free(scanline); swf_SetJPEGBitsFinish(out); jpeg_finish_decompress(&cinfo); fclose(f); @@ -466,7 +476,7 @@ void swf_SaveJPEG(char*filename, RGBA*pixels, int width, int height, int quality perror(buf); return; } - data2 = rfx_calloc(width*3); + data2 = (unsigned char *)rfx_calloc(width*3); memset(&cinfo, 0, sizeof(cinfo)); memset(&jerr, 0, sizeof(jerr)); @@ -600,7 +610,7 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height) jpeg_read_header(&cinfo, TRUE); *width = cinfo.image_width; *height = cinfo.image_height; - dest = + dest = (RGBA*) rfx_alloc(sizeof(RGBA) * cinfo.image_width * cinfo.image_height); jpeg_start_decompress(&cinfo); @@ -626,7 +636,7 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height) #ifdef HAVE_ZLIB if(offset) { - U32 datalen = cinfo.output_width*cinfo.output_height; + uLongf datalen = cinfo.output_width*cinfo.output_height; U8* alphadata = (U8*)rfx_alloc(datalen); int error; tag->len = oldtaglen; @@ -658,7 +668,7 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height) int RFXSWF_deflate_wraper(TAG * t, z_stream * zs, boolean finish) { - U8 *data = rfx_alloc(OUTBUFFER_SIZE); + U8 *data = (U8*)rfx_alloc(OUTBUFFER_SIZE); zs->next_out = data; zs->avail_out = OUTBUFFER_SIZE; while (1) { @@ -714,7 +724,7 @@ int swf_SetLosslessBits(TAG * t, U16 width, U16 height, void *bitmap, U8 bitmap_ switch (bitmap_flags) { case BMF_8BIT: - return swf_SetLosslessBitsIndexed(t, width, height, bitmap, NULL, 256); + return swf_SetLosslessBitsIndexed(t, width, height, (U8*)bitmap, NULL, 256); case BMF_16BIT: bps = BYTES_PER_SCANLINE(sizeof(U16) * width); break; @@ -739,7 +749,7 @@ int swf_SetLosslessBits(TAG * t, U16 width, U16 height, void *bitmap, U8 bitmap_ if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) == Z_OK) { zs.avail_in = bps * height; - zs.next_in = bitmap; + zs.next_in = (Bytef *)bitmap; if (RFXSWF_deflate_wraper(t, &zs, TRUE) < 0) res = -3; @@ -760,7 +770,7 @@ int swf_SetLosslessBitsIndexed(TAG * t, U16 width, U16 height, U8 * bitmap, RGBA if (!pal) // create default palette for grayscale images { int i; - pal = rfx_alloc(256 * sizeof(RGBA)); + pal = (RGBA*)rfx_alloc(256 * sizeof(RGBA)); for (i = 0; i < 256; i++) { pal[i].r = pal[i].g = pal[i].b = i; pal[i].a = 0xff; @@ -788,7 +798,7 @@ int swf_SetLosslessBitsIndexed(TAG * t, U16 width, U16 height, U8 * bitmap, RGBA if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) == Z_OK) { U8 *zpal; // compress palette - if ((zpal = rfx_alloc(ncolors * 4))) { + if ((zpal = (U8*)rfx_alloc(ncolors * 4))) { U8 *pp = zpal; int i; @@ -867,6 +877,7 @@ void swf_PreMultiplyAlpha(RGBA*data, int width, int height) } } +/* expects mem to be non-premultiplied */ void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height) { int hasalpha = swf_ImageHasAlpha(data, width, height); @@ -915,7 +926,7 @@ void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height) RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight) { int id, format, height, width, pos; - U32 datalen, datalen2; + uLongf datalen, datalen2; int error; int bpp = 1; int cols = 0; @@ -953,7 +964,7 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight) *dwidth = width = swf_GetU16(tag); *dheight = height = swf_GetU16(tag); - dest = rfx_alloc(sizeof(RGBA) * width * height); + dest = (RGBA*)rfx_alloc(sizeof(RGBA) * width * height); if (format == 3) cols = swf_GetU8(tag) + 1; @@ -966,7 +977,7 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight) if (data) rfx_free(data); datalen += 4096; - data = rfx_alloc(datalen); + data = (U8*)rfx_alloc(datalen); error = uncompress(data, &datalen, &tag->data[tag->pos], tag->len - tag->pos); @@ -1006,20 +1017,13 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight) } } else { for (x = 0; x < width; x++) { - /* TODO: is un-premultiplying alpha the right thing to do? - dest[pos2].r = data[pos + 1]; - dest[pos2].g = data[pos + 2]; - dest[pos2].b = data[pos + 3];*/ + /* remove premultiplication */ 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]; - } + if(alpha) + alpha = 0xff0000/alpha; + dest[pos2].r = (data[pos + 1]*alpha)>>16; + dest[pos2].g = (data[pos + 2]*alpha)>>16; + dest[pos2].b = (data[pos + 3]*alpha)>>16; dest[pos2].a = data[pos + 0]; //alpha pos2++; pos += 4; @@ -1042,6 +1046,8 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight) #endif // HAVE_ZLIB #if defined(HAVE_ZLIB) && defined(HAVE_JPEGLIB) + +/* expects bitmap to be non-premultiplied */ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality) { JPEGBITS *jpeg; @@ -1058,6 +1064,14 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit U8 scanline[3 * width]; int x, p = 0; for (x = 0; x < width; x++) { + //int ia = bitmap[width*y+x].a; + //if(ia) { + // /* remove premultiplication */ + // ia = 0xff0000/ia; + //} + //scanline[p++] = (bitmap[width * y + x].r*ia)>>16; + //scanline[p++] = (bitmap[width * y + x].g*ia)>>16; + //scanline[p++] = (bitmap[width * y + x].b*ia)>>16; scanline[p++] = bitmap[width * y + x].r; scanline[p++] = bitmap[width * y + x].g; scanline[p++] = bitmap[width * y + x].b; @@ -1067,7 +1081,7 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit swf_SetJPEGBitsFinish(jpeg); PUT32(&tag->data[pos], tag->len - pos - 4); - data = rfx_alloc(OUTBUFFER_SIZE); + data = (U8*)rfx_alloc(OUTBUFFER_SIZE); memset(&zs, 0x00, sizeof(z_stream)); if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK) { @@ -1124,6 +1138,7 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit return 0; } +/* expects mem to be non-premultiplied */ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality) { TAG *tag1 = 0, *tag2 = 0; @@ -1145,7 +1160,7 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali swf_SetJPEGBits2(tag2, width, height, mem, quality); } - if(tag1 && tag1->len < tag2->len) { + if(quality>100 || (tag1 && tag1->len < tag2->len)) { /* use the zlib version- it's smaller */ tag1->prev = tag; if(tag) tag->next = tag1; @@ -1214,7 +1229,7 @@ void swf_RemoveJPEGTables(SWF * swf) if (tag->id == ST_DEFINEBITSJPEG) { int len = tag->len; void *data = rfx_alloc(len); - swf_GetBlock(tag, data, tag->len); + swf_GetBlock(tag, (U8*)data, tag->len); swf_ResetTag(tag, ST_DEFINEBITSJPEG2); swf_SetBlock(tag, &((U8*)data)[0], 2); //id swf_SetBlock(tag, tables_tag->data, tables_tag->len); @@ -1241,7 +1256,7 @@ static int bicubic = 0; static scale_lookup_t**make_scale_lookup(int width, int newwidth) { - scale_lookup_t*lookupx = malloc((width>newwidth?width:newwidth)*2*sizeof(scale_lookup_t)); + scale_lookup_t*lookupx = (scale_lookup_t*)malloc((width>newwidth?width:newwidth)*2*sizeof(scale_lookup_t)); scale_lookup_t**lblockx = (scale_lookup_t**)malloc((newwidth+1)*sizeof(scale_lookup_t**)); double fx = ((double)width)/((double)newwidth); double px = 0;