removed figure template

[swftools.git] / src / png2swf.c

diff --git a/src/png2swf.c b/src/png2swf.c
index 9980e5a..e8a2c7c 100644 (file)
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -76,7 +76,7 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
     t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
 
     rgb.r = rgb.g = rgb.b = rgb.a = 0x00;
-    rgb.g = 0xff; //<--- handy for testing alpha conversion
+    //rgb.g = 0xff; //<--- handy for testing alpha conversion
     swf_SetRGB(t, &rgb);
 
     return t;
@@ -667,8 +667,12 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
                if(hasalphacolor) {
                    if(rgba[i].r == alphacolor[0] &&
                       rgba[i].g == alphacolor[1] &&
-                      rgba[i].b == alphacolor[2])
+                      rgba[i].b == alphacolor[2]) {
+                       rgba[i].r = 0;
+                       rgba[i].g = 0;
+                       rgba[i].b = 0;
                        rgba[i].a = 0;
+                   }
                }
            }
        } else {
@@ -681,8 +685,12 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
                rgba[i].b = i*mult;
                rgba[i].a = 255;
                if(hasalphacolor) {
-                   if(rgba[i].r == alphacolor[0])
+                   if(rgba[i].r == alphacolor[0]) {
+                       rgba[i].r = 0;
+                       rgba[i].g = 0;
+                       rgba[i].b = 0;
                        rgba[i].a = 0;
+                   }
                }
            }
        }
@@ -852,7 +860,8 @@ int args_callback_option(char *arg, char *val)
            break;
 
        case 'z':
-           global.version = 6;
+           if(global.version<6)
+               global.version = 6;
            res = 0;
            break;
 
@@ -888,7 +897,7 @@ int args_callback_option(char *arg, char *val)
                global.force_height = atoi(val);
            res = 1;
            break;
-
+       
        case 'V':
            printf("png2swf - part of %s %s\n", PACKAGE, VERSION);
            exit(0);
@@ -949,6 +958,7 @@ static struct options_t options[] = {
 {"r", "rate"},
 {"o", "output"},
 {"z", "zlib"},
+{"T", "flashversion"},
 {"X", "pixel"},
 {"Y", "pixel"},
 {"v", "verbose"},
@@ -991,6 +1001,7 @@ void args_callback_usage(char *name)
     printf("-r , --rate <framerate>        Set movie framerate (frames per second)\n");
     printf("-o , --output <filename>       Set name for SWF output file.\n");
     printf("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\n");
+    printf("-T , --flashversion            Set the flash version to generate\n");
     printf("-X , --pixel <width>           Force movie width to <width> (default: autodetect)\n");
     printf("-Y , --pixel <height>          Force movie height to <height> (default: autodetect)\n");
     printf("-v , --verbose <level>         Set verbose level (0=quiet, 1=default, 2=debug)\n");