got rid of some old code

diff --git a/src/png2swf.c b/src/png2swf.c
index c24d227..a6782f7 100644 (file)
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -454,294 +454,6 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
-TAG* PNG2Image(TAG*t, U16 id, char*filename, unsigned*width, unsigned*height)
-{
-    char tagid[4];
-    U8*data;
-    U8*imagedata;
-    U8*zimagedata=0;
-    unsigned long int imagedatalen;
-    unsigned long int zimagedatalen=0;
-    U8*palette = 0;
-    int palettelen = 0;
-    U8*alphapalette = 0;
-    int alphapalettelen = 0;
-    struct png_header header;
-    int bypp;
-    U8 alphacolor[3];
-    int hasalphacolor=0;
-    int len;
-
-
-    FILE *fi;
-    U8 *scanline;
-
-    if ((fi = fopen(filename, "rb")) == NULL) {
-       if (VERBOSE(1))
-           fprintf(stderr, "Read access failed: %s\n", filename);
-       return t;
-    }
-
-    if(!png_read_header(fi, &header))
-       return 0;
-
-    *width = header.width;
-    *height = header.height;
-
-    if(header.mode == 3 || header.mode == 0) bypp = 1;
-    else
-    if(header.mode == 2) bypp = 3;
-    else
-    if(header.mode == 6) bypp = 4;
-    else
-       return 0;
-    imagedatalen = bypp * header.width * header.height + 65536;
-    imagedata = malloc(imagedatalen);
-
-    fseek(fi,8,SEEK_SET);
-    while(!feof(fi))
-    {
-       if(!png_read_chunk(&tagid, &len, &data, fi))
-           break;
-       if(!strncmp(tagid, "IEND", 4)) {
-           break;
-       }
-       if(!strncmp(tagid, "PLTE", 4)) {
-           palette = data;
-           palettelen = len/3;
-           data = 0; //don't free data
-           if(VERBOSE(2))
-               printf("%d colors in palette\n", palettelen);
-       }
-       if(!strncmp(tagid, "tRNS", 4)) {
-           if(header.mode == 3) {
-               alphapalette = data;
-               alphapalettelen = len;
-               data = 0; //don't free data
-               if(VERBOSE(2))
-                   printf("found %d alpha colors\n", alphapalettelen);
-           } else if(header.mode == 0 || header.mode == 2) {
-               int t;
-               if(header.mode == 2) { // palette or grayscale?
-                   alphacolor[0] = data[1];
-                   alphacolor[1] = data[3];
-                   alphacolor[2] = data[5];
-               } else {
-                   alphacolor[0] = alphacolor[1] = alphacolor[2] = data[1];
-               }
-               if(VERBOSE(2))
-                   printf("found alpha color: %02x%02x%02x\n", alphacolor[0], alphacolor[1], alphacolor[2]);
-               hasalphacolor = 1;
-           } else {
-               if(VERBOSE(2))
-                   printf("ignoring tRNS %d entry (%d bytes)\n", header.mode, len);
-           }
-       }
-       if(!strncmp(tagid, "IDAT", 4)) {
-           if(!zimagedata) {
-               zimagedatalen = len;
-               zimagedata = malloc(len);
-               memcpy(zimagedata,data,len);
-           } else {
-               zimagedata = realloc(zimagedata, zimagedatalen+len);
-               memcpy(&zimagedata[zimagedatalen], data, len);
-               zimagedatalen += len;
-           }
-       }
-       if(data)
-           free(data);
-    }
-    
-    if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
-       fprintf(stderr, "Couldn't uncompress IDAT chunk (%lu bytes) in %s!\n", imagedatalen, filename);
-       if(zimagedata)
-           free(zimagedata);
-       return 0;
-    }
-    free(zimagedata);
-
-    if(alphapalette || hasalphacolor)
-       t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS2);
-    else
-       t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
-
-    swf_SetU16(t, id);         // id
-    if(header.mode == 2 || header.mode == 6) {
-       U8*data2 = malloc(header.width*header.height*4);
-       int i,s=0;
-       int x,y;
-       int pos=0;
-       int opaque=0;
-       int transparent=0;
-       int semitransparent=0;
-       /* in case for mode 2, the following also performs 24->32 bit conversion */
-       unsigned char* firstline = malloc(header.width*4);
-
-       for(y=0;y<header.height;y++) {
-           int mode = imagedata[pos++]; //filter mode
-           U8*src;
-           U8*dest;
-           U8*old;
-           dest = &data2[(y*header.width)*4];
-
-           if(header.bpp == 8)
-           {
-               /* one byte per pixel */
-               src = &imagedata[pos];
-               pos+=header.width*(header.mode==6?4:3);
-           } else {
-               /* not implemented yet */
-               exit(1);
-           }
-
-           if(!y) {
-               old = firstline;
-               memset(old, 0, header.width*4); //TODO: fill alpha with 255?
-           } else {
-               old = &data2[(y-1)*header.width*4];
-           }
-           if(header.mode==6) {
-               applyfilter4(mode, src, old, dest, header.width);
-           } else if(header.mode==2) {
-               applyfilter3(mode, src, old, dest, header.width);
-               /* replace alpha color */
-               if(hasalphacolor) {
-                   int x;
-                   for(x=0;x<header.width;x++) {
-                       if(dest[x*4+1] == alphacolor[0] &&
-                          dest[x*4+2] == alphacolor[1] &&
-                          dest[x*4+3] == alphacolor[2]) {
-                           *(U32*)&dest[x*4] = 0;
-                       }
-                   }
-               }
-           }
-       }
-       free(firstline);
-
-       /* the image is now compressed and stored in data. Now let's take
-          a look at the alpha values */
-       if(header.mode == 6) {
-           for(y=0;y<header.height;y++) {
-               U8*l = &data2[(y*header.width)*4];
-               for(x=0;x<header.width;x++) {
-                   U8 a = l[x*4];
-                   U8 b = l[x*4+1];
-                   U8 g = l[x*4+2];
-                   U8 r = l[x*4+3];
-                   if(a==255) transparent++;
-                   else {
-                       if(a==0) opaque++;
-                       else semitransparent++;
-                       l[x*4+3]=(int)r*a/255;
-                       l[x*4+2]=(int)g*a/255;
-                       l[x*4+1]=(int)b*a/255;
-                   }
-               }
-           }
-           if(semitransparent || opaque) {
-               t->id = ST_DEFINEBITSLOSSLESS2;
-           }
-       }
-       swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
-       free(data2);
-    } else if(header.mode == 0 || header.mode == 3) {
-       RGBA*rgba;
-       int swf_width = BYTES_PER_SCANLINE(header.width);
-       U8*data2 = malloc(swf_width*header.height);
-       U8*tmpline = malloc(header.width);
-       int i,x,y;
-       int pos=0;
-       if(header.mode == 3) { // palette or grayscale?
-           rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-           if(!palette) {
-               fprintf(stderr, "Error: No palette found!\n");
-               exit(1);
-           }
-           /* 24->32 bit conversion */
-           for(i=0;i<palettelen;i++) {
-               rgba[i].r = palette[i*3+0];
-               rgba[i].g = palette[i*3+1];
-               rgba[i].b = palette[i*3+2];
-               if(alphapalette && i<alphapalettelen) {
-                   rgba[i].a = alphapalette[i];
-                   rgba[i].r = ((int)rgba[i].r*rgba[i].a)/255;
-                   rgba[i].g = ((int)rgba[i].g*rgba[i].a)/255;
-                   rgba[i].b = ((int)rgba[i].b*rgba[i].a)/255;
-               } else {
-                   rgba[i].a = 255;
-               }
-               if(hasalphacolor) {
-                   if(rgba[i].r == alphacolor[0] &&
-                      rgba[i].g == alphacolor[1] &&
-                      rgba[i].b == alphacolor[2]) {
-                       rgba[i].r = 0;
-                       rgba[i].g = 0;
-                       rgba[i].b = 0;
-                       rgba[i].a = 0;
-                   }
-               }
-           }
-       } else {
-            int mult = (0x1ff>>header.bpp);
-           palettelen = 1<<header.bpp;
-           rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-           for(i=0;i<palettelen;i++) {
-               rgba[i].r = i*mult;
-               rgba[i].g = i*mult;
-               rgba[i].b = i*mult;
-               rgba[i].a = 255;
-               if(hasalphacolor) {
-                   if(rgba[i].r == alphacolor[0]) {
-                       rgba[i].r = 0;
-                       rgba[i].g = 0;
-                       rgba[i].b = 0;
-                       rgba[i].a = 0;
-                   }
-               }
-           }
-       }
-
-       for(y=0;y<header.height;y++) {
-           int mode = imagedata[pos++]; //filter mode
-           U8*old;
-           U8*dest = &data2[y*swf_width];
-           U8*src;
-           src = &imagedata[pos];
-           if(header.bpp == 8) {
-               pos+=header.width;
-           } else {
-               int x,s=0;
-               int bitpos = 0;
-               U32 v = (1<<header.bpp)-1;
-               for(x=0;x<header.width;x++) {
-                   U32 r = src[s/8]<<8 | 
-                           src[s/8+1];
-                   int t;
-                   tmpline[x] = (r>>(16-header.bpp-(s&7)))&v;
-                   s+=header.bpp;
-               }
-               src = tmpline;
-               pos+=(header.width*header.bpp+7)/8;
-           }
-
-           if(!y) {
-               memset(data2,0,swf_width);
-               old = &data2[y*swf_width];
-           } else {
-               old = &data2[(y-1)*swf_width];
-           }
-           applyfilter1(mode, src, old, dest, header.width);
-       }
-       swf_SetLosslessBitsIndexed(t, header.width, header.height, data2, rgba, palettelen);
-       free(tmpline);
-       free(rgba);
-       free(data2);
-    }
-    fclose(fi);
-    return t;
-}
-
 TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 {
     SHAPE *s;
@@ -773,7 +485,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
            swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
        }
 #endif
-    } else if(1) {
+    } else {
        RGBA*data = 0;
        png_load(sname, &width, &height, (unsigned char**)&data);
        if(!data) 
@@ -781,9 +493,6 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
        t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
        swf_SetU16(t, id);
        swf_SetLosslessImage(t, data,width,height);
-    } else {
-       /* old code: transform PNG encoding 1:1 to SWF */
-       t = PNG2Image(t, id, sname, &width, &height);
     }
 
     t = swf_InsertTag(t, ST_DEFINESHAPE3);