}
}
+ rfx_free(scanline);
swf_SetJPEGBitsFinish(out);
jpeg_finish_decompress(&cinfo);
fclose(f);
#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;
}
}
+/* 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;
}
} 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;
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;
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;
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;
lblockx[newwidth] = p_x;
return lblockx;
}
-static int monochrome_warning = 0;
+
+static void encodeMonochromeImage(RGBA*data, int width, int height, RGBA*colors)
+{
+ int t;
+ int len = width*height;
+
+ U32* img = (U32*)data;
+ U32 color1 = img[0];
+ U32 color2 = 0;
+ for(t=1;t<len;t++) {
+ if(img[t] != color1) {
+ color2 = img[t];
+ break;
+ }
+ }
+ *(U32*)&colors[0] = color1;
+ *(U32*)&colors[1] = color2;
+ for(t=0;t<len;t++) {
+ if(img[t] == color1) {
+ img[t] = 0;
+ } else {
+ img[t] = 0xffffffff;
+ }
+ }
+}
+
+static void decodeMonochromeImage(RGBA*data, int width, int height, RGBA*colors)
+{
+ int t;
+ int len = width*height;
+
+ for(t=0;t<len;t++) {
+ U32 m = data[t].r;
+ data[t].r = (colors[0].r * (255-m) + colors[1].r * m) >> 8;
+ data[t].g = (colors[0].g * (255-m) + colors[1].g * m) >> 8;
+ data[t].b = (colors[0].b * (255-m) + colors[1].b * m) >> 8;
+ data[t].a = (colors[0].a * (255-m) + colors[1].a * m) >> 8;
+ }
+}
+
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;
+ int monochrome = 0;
+ RGBA monochrome_colors[2];
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;
- }
+ monochrome=1;
+ encodeMonochromeImage(data, width, height, monochrome_colors);
}
tmpline = (rgba_int_t*)malloc(width*sizeof(rgba_int_t));
destline++;
}
}
+
+ if(monochrome)
+ decodeMonochromeImage(newdata, newwidth, newheight, monochrome_colors);
+
free(tmpline);
free(*lblockx);
free(lblockx);