From 15771c177b875ca1f233e8aa725283ce1a559091 Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 13 Jan 2007 17:26:15 +0000 Subject: [PATCH] updated documentation --- src/font2swf.1 | 2 +- src/gif2swf.1 | 5 ++++- src/gif2swf.c | 27 +++++++++++++-------------- src/gif2swf.doc | 4 +++- src/jpeg2swf.1 | 10 +++++----- src/jpeg2swf.c | 14 +++++++++++++- src/jpeg2swf.doc | 4 +++- src/png2swf.1 | 5 ++++- src/png2swf.c | 7 +++++-- src/png2swf.doc | 2 ++ src/swfbbox.1 | 2 +- src/swfc.1 | 5 ++++- src/swfc.c | 2 ++ src/swfcombine.1 | 2 +- src/swfdump.1 | 2 +- src/wav2swf.1 | 2 +- 16 files changed, 63 insertions(+), 32 deletions(-) diff --git a/src/font2swf.1 b/src/font2swf.1 index cceef9b..e9cfea9 100644 --- a/src/font2swf.1 +++ b/src/font2swf.1 @@ -1,4 +1,4 @@ -.TH font2swf "1" "January 2006" "font2swf" "swftools" +.TH font2swf "1" "January 2007" "font2swf" "swftools" .SH NAME font2swf - Converts a font to SWF. diff --git a/src/gif2swf.1 b/src/gif2swf.1 index 9b5a0b4..aa0b2f5 100644 --- a/src/gif2swf.1 +++ b/src/gif2swf.1 @@ -1,4 +1,4 @@ -.TH gif2swf "1" "January 2006" "gif2swf" "swftools" +.TH gif2swf "1" "January 2007" "gif2swf" "swftools" .SH NAME gif2swf - Takes a number of gif files and converts them to a swf movie, one picture per frame. @@ -23,6 +23,9 @@ converted picture is a seperate frame in the target SWF. Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. .TP +\fB\-l\fR, \fB\-\-loop\fR \fIloop count\fR + Set loop count. (default: 0 [=infinite loop]) +.TP \fB\-X\fR, \fB\-\-pixel\fR \fIwidth\fR Force movie width to \fIwidth\fR (default: autodetect) .TP diff --git a/src/gif2swf.c b/src/gif2swf.c index a6eb836..e1379ac 100644 --- a/src/gif2swf.c +++ b/src/gif2swf.c @@ -1,6 +1,6 @@ /* -*- mode: c; tab-width: 4; -*- ---------------------------[for (x)emacs]-- - $Id: gif2swf.c,v 1.5 2005/05/11 17:20:29 dseg Exp $ + $Id: gif2swf.c,v 1.6 2007/01/13 17:26:47 kramm Exp $ GIF to SWF converter tool Part of the swftools package. @@ -605,16 +605,16 @@ int args_callback_option(char *arg, char *val) } static struct options_t options[] = { - {"l", "loop"}, - {"r", "rate"}, - {"o", "output"}, - {"z", "zlib"}, - {"X", "pixel"}, - {"Y", "pixel"}, - {"v", "verbose"}, - {"C", "cgi"}, - {"V", "version"}, - {0, 0} +{"r", "rate"}, +{"o", "output"}, +{"z", "zlib"}, +{"l", "loop"}, +{"X", "pixel"}, +{"Y", "pixel"}, +{"v", "verbose"}, +{"C", "cgi"}, +{"V", "version"}, +{0,0} }; int args_callback_longoption(char *name, char *val) @@ -646,13 +646,12 @@ int args_callback_command(char *arg, char *next) // actually used as filename void args_callback_usage(char *name) { printf("\n"); - printf("Usage: %s [-X width] [-Y height] [-o file.swf] [-r rate] file1.gif [file2.gif...]\n", - name); + printf("Usage: %s [-X width] [-Y height] [-o file.swf] [-r rate] file1.gif [file2.gif ...]\n", name); printf("\n"); - printf("-l , --loop Set loop count. (default: 0 [=infinite loop])\n"); printf("-r , --rate Set movie framerate (frames per second)\n"); printf("-o , --output Set name for SWF output file.\n"); printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-l , --loop Set loop count. (default: 0 [=infinite loop])\n"); printf("-X , --pixel Force movie width to (default: autodetect)\n"); printf("-Y , --pixel Force movie height to (default: autodetect)\n"); printf("-v , --verbose Set verbose level (0=quiet, 1=default, 2=debug)\n"); diff --git a/src/gif2swf.doc b/src/gif2swf.doc index 13ee60a..66b3eb9 100644 --- a/src/gif2swf.doc +++ b/src/gif2swf.doc @@ -12,10 +12,12 @@ converted picture is a seperate frame in the target SWF. -o, --output Set name for SWF output file. Explicitly specify output file. (Otherwise, output will go to stdout / output.swf) --z --zlib +-z, --zlib Enable Flash 6 (MX) Zlib Compression Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. +-l, --loop + Set loop count. (default: 0 [=infinite loop]) -X, --pixel Force movie width to (default: autodetect) -Y, --pixel diff --git a/src/jpeg2swf.1 b/src/jpeg2swf.1 index ee87d2c..6990308 100644 --- a/src/jpeg2swf.1 +++ b/src/jpeg2swf.1 @@ -1,4 +1,4 @@ -.TH jpeg2swf "1" "January 2006" "jpeg2swf" "swftools" +.TH jpeg2swf "1" "January 2007" "jpeg2swf" "swftools" .SH NAME jpeg2swf - Converts jpeg images to SWF. @@ -15,20 +15,20 @@ converted picture is a seperate frame in the target SWF. \fB\-o\fR, \fB\-\-output\fR \fIoutputfile\fR Explicitly specify output file. (Otherwise, output will go to stdout / output.swf) .TP -\fB\-m\fR, \fB\-\-mx\fR - Use Flash MX H.263 compression (use for correlated images) -.TP \fB\-q\fR, \fB\-\-quality\fR \fIquality\fR Set compression quality (1-100, 1=worst, 100=best). This option can be set independently for each image. .TP -\fB\-r\fR, \fB\-\-rate\fR \fIframerate\fR +\fB\-r\fR, \fB\-\-rate\fR \fIframerate\fR Set movie framerate (frames per second) .TP \fB\-z\fR, \fB\-\-zlib\fR \fIzlib\fR Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. .TP +\fB\-M\fR, \fB\-\-mx\fR + Use Flash MX H.263 compression (use for correlated images) +.TP \fB\-x\fR, \fB\-\-xoffset\fR \fIoffset\fR horizontally offset images by \fIoffset\fR .TP diff --git a/src/jpeg2swf.c b/src/jpeg2swf.c index e83d411..7c1298f 100644 --- a/src/jpeg2swf.c +++ b/src/jpeg2swf.c @@ -495,6 +495,12 @@ int args_callback_option(char *arg, char *val) break; } + case 'M': { + global.mx = 1; + res = 1; + break; + } + case 'm': { char*s = strdup(val); char*c = strchr(s, ':'); @@ -537,6 +543,9 @@ static struct options_t options[] = { {"q", "quality"}, {"r", "rate"}, {"z", "zlib"}, +{"M", "mx"}, +{"x", "xoffset"}, +{"y", "yoffset"}, {"X", "width"}, {"Y", "height"}, {"v", "verbose"}, @@ -579,8 +588,11 @@ void args_callback_usage(char *name) printf("\n"); printf("-o , --output Explicitly specify output file. (otherwise, output.swf will be used)\n"); printf("-q , --quality Set compression quality (1-100, 1=worst, 100=best)\n"); - printf("-r , --rate Set movie framerate (frames per second)\n"); + printf("-r , --rate Set movie framerate (frames per second)\n"); printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-M , --mx Use Flash MX H.263 compression (use for correlated images)\n"); + printf("-x , --xoffset horizontally offset images by \n"); + printf("-y , --yoffset vertically offset images by \n"); printf("-X , --width Force movie width to (default: autodetect)\n"); printf("-Y , --height Force movie height to (default: autodetect)\n"); printf("-v , --verbose Set verbose level to (0=quiet, 1=default, 2=debug)\n"); diff --git a/src/jpeg2swf.doc b/src/jpeg2swf.doc index 0c7a541..d21605b 100644 --- a/src/jpeg2swf.doc +++ b/src/jpeg2swf.doc @@ -13,12 +13,14 @@ converted picture is a seperate frame in the target SWF. Set compression quality (1-100, 1=worst, 100=best) Set compression quality (1-100, 1=worst, 100=best). This option can be set independently for each image. --r --rate +-r --rate Set movie framerate (frames per second) -z --zlib Enable Flash 6 (MX) Zlib Compression Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. +-M --mx + Use Flash MX H.263 compression (use for correlated images) -x --xoffset horizontally offset images by -y --yoffset diff --git a/src/png2swf.1 b/src/png2swf.1 index cf7846d..d566ffb 100644 --- a/src/png2swf.1 +++ b/src/png2swf.1 @@ -1,4 +1,4 @@ -.TH png2swf "1" "January 2006" "png2swf" "swftools" +.TH png2swf "1" "January 2007" "png2swf" "swftools" .SH NAME png2swf - Takes a number of png files and converts them to a swf movie, one picture per frame. @@ -27,6 +27,9 @@ compression algorithm is used). Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. .TP +\fB\-T\fR, \fB\-\-flashversion\fR + Set the flash version to generate +.TP \fB\-X\fR, \fB\-\-pixel\fR \fIwidth\fR Force movie width to \fIwidth\fR (default: autodetect) .TP diff --git a/src/png2swf.c b/src/png2swf.c index 0d7e1a6..e8a2c7c 100644 --- a/src/png2swf.c +++ b/src/png2swf.c @@ -860,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; @@ -896,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); @@ -957,6 +958,7 @@ static struct options_t options[] = { {"r", "rate"}, {"o", "output"}, {"z", "zlib"}, +{"T", "flashversion"}, {"X", "pixel"}, {"Y", "pixel"}, {"v", "verbose"}, @@ -999,6 +1001,7 @@ void args_callback_usage(char *name) printf("-r , --rate Set movie framerate (frames per second)\n"); printf("-o , --output Set name for SWF output file.\n"); printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-T , --flashversion Set the flash version to generate\n"); printf("-X , --pixel Force movie width to (default: autodetect)\n"); printf("-Y , --pixel Force movie height to (default: autodetect)\n"); printf("-v , --verbose Set verbose level (0=quiet, 1=default, 2=debug)\n"); diff --git a/src/png2swf.doc b/src/png2swf.doc index 0867414..bd02f84 100644 --- a/src/png2swf.doc +++ b/src/png2swf.doc @@ -20,6 +20,8 @@ compression algorithm is used). Enable Flash 6 (MX) Zlib Compression Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be smaller, but not playable in Flash Plugins of Version 5 and below. +-T, --flashversion + Set the flash version to generate -X, --pixel Force movie width to (default: autodetect) -Y, --pixel diff --git a/src/swfbbox.1 b/src/swfbbox.1 index 3b485cc..f801e22 100644 --- a/src/swfbbox.1 +++ b/src/swfbbox.1 @@ -1,4 +1,4 @@ -.TH swfbbox "1" "January 2006" "swfbbox" "swftools" +.TH swfbbox "1" "January 2007" "swfbbox" "swftools" .SH NAME swfbbox - Tool for playing around with SWF bounding boxes. diff --git a/src/swfc.1 b/src/swfc.1 index eba779a..5b2366f 100644 --- a/src/swfc.1 +++ b/src/swfc.1 @@ -1,4 +1,4 @@ -.TH swfc "1" "January 2006" "swfc" "swftools" +.TH swfc "1" "January 2007" "swfc" "swftools" .SH NAME swfc - compile .sc files to swf. @@ -16,6 +16,9 @@ Compiles a file written in sc (SWF Script) into a number of SWF files. \fB\-V\fR, \fB\-\-version\fR Print version info and exit .TP +\fB\-C\fR, \fB\-\-cgi\fR + Output to stdout (for use in CGI environments) +.TP \fB\-v\fR, \fB\-\-verbose\fR Increase verbosity. Use more than one \fB-v\fR for greater effect. .TP diff --git a/src/swfc.c b/src/swfc.c index e46efa5..4f42b10 100644 --- a/src/swfc.c +++ b/src/swfc.c @@ -49,6 +49,7 @@ static int do_cgi = 0; static struct options_t options[] = { {"h", "help"}, {"V", "version"}, +{"C", "cgi"}, {"v", "verbose"}, {"o", "output"}, {0,0} @@ -94,6 +95,7 @@ void args_callback_usage(char *name) printf("\n"); printf("-h , --help Print short help message and exit\n"); printf("-V , --version Print version info and exit\n"); + printf("-C , --cgi Output to stdout (for use in CGI environments)\n"); printf("-v , --verbose Increase verbosity. \n"); printf("-o , --output Set output file to .\n"); printf("\n"); diff --git a/src/swfcombine.1 b/src/swfcombine.1 index 6b047c0..a45dd35 100644 --- a/src/swfcombine.1 +++ b/src/swfcombine.1 @@ -1,4 +1,4 @@ -.TH swfcombine "1" "January 2006" "swfcombine" "swftools" +.TH swfcombine "1" "January 2007" "swfcombine" "swftools" .SH NAME swfcombine - a tool for combining swf (flash) files diff --git a/src/swfdump.1 b/src/swfdump.1 index 0fb703d..a261abe 100644 --- a/src/swfdump.1 +++ b/src/swfdump.1 @@ -1,4 +1,4 @@ -.TH swfdump "1" "January 2006" "swfdump" "swftools" +.TH swfdump "1" "January 2007" "swfdump" "swftools" .SH NAME swfdump - Display an SWF file's content. diff --git a/src/wav2swf.1 b/src/wav2swf.1 index 801aade..0b17d02 100644 --- a/src/wav2swf.1 +++ b/src/wav2swf.1 @@ -1,4 +1,4 @@ -.TH wav2swf "1" "January 2006" "wav2swf" "swftools" +.TH wav2swf "1" "January 2007" "wav2swf" "swftools" .SH NAME wav2swf - convert a WAV file to an SWF animation. -- 1.7.10.4