along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
+#include "../../config.h"
+#ifdef HAVE_ZLIB
+#include <zconf.h>
+#include <zlib.h>
+#endif
+#include <fcntl.h>
+#include <ctype.h>
+
+#ifdef HAVE_JPEGLIB
+#define HAVE_BOOLEAN
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
+#endif // HAVE_JPEGLIB
+
+#include "../rfxswf.h"
+
#define OUTBUFFER_SIZE 0x8000
int swf_ImageHasAlpha(RGBA*img, int width, int height)
return hasalpha;
}
-int swf_ImageGetNumberOfPaletteEntries2(RGBA*_img, int width, int height)
-{
- int len = width*height;
- int t;
- U32* img = (U32*)_img;
- U32 color1 = img[0];
- U32 color2 = 0;
- for(t=1;t<len;t++) {
- if(img[t] != color1) {
- color2 = img[t];
- break;
- }
- }
- if(t==len)
- return 1;
-
- for(;t<len;t++) {
- if(img[t] != color1 && img[t] != color2) {
- return width*height;
- }
- }
- return 2;
-}
-
/*int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette)
{
int len = width*height;
int palette_overflow = 0;
U32 lastcol32 = 0;
- pal = malloc(65536*sizeof(U32));
+ pal = (U32*)malloc(65536*sizeof(U32));
memset(size, 0, sizeof(size));
if (!jpeg)
return -1;
jpeg_finish_compress(&jpeg->cinfo);
+ jpeg_destroy_compress(&jpeg->cinfo);
rfx_free(jpeg);
return 0;
}
-void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
- int quality)
+#if defined(HAVE_JPEGLIB)
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
{
JPEGBITS *jpeg;
int y;
jpeg = swf_SetJPEGBitsStart(tag, width, height, quality);
+ U8 *scanline = (U8*)rfx_alloc(3 * width);
for (y = 0; y < height; y++) {
- U8 scanline[3 * width];
int x, p = 0;
for (x = 0; x < width; x++) {
scanline[p++] = bitmap[width * y + x].r;
}
swf_SetJPEGBitsLine(jpeg, scanline);
}
+ rfx_free(scanline);
swf_SetJPEGBitsFinish(jpeg);
}
+#else
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+ fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+ return -1;
+}
+#endif
-void swf_GetJPEGSize(char *fname, int *width, int *height)
+void swf_GetJPEGSize(const char *fname, int *width, int *height)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
fclose(fi);
}
-int swf_SetJPEGBits(TAG * t, char *fname, int quality)
+int swf_SetJPEGBits(TAG * t, const char *fname, int quality)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
}
}
+ rfx_free(scanline);
swf_SetJPEGBitsFinish(out);
jpeg_finish_decompress(&cinfo);
fclose(f);
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));
static boolean tag_fill_input_buffer(struct jpeg_decompress_struct *cinfo)
{
TAG *tag = (TAG *) cinfo->client_data;
- if (tag->data[tag->pos + 0] == 0xff &&
+ if (tag->pos + 4 <= tag->len &&
+ tag->data[tag->pos + 0] == 0xff &&
tag->data[tag->pos + 1] == 0xd9 &&
tag->data[tag->pos + 2] == 0xff &&
tag->data[tag->pos + 3] == 0xd8) {
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);
#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;
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) {
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;
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;
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;
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;
}
}
+/* expects mem to be non-premultiplied */
void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height)
{
int hasalpha = swf_ImageHasAlpha(data, width, 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;
*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;
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);
}
} 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;
#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;
pos = tag->len;
swf_SetU32(tag, 0); //placeholder
jpeg = swf_SetJPEGBitsStart(tag, width, height, quality);
+ U8 *scanline = (U8*)rfx_alloc(3 * width);
for (y = 0; y < height; y++) {
- 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;
}
swf_SetJPEGBitsLine(jpeg, scanline);
}
+ rfx_free(scanline);
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) {
zs.next_out = data;
zs.avail_out = OUTBUFFER_SIZE;
+ scanline = (U8*)rfx_alloc(width);
for (y = 0; y < height; y++) {
- U8 scanline[width];
int x, p = 0;
for (x = 0; x < width; x++) {
scanline[p++] = bitmap[width * y + x].a;
}
}
+ rfx_free(scanline);
+
while (1) {
int ret = deflate(&zs, Z_FINISH);
if (ret != Z_OK && ret != Z_STREAM_END) {
return 0;
}
+#else
+int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+ fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+ return -1;
+}
+#endif
+
+
+/* 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;
int has_alpha = swf_ImageHasAlpha(mem,width,height);
/* try lossless image */
+
+#ifdef NO_LOSSLESS
+ tag1 = swf_InsertTag(0, /*ST_DEFINEBITSLOSSLESS1/2*/0);
+ tag1->len = 0x7fffffff;
+#else
tag1 = swf_InsertTag(0, /*ST_DEFINEBITSLOSSLESS1/2*/0);
swf_SetU16(tag1, bitid);
swf_SetLosslessImage(tag1, mem, width, height);
+#endif
+#if defined(HAVE_JPEGLIB)
/* try jpeg image */
if(has_alpha) {
tag2 = swf_InsertTag(0, ST_DEFINEBITSJPEG3);
swf_SetU16(tag2, bitid);
swf_SetJPEGBits2(tag2, width, height, mem, quality);
}
+#endif
- if(tag1 && tag1->len < tag2->len) {
+ if(quality>100 || !tag2 || (tag1 && tag1->len < tag2->len)) {
/* use the zlib version- it's smaller */
tag1->prev = tag;
if(tag) tag->next = tag1;
tag = tag1;
- swf_DeleteTag(tag2);
+ swf_DeleteTag(0, tag2);
} else {
/* use the jpeg version- it's smaller */
tag2->prev = tag;
if(tag) tag->next = tag2;
tag = tag2;
- swf_DeleteTag(tag1);
+ swf_DeleteTag(0, tag1);
}
return tag;
}
-#endif
-
RGBA *swf_ExtractImage(TAG * tag, int *dwidth, int *dheight)
{
RGBA *img;
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);
}
if (swf->firstTag == tables_tag)
swf->firstTag = tables_tag->next;
- swf_DeleteTag(tables_tag);
-}
-
-typedef struct scale_lookup {
- int pos;
- unsigned int weight;
-} scale_lookup_t;
-
-typedef struct rgba_int {
- unsigned int r,g,b,a;
-} rgba_int_t;
-
-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**lblockx = (scale_lookup_t**)malloc((newwidth+1)*sizeof(scale_lookup_t**));
- double fx = ((double)width)/((double)newwidth);
- double px = 0;
- int x;
- scale_lookup_t*p_x = lookupx;
-
- if(newwidth<=width) {
- for(x=0;x<newwidth;x++) {
- double ex = px + fx;
- int fromx = (int)px;
- int tox = (int)ex;
- double rem = fromx+1-px;
- int i = (int)(256/fx);
- int xweight = (int)(rem*256/fx);
- int xx;
- int w = 0;
- lblockx[x] = p_x;
- if(tox>=width) tox = width-1;
- for(xx=fromx;xx<=tox;xx++) {
- if(xx==fromx && xx==tox) p_x->weight = 256;
- else if(xx==fromx) p_x->weight = xweight;
- else if(xx==tox) p_x->weight = 256-w;
- else p_x->weight = i;
- w+=p_x->weight;
- p_x->pos = xx;
- p_x++;
- }
- px = ex;
- }
- } else {
- for(x=0;x<newwidth;x++) {
- int ix1 = (int)px;
- int ix2 = ((int)px)+1;
- double r = px-ix1;
- if(ix2>=width) ix2=width-1;
- lblockx[x] = p_x;
- if(bicubic)
- r = -2*r*r*r+3*r*r;
- p_x[0].weight = (int)(256*(1-r));
- p_x[0].pos = ix1;
- p_x[1].weight = 256-p_x[0].weight;
- p_x[1].pos = ix2;
- p_x+=2;
- px += fx;
- }
- }
- lblockx[newwidth] = p_x;
- return lblockx;
+ swf_DeleteTag(swf, tables_tag);
}
-static int monochrome_warning = 0;
-RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight)
-{
- int x,y;
- RGBA* newdata;
- scale_lookup_t *p, **lblockx,**lblocky;
- rgba_int_t*tmpline;
-
- if(newwidth<1 || newheight<1)
- return 0;
-
- /* 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) {
- 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));
-
- lblockx = make_scale_lookup(width, newwidth);
- lblocky = make_scale_lookup(height, newheight);
-
- for(p=lblocky[0];p<lblocky[newheight];p++)
- p->pos*=width;
-
- for(y=0;y<newheight;y++) {
- RGBA*destline = &newdata[y*newwidth];
-
- /* create lookup table for y */
- rgba_int_t*l = tmpline;
- scale_lookup_t*p_y,*p_x;
- memset(tmpline, 0, width*sizeof(rgba_int_t));
- for(p_y=lblocky[y];p_y<lblocky[y+1];p_y++) {
- RGBA*line = &data[p_y->pos];
- scale_lookup_t*p_x;
- int weight = p_y->weight;
- for(x=0;x<width;x++) {
- tmpline[x].r += line[x].r*weight;
- tmpline[x].g += line[x].g*weight;
- tmpline[x].b += line[x].b*weight;
- tmpline[x].a += line[x].a*weight;
- }
- }
-
- /* process x direction */
- p_x = lblockx[0];
- for(x=0;x<newwidth;x++) {
- unsigned int r=0,g=0,b=0,a=0;
- scale_lookup_t*p_x_to = lblockx[x+1];
- do {
- rgba_int_t* col = &tmpline[p_x->pos];
- unsigned int weight = p_x->weight;
- r += col->r*weight;
- g += col->g*weight;
- b += col->b*weight;
- a += col->a*weight;
- p_x++;
- } while (p_x<p_x_to);
-
- destline->r = r >> 16;
- destline->g = g >> 16;
- destline->b = b >> 16;
- destline->a = a >> 16;
-
- destline++;
- }
- }
- free(tmpline);
- free(*lblockx);
- free(lblockx);
- free(*lblocky);
- free(lblocky);
- return newdata;
-}
-