-r now takes a float value, which means frames per second.

[swftools.git] / src / png2swf.c

diff --git a/src/png2swf.c b/src/png2swf.c
index c07e4c9..c1bee85 100644 (file)
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -159,9 +159,19 @@ int png_read_header(FILE*fi, struct png_header*header)
            c = data[10];     // compression mode (0)
            f = data[11];     // filter mode (0)
            i = data[12];     // interlace mode (0)
+       
+           if(VERBOSE(2)) printf("image mode:%d\n", b);
+           if(VERBOSE(2)) printf("bpp: %d\n", a);
+           if(VERBOSE(2)) printf("compression: %d\n", c);
+           if(VERBOSE(2)) printf("filter: %d\n", f);
+           if(VERBOSE(2)) printf("interlace: %d\n", i);
 
-           if(b!=2 && b!=3 && b!=6) {
+           if(b!=0 && b!=2 && b!=3 && b!=6) {
                fprintf(stderr, "Image mode %d not supported!\n", b);
+               if(b == 4) {
+                   fprintf(stderr, "(This is a grayscale image with alpha channel-\n");
+                   fprintf(stderr, " try converting it into an RGB image with alpha channel)\n");
+               }
                exit(1);
            }
            if(a!=8 && (b==2 || b==6)) {
@@ -454,7 +464,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     if(!png_read_header(fi, &header))
        return 0;
 
-    if(header.mode == 3) bypp = 1;
+    if(header.mode == 3 || header.mode == 0) bypp = 1;
     else
     if(header.mode == 2) bypp = 3;
     else
@@ -550,7 +560,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
            }
            if(header.mode==6)
                applyfilter4(mode, src, old, dest, header.width);
-           else
+           else if(header.mode==2)
                applyfilter3(mode, src, old, dest, header.width);
        }
 
@@ -585,34 +595,44 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
            swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
        }
        free(data2);
-    }
-    else {
-       RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+    } 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(!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];
-               if(alphapalette[i] == 0) {
-                   /* if the color is fully transparent, it doesn't matter
-                      what it's rgb values are. furthermore, all Flash 
-                      players up to Flash 5 can't deal with anything beyond
-                      one transparent color with value (00,00,00,00). */
-                   rgba[i].r = rgba[i].g = rgba[i].b = 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];
+                   if(alphapalette[i] == 0) {
+                       /* if the color is fully transparent, it doesn't matter
+                          what it's rgb values are. furthermore, all Flash 
+                          players up to Flash 5 can't deal with anything beyond
+                          one transparent color with value (00,00,00,00). */
+                       rgba[i].r = rgba[i].g = rgba[i].b = 0;
+                   }
+               } else {
+                   rgba[i].a = 255;
                }
-           } else {
-               rgba[i].a = 255;
+           }
+       } else {
+           palettelen = 256;
+           rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+           for(i=0;i<256;i++) {
+               rgba[i].r = i;
+               rgba[i].g = i;
+               rgba[i].b = i;
            }
        }
 
@@ -800,12 +820,14 @@ int args_callback_option(char *arg, char *val)
 
 struct options_t options[] = 
 { 
+{"h", "help"},
 {"o", "output"},
 {"r", "rate"},
 {"v", "verbose"},
 {"X", "width"},
 {"Y", "height"},
 {"V", "version"},
+{0,0}
 };
 
 int args_callback_longoption(char *name, char *val)