X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=953dee860f8d2d671b222a08168f18d80e355f82;hb=454d432faf2c28d1414b57466a502ab09a5f8ade;hp=d3247d8d263090954a67fd5a0c44b3336c1e9805;hpb=cb1716230558bb427a3f097c60f70d03732d4b34;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index d3247d8..953dee8 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -4,12 +4,22 @@
 
    Part of the swftools package.
 
-   Copyright (c) 2002 Matthias Kramm <kramm@quiss.org>
+   Copyright (c) 2002,2003 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
  
-   This file is distributed under the GPL, see file COPYING for details 
-
-*/
-
 #include <stdio.h>
 #include <math.h>
 #include <fcntl.h>
@@ -21,7 +31,7 @@
 #define VERBOSE(x) (global.verbose>=x)
 
 struct {
-    int framerate;
+    float framerate;
     int max_image_width;
     int max_image_height;
     int force_width;
@@ -35,7 +45,7 @@ struct {
     char *filename;
 } image[MAX_INPUT_FILES];
 
-TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
+TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
 {
     TAG *t;
     RGBA rgb;
@@ -43,7 +53,7 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
     memset(swf, 0x00, sizeof(SWF));
 
     swf->fileVersion = 5;
-    swf->frameRate = (25600 / framerate);
+    swf->frameRate = (int)(256.0 * framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
 
@@ -149,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)) {
@@ -444,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
@@ -540,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);
 	}
 
@@ -575,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;
 	    }
 	}
 
@@ -736,11 +766,11 @@ int args_callback_option(char *arg, char *val)
 	switch (arg[0]) {
 	case 'r':
 	    if (val)
-		global.framerate = atoi(val);
-	    if ((global.framerate < 1) ||(global.framerate > 5000)) {
+		global.framerate = atof(val);
+	    if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) {
 		if (VERBOSE(1))
 		    fprintf(stderr,
-			    "Error: You must specify a valid framerate between 1 and 10000.\n");
+			    "Error: You must specify a valid framerate between 1/256 and 255.\n");
 		exit(1);
 	    }
 	    res = 1;
@@ -790,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)
@@ -825,7 +857,7 @@ int args_callback_command(char *arg, char *next)	// actually used as filename
 void args_callback_usage(char *name)
 {
     printf("Usage: %s  [-options [value]] imagefiles[.png] [...]\n", name);
-    printf("-r framerate          (rate) Set movie framerate (100/sec)\n");
+    printf("-r framerate          (rate) Set movie framerate (frames per second)\n");
     printf("-o outputfile         (output) Set name for SWF output file\n");
     printf("-X pixel              (width) Force movie width to pixel (default: autodetect)\n");
     printf("-Y pixel              (height) Force movie height to pixel (default: autodetect)\n");
@@ -841,7 +873,7 @@ int main(int argc, char **argv)
 
     memset(&global, 0x00, sizeof(global));
 
-    global.framerate = 100;
+    global.framerate = 1.0;
     global.verbose = 1;
 
     processargs(argc, argv);