X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fgif2swf.c;h=49a685eeffb0532959b1b94d3cbcf3f254348135;hb=328cd76b365ba8ea45127e06bb4bf87d6da0709b;hp=e707a6e8cac337ac629758d436da73a01c66d408;hpb=081e14b195877cdbdd8f0f0f843c69aa2376a7e5;p=swftools.git diff --git a/src/gif2swf.c b/src/gif2swf.c index e707a6e..49a685e 100644 --- a/src/gif2swf.c +++ b/src/gif2swf.c @@ -1,9 +1,12 @@ -/* gif2swf.c +/* -*- mode: c; tab-width: 4; -*- ---------------------------[for (x)emacs]-- + $Id: gif2swf.c,v 1.4 2005/05/06 16:34:59 dseg Exp $ GIF to SWF converter tool + Part of the swftools package. + Copyright (c) 2005 Daichi Shinozaki - + 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 @@ -16,19 +19,20 @@ 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 */ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + + This file is derived from png2swf.c */ #include #include -#include #include #include "../lib/rfxswf.h" #include "../lib/args.h" #define MAX_INPUT_FILES 1024 #define VERBOSE(x) (global.verbose>=x) - -#define PROGRAM_NAME "gif2swf" +#define AS_FIRSTFRAME "if(n<1) n=1;" +#define AS_LASTFRAME "if(n<=%d-1){n=n+1;gotoAndPlay(1);}else stop();" struct { float framerate; @@ -41,6 +45,8 @@ struct { int do_cgi; int version; char *outfile; + int imagecount; + int loopcount; } global; struct { @@ -52,24 +58,90 @@ struct gif_header { int height; }; -// Get transparency color from graphic extension block -// -// Return: transparency color or -1 +enum disposal_method { + NONE, + DO_NOT_DISPOSE, + RESTORE_TO_BGCOLOR, + RESTORE_TO_PREVIOUS +}; + -int getTransparentColor(GifFileType * gft) +void SetFrameAction(TAG** t, const char *src, int ver) { - int i; - ExtensionBlock* ext = gft->SavedImages[0].ExtensionBlocks; - - for (i=0; i < gft->SavedImages[0].ExtensionBlockCount; i++, ext++) - if ((ext->Function == GRAPHICS_EXT_FUNC_CODE) && - (ext->Bytes[0] & 1)) { // there is a transparent color - return ext->Bytes[3] == 0 ? - 255 : // exception - ext->Bytes[3]; - } + ActionTAG* as; + + as = swf_ActionCompile(src, ver); + if (!as) + fprintf(stderr, "Couldn't compile ActionScript\n"); + else { + *t = swf_InsertTag(*t, ST_DOACTION); + swf_ActionSet(*t, as); + swf_ActionFree(as); + } +} + +int getGifDisposalMethod(GifFileType * gft, int framenum) +{ + int i; + ExtensionBlock* ext = gft->SavedImages[framenum].ExtensionBlocks; + + for (i=0; i < gft->SavedImages[framenum].ExtensionBlockCount; i++, ext++) + if (ext->Function == GRAPHICS_EXT_FUNC_CODE) + return ((ext->Bytes[0] & 0x1C) >> 2); + + return -1; +} + +// [FIX ME] +// I couldn't get the loop count of animated GIF which is defined in the +// application extension block of header using lib(un)gif. +// Ask the author of lib(un)gif it's really impossible. + +U16 getGifLoopCount(GifFileType * gft) { + int i; + char sig[11]; + ExtensionBlock* ext = gft->SavedImages[0].ExtensionBlocks; + + // info: http://members.aol.com/royalef/gifabout.htm#net-extension + for (i=0; i < gft->SavedImages[0].ExtensionBlockCount; i++, ext++) + if (ext->Function == APPLICATION_EXT_FUNC_CODE) { +// fprintf(stderr, "extension size: %d\n", ext->ByteCount); + memcpy(sig, &ext->Bytes[0], 11); +// if(memcmp(sig, "NETSCAPE2.0", 11) == 0) +// fprintf(stderr, "NETSCAPE2.0\n"); +// fprintf(stderr, "data: %d %d\n", ext->Bytes[13], ext->Bytes[14]); + } + + return 0; +} + +U16 getGifDelayTime(GifFileType * gft, int framenum) +{ + int i; + ExtensionBlock* ext = gft->SavedImages[framenum].ExtensionBlocks; + + for (i=0; i < gft->SavedImages[framenum].ExtensionBlockCount; i++, ext++) + if (ext->Function == GRAPHICS_EXT_FUNC_CODE) + return GET16(&ext->Bytes[1]); - return -1; + return 0; +} + +int getTransparentColor(GifFileType * gft, int framenum) +{ + int i; + ExtensionBlock* ext = gft->SavedImages[framenum].ExtensionBlocks; + + // Get transparency color from graphic extension block + for (i=0; i < gft->SavedImages[framenum].ExtensionBlockCount; i++, ext++) + if ((ext->Function == GRAPHICS_EXT_FUNC_CODE) && + (ext->Bytes[0] & 1)) { // there is a transparent color + return ext->Bytes[3] == 0 ? + 0 : // exception + (U8)ext->Bytes[3]; // transparency color + } + + return -1; } TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) @@ -85,9 +157,9 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) swf->movieSize.ymax = dy * 20; 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 swf_SetRGB(t, &rgb); @@ -100,32 +172,32 @@ int MovieFinish(SWF * swf, TAG * t, char *sname) t = swf_InsertTag(t, ST_END); if ((!isatty(so)) && (!sname)) - f = so; + f = so; else { - if (!sname) - sname = "output.swf"; - f = open(sname,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644); + if (!sname) + sname = "output.swf"; + f = open(sname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644); } - if(global.do_cgi) { - if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n"); + if (global.do_cgi) { + if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n"); } else { - if(global.version >= 6) { - if (swf_WriteSWC(f, swf)<0) - fprintf(stderr, "Unable to write output file: %s\n", sname); - } else { - if (swf_WriteSWF(f, swf)<0) + if (global.version >= 6) { + if (swf_WriteSWC(f, swf)<0) + fprintf(stderr, "Unable to write output file: %s\n", sname); + } else { + if (swf_WriteSWF(f, swf)<0) fprintf(stderr, "Unable to write output file: %s\n", sname); - } - if (f != so) - close(f); + } + if (f != so) + close(f); } swf_FreeTags(swf); return 0; } -TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) +TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx) { SHAPE *s; SRECT r; @@ -133,126 +205,159 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) int fs; U8 *imagedata, *from, *to; + GifImageDesc *img; RGBA* pal; - + struct gif_header header; - int i, j, bgcolor, numcolors = 0, alphapalette = 0; + int i, j, numcolors, alphapalette; + U8 bgcolor; int bpp; // byte per pixel int swf_width, padlen; - + ColorMapObject* colormap; GifColorType c; - int interlacedOffset[] = { 0, 4, 2, 1 }; // The way Interlaced image should - int interlacedJumps[] = { 8, 8, 4, 2 }; // be read - offsets and jumps... - + int interlacedOffset[] = { 0, 4, 2, 1 };// The way Interlaced image should + int interlacedJumps[] = { 8, 8, 4, 2 }; // be read - offsets and jumps... + U16 delay, depth; + int disposal; + char framename[8] = { 0, 0, 0, 0, 0, 0, 0, '\0' }; + char *as_lastframe; + + GifFileType* gft; FILE *fi; - GifFileType* gft; - + if ((fi = fopen(sname, "rb")) == NULL) { - if (VERBOSE(1)) - fprintf(stderr, "Read access failed: %s\n", sname); - return t; + if (VERBOSE(1)) + fprintf(stderr, "Read access failed: %s\n", sname); + return t; } - - if((gft = DGifOpenFileName(sname)) == NULL) { + fclose(fi); + + if ((gft = DGifOpenFileName(sname)) == NULL) { fprintf(stderr, "%s is not a GIF file!\n", sname); return t; } - if(DGifSlurp(gft) != GIF_OK) { - PrintGifError(); + if (DGifSlurp(gft) != GIF_OK) { + PrintGifError(); return t; } - + header.width = gft->SWidth; header.height = gft->SHeight; - pal = (RGBA*)malloc(256*sizeof(RGBA)); - memset(pal,0,256*sizeof(RGBA)); - + pal = (RGBA*)malloc(256 * sizeof(RGBA)); + memset(pal, 0, 256 * sizeof(RGBA)); + + img = &gft->SavedImages[imgidx].ImageDesc; + // Local colormap has precedence over Global colormap - colormap = gft->Image.ColorMap ? gft->Image.ColorMap : gft->SColorMap; + colormap = img->ColorMap ? img->ColorMap : gft->SColorMap; numcolors = colormap->ColorCount; - alphapalette = getTransparentColor(gft); + alphapalette = getTransparentColor(gft, imgidx); + if (VERBOSE(3)) + fprintf(stderr, "transparent palette index => %d\n", alphapalette); bpp = (alphapalette >= 0 ? 4 : 3); - // bgColor is the background color to fill the bitmap with - // if an image is smaller than screen coordinates - if (gft->SColorMap) { // There is a GlobalColorMap - bgcolor = gft->SBackGroundColor; // The BackGroundColor is meaningful - } else { - if (alphapalette >= 0) // There is a transparency color - bgcolor = alphapalette; // set the bgColor to tranparent - else - bgcolor = 0; // Don't know what to do here. - // If this doesn't work, we could - // create a new color and set the - // alpha-channel to transparent - // (unless we are using all the 256 - // colors, in which case either we - // give up, or move to 16-bits palette - } - - for(i=0; iSColorMap) // There is a GlobalColorMap + bgcolor = (U8)gft->SBackGroundColor;// The SBGColor is meaningful + else + if (alphapalette >= 0) // There is a transparency color + bgcolor = alphapalette; // set the bgcolor to tranparent + else + bgcolor = 0; // Don't know what to do here. + // If this doesn't work, we could + // create a new color and set the + // alpha-channel to transparent + // (unless we are using all the 256 + // colors, in which case either we + // give up, or move to 16-bits palette + if (VERBOSE(3)) + fprintf(stderr, "BG palette index => %u\n", bgcolor); + + for (i=0; iColors[i]; - if(i == alphapalette) - pal[i].r = pal[i].g = pal[i].b = pal[i].a = 0; // Fully transparent - else { - pal[i].r = c.Red; - pal[i].g = c.Green; - pal[i].b = c.Blue; - pal[i].a = 255; // Fully opaque - } + if (i == bgcolor) + pal[i].r = pal[i].g = pal[i].b = pal[i].a = 0;// Fully transparent + else if (i == alphapalette) + pal[i].r = pal[i].g = pal[i].b = pal[i].a = 0;// Fully transparent + else { + pal[i].r = c.Red; + pal[i].g = c.Green; + pal[i].b = c.Blue; + pal[i].a = 255; // Fully opaque + } } - - if(alphapalette >= 0) - t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS2); - else - t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS); - - swf_SetU16(t, id); // id - - // Ah! The Flash specs says scanlines must be DWORD ALIGNED! - // (but image width is the correct number of pixels) - swf_width = BYTES_PER_SCANLINE(header.width); - - if ((imagedata = (U8 *)malloc(swf_width*header.height)) == NULL) { - fprintf(stderr, "Failed to allocate memory required, aborted."); - exit(2); - } - to = imagedata; - from = (U8 *)gft->SavedImages[0].RasterBits; - - if (swf_width == header.width) { - // we are all nicely aligned and don't need to move the bitmap around. - // Just copy the bits into the image buffer.*/ - if (!gft->Image.Interlace) - memcpy(to, from, header.width*header.height); - else // Need to perform 4 passes on the interlaced images - for (i = 0; i < 4; i++) - for (j = interlacedOffset[i]; j < header.height; - j += interlacedJumps[i], from += header.width) - memcpy(to + header.width*j, from, header.width); - } else { - padlen = swf_width - header.width; - - // here we need to pad the scanline - if (!gft->Image.Interlace) { - for (i=0; i < header.height; i++, from+=header.width, to+=swf_width) { - memcpy(to, from, header.width); - memset(to + header.width, bgcolor, padlen); - } - } else { // Need to perform 4 passes on the interlaced images - for (i = 0; i < 4; i++) - for (j = interlacedOffset[i]; j < header.height; - j += interlacedJumps[i], from += header.width) { - memcpy(to + swf_width*j, from, header.width); - memset(to + swf_width*j, bgcolor, padlen); - } + + t = swf_InsertTag(t, bpp == 4 ? + ST_DEFINEBITSLOSSLESS2 : ST_DEFINEBITSLOSSLESS); + swf_SetU16(t, id); // id + + // Ah! The Flash specs says scanlines must be DWORD ALIGNED! + // (but image width is the correct number of pixels) + swf_width = BYTES_PER_SCANLINE(header.width); + + if ((imagedata = (U8 *)malloc(swf_width*header.height)) == NULL) { + fprintf(stderr, "Failed to allocate memory required, aborted."); + exit(2); } - } + to = imagedata; + from = (U8 *)gft->SavedImages[imgidx].RasterBits; + + if (swf_width == header.width) { + // we are all nicely aligned and don't need to move the bitmap around. + // Just copy the bits into the image buffer. + if (! gft->Image.Interlace) + if (header.width == img->Width && header.height == img->Height) + memcpy(to, from, header.width*header.height); + else { //small screen + for (i = 0; i < header.height; i++, to += header.width) { + memset(to, bgcolor, header.width); + if (i >= img->Top && i < img->Top + img->Height) { + memcpy(to + img->Left, from, img->Width); + from += img->Width; + } + } + } + + else // Need to perform 4 passes on the interlaced images + for (i = 0; i < 4; i++) + for (j = interlacedOffset[i]; j < header.height; + j += interlacedJumps[i], from += header.width) + memcpy(to + header.width*j, from, header.width); + } else { + padlen = swf_width - header.width; + + // here we need to pad the scanline + if (! gft->Image.Interlace) { + if (header.width == img->Width && + header.height == img->Height) { + for (i=0; i < header.height; i++, from+=header.width, to+=swf_width) { + memcpy(to, from, header.width); + memset(to + header.width, bgcolor, padlen); + } + } else { //small screen + for (i=0; i < header.height; i++, to += swf_width) { + memset(to, bgcolor, swf_width); + if (i >= img->Top && i < img->Top + img->Height) { + memcpy(to + img->Left, from, img->Width); + from += img->Width; + } + } + } + } else { // Need to perform 4 passes on the interlaced images + for (i = 0; i < 4; i++) + for (j = interlacedOffset[i]; j < header.height; + j += interlacedJumps[i], from += header.width) { + memcpy(to + swf_width*j, from, header.width); + memset(to + swf_width*j, bgcolor, padlen); + } + } + } swf_SetLosslessBitsIndexed(t,header.width,header.height,imagedata,pal,256); + t = swf_InsertTag(t, ST_DEFINESHAPE); swf_ShapeNew(&s); @@ -261,7 +366,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) m.sy = 20 * 0x10000; fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0); - swf_SetU16(t, id + 1); // id + swf_SetU16(t, id + 1); // id r.xmin = r.ymin = 0; r.xmax = header.width * 20; @@ -277,67 +382,155 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) swf_ShapeSetLine(t, s, 0, -r.ymax); swf_ShapeSetEnd(t); - + + depth = imgidx + 1; + if ((imgidx > 0) && // REMOVEOBJECT2 not needed at frame 1(imgidx==0) + (global.imagecount > 1)) + { + // check last frame's disposal method + if ((disposal = getGifDisposalMethod(gft, imgidx-1)) >= 0) + { + switch(disposal) { + case NONE: + swf_SetU16(t, depth-1); + t = swf_InsertTag(t, ST_REMOVEOBJECT2); + if (VERBOSE(3)) + fprintf(stdout, " [none]\n"); + break; + case DO_NOT_DISPOSE: + if (VERBOSE(3)) + fprintf(stdout, " [don't dispose]\n"); + break; + case RESTORE_TO_BGCOLOR: + swf_SetU16(t, depth-1); + t = swf_InsertTag(t, ST_REMOVEOBJECT2); + if (VERBOSE(3)) + fprintf(stdout, " [restore to bg color]\n"); + break; + case RESTORE_TO_PREVIOUS: + swf_SetU16(t, depth-1); + t = swf_InsertTag(t, ST_REMOVEOBJECT2); + if (VERBOSE(3)) + fprintf(stdout, " [restore to previous]\n"); + break; + } + } + } + + swf_SetU16(t, depth); t = swf_InsertTag(t, ST_PLACEOBJECT2); swf_GetMatrix(NULL, &m); m.tx = (swf->movieSize.xmax - (int) header.width * 20) / 2; m.ty = (swf->movieSize.ymax - (int) header.height * 20) / 2; - swf_ObjectPlace(t, id + 1, 1, &m, NULL, NULL); + swf_ObjectPlace(t, id + 1, depth, &m, NULL, NULL); + if ((global.imagecount > 1) && + (global.loopcount > 0)) { // 0 means "infinite loop" + if (imgidx == 0) + SetFrameAction(&t, AS_FIRSTFRAME, global.version); + } + t = swf_InsertTag(t, ST_SHOWFRAME); + + if (global.imagecount > 1) { // multi-frame GIF? + int framecnt; + delay = getGifDelayTime(gft, imgidx); // delay in 1/100 sec + framecnt = (int)(global.framerate * (delay/100.0)); + if (framecnt > 1) { + if (VERBOSE(2)) + fprintf(stderr, "at frame %d: pad %d frames(%.3f sec)\n", + imgidx + 1, framecnt, delay/100.0); + + framecnt -= 1; // already inserted a frame + while (framecnt--) + t = swf_InsertTag(t, ST_SHOWFRAME); + } + if ((imgidx == global.imagecount-1) && + (global.loopcount > 0)) { // 0 means "infinite loop" + as_lastframe = malloc(strlen(AS_LASTFRAME) + 5); // 0-99999 + sprintf(as_lastframe, AS_LASTFRAME, global.loopcount); + SetFrameAction(&t, as_lastframe, global.version); + if (as_lastframe) + free(as_lastframe); + } + } - fclose(fi); free(pal); free(imagedata); DGifCloseFile(gft); - + return t; } +GifFileType * GifOpen(char *sname) { + GifFileType *gft = NULL; + + return gft; +} int CheckInputFile(char *fname, char **realname) { FILE *fi; char *s = malloc(strlen(fname) + 5); GifFileType* gft; - + GifRecordType rt; + GifByteType *extdata; + SavedImage tmp; + U8 buf[16]; + if (!s) - exit(2); + exit(2); (*realname) = s; strcpy(s, fname); // Check whether file exists (with typical extensions) if ((fi = fopen(s, "rb")) == NULL) { - sprintf(s, "%s.gif", fname); - if ((fi = fopen(s, "rb")) == NULL) { - sprintf(s, "%s.GIF", fname); - if ((fi = fopen(s, "rb")) == NULL) { - sprintf(s, "%s.Gif", fname); - if ((fi = fopen(s, "rb")) == NULL) - fprintf(stderr, "Couldn't open %s!\n", fname); - return -1; - } - } + sprintf(s, "%s.gif", fname); + if ((fi = fopen(s, "rb")) == NULL) { + sprintf(s, "%s.GIF", fname); + if ((fi = fopen(s, "rb")) == NULL) { + sprintf(s, "%s.Gif", fname); + if ((fi = fopen(s, "rb")) == NULL) { + fprintf(stderr, "Couldn't open %s!\n", fname); + return -1; + } + } + } } fclose(fi); - - if((gft = DGifOpenFileName(s)) == NULL) { + + if ((gft = DGifOpenFileName(s)) == NULL) { fprintf(stderr, "%s is not a GIF file!\n", fname); return -1; } - if(DGifSlurp(gft) != GIF_OK) { - PrintGifError(); - return -1; - } - if (global.max_image_width < gft->SWidth) global.max_image_width = gft->SWidth; if (global.max_image_height < gft->SHeight) global.max_image_height = gft->SHeight; + + if (DGifSlurp(gft) != GIF_OK) { //gft->ImageCount be set + PrintGifError(); + return -1; + } - DGifCloseFile(gft); + if ((global.imagecount = gft->ImageCount) > 1) { + global.loopcount = getGifLoopCount(gft); + if (VERBOSE(3)) + fprintf(stderr, "Loops => %u\n", global.loopcount); + } + if (VERBOSE(2)) { + U8 i; + fprintf(stderr, "%d x %d, %d images total\n", + gft->SWidth, gft->SHeight, gft->ImageCount); + + for (i=0; i < gft->ImageCount; i++) + fprintf(stderr, "frame: %u, delay: %.3f sec\n", + i+1, getGifDelayTime(gft, i) / 100.0); + } + + DGifCloseFile(gft); return 0; } @@ -346,73 +539,80 @@ int args_callback_option(char *arg, char *val) { int res = 0; if (arg[1]) - res = -1; + res = -1; else - switch (arg[0]) { - case 'r': - if (val) - 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/256 and 255.\n"); - exit(1); - } - res = 1; - break; - - case 'o': - if (val) - global.outfile = val; - res = 1; - break; - - case 'z': - global.version = 6; - res = 0; - break; - - case 'C': - global.do_cgi = 1; - break; - - case 'v': - if (val) - global.verbose = atoi(val); - res = 1; - break; - - case 'X': - if (val) - global.force_width = atoi(val); - res = 1; - break; - - case 'Y': - if (val) - global.force_height = atoi(val); - res = 1; - break; - - case 'V': - printf("gif2swf - part of %s %s\n", PACKAGE, VERSION); - exit(0); - - default: - res = -1; - break; - } + switch (arg[0]) { + case 'l': + if (val) + global.loopcount = atoi(val); + res = 1; + break; + + case 'r': + if (val) + 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/256 and 255.\n"); + exit(1); + } + res = 1; + break; + + case 'o': + if (val) + global.outfile = val; + res = 1; + break; + + case 'z': + global.version = 6; + res = 0; + break; + + case 'C': + global.do_cgi = 1; + break; + + case 'v': + if (val) + global.verbose = atoi(val); + res = 1; + break; + + case 'X': + if (val) + global.force_width = atoi(val); + res = 1; + break; + + case 'Y': + if (val) + global.force_height = atoi(val); + res = 1; + break; + + case 'V': + printf("gif2swf - part of %s %s\n", PACKAGE, VERSION); + exit(0); + + default: + res = -1; + break; + } if (res < 0) { - if (VERBOSE(1)) - fprintf(stderr, "Unknown option: -%s\n", arg); - exit(1); - return 0; + if (VERBOSE(1)) + fprintf(stderr, "Unknown option: -%s\n", arg); + exit(1); + return 0; } return res; } static struct options_t options[] = { +{"l", "loop"}, {"r", "rate"}, {"o", "output"}, {"z", "zlib"}, @@ -429,24 +629,24 @@ int args_callback_longoption(char *name, char *val) return args_long2shortoption(options, name, val); } -int args_callback_command(char *arg, char *next) // actually used as filename +int args_callback_command(char *arg, char *next) // actually used as filename { char *s; if (CheckInputFile(arg, &s) < 0) { - if (VERBOSE(1)) - fprintf(stderr, "Error opening input file: %s\n", arg); - free(s); + if (VERBOSE(1)) + fprintf(stderr, "Error opening input file: %s\n", arg); + free(s); } else { - image[global.nfiles].filename = s; - global.nfiles++; - if (global.nfiles >= MAX_INPUT_FILES) { - if (VERBOSE(1)) - fprintf(stderr, "Error: Too many input files.\n"); - exit(1); - } + image[global.nfiles].filename = s; + global.nfiles++; + if (global.nfiles >= MAX_INPUT_FILES) { + if (VERBOSE(1)) + fprintf(stderr, "Error: Too many input files.\n"); + exit(1); + } } - + return 0; } @@ -455,6 +655,7 @@ 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("\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"); @@ -470,38 +671,49 @@ int main(int argc, char **argv) { SWF swf; TAG *t; - + memset(&global, 0x00, sizeof(global)); global.framerate = 1.0; global.verbose = 1; - global.version = 4; - + global.version = 5; + global.loopcount = 0; + processargs(argc, argv); - - if(global.nfiles<=0) { - fprintf(stderr, "No gif files found in arguments\n"); - return 1; + + if (VERBOSE(2)) + fprintf(stderr, "loop count => %d\n", global.loopcount); + + if (global.nfiles<=0) { + fprintf(stderr, "No gif files found in arguments\n"); + return 1; } if (VERBOSE(2)) - fprintf(stderr, "Processing %i file(s)...\n", global.nfiles); + fprintf(stderr, "Processing %i file(s)...\n", global.nfiles); + + if (global.imagecount > 1) // multi-frame GIF? + if (global.framerate == 1.0) // user not specified '-r' option? + global.framerate = 10.0; t = MovieStart(&swf, global.framerate, - global.force_width ? global.force_width : global.max_image_width, - global.force_height ? global.force_height : global.max_image_height); + global.force_width ? global.force_width : global.max_image_width, + global.force_height ? global.force_height : global.max_image_height); { - int i; - for (i = 0; i < global.nfiles; i++) { - if (VERBOSE(3)) - fprintf(stderr, "[%03i] %s\n", i, - image[i].filename); - t = MovieAddFrame(&swf, t, image[i].filename, (i * 2) + 1); - free(image[i].filename); - } + int i, j; + for (i = 0; i < global.nfiles; i++) { + if (VERBOSE(3)) + fprintf(stderr, "[%03i] %s\n", i, + image[i].filename); + t = MovieAddFrame(&swf, t, image[i].filename, (i*2)+1, 0); + for (j = 2; j <= global.imagecount; j++) + t = MovieAddFrame(&swf, t, image[i].filename, (j*2)-1, j-1); + free(image[i].filename); + } } MovieFinish(&swf, t, global.outfile); - + return 0; } +