pajoye Sat Nov 4 14:32:24 2006 UTC Modified files: /php-src/ext/gd/libgd gd_gif_in.c Log: - MFB: vim folding http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/gd/libgd/gd_gif_in.c diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.11 php-src/ext/gd/libgd/gd_gif_in.c:1.12 --- php-src/ext/gd/libgd/gd_gif_in.c:1.11 Mon Jul 17 15:08:46 2006 +++ php-src/ext/gd/libgd/gd_gif_in.c Sat Nov 4 14:32:23 2006 @@ -78,7 +78,7 @@ int ZeroDataBlock; -gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource) +gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource) /* {{{ */ { gdIOCtx *in = gdNewSSCtx(inSource, NULL); gdImagePtr im; @@ -89,9 +89,9 @@ return im; } +/* }}} */ - gdImagePtr -gdImageCreateFromGif(FILE *fdFile) +gdImagePtr gdImageCreateFromGif(FILE *fdFile) /* {{{ */ { gdIOCtx *fd = gdNewFileCtx(fdFile); gdImagePtr im = 0; @@ -102,8 +102,9 @@ return im; } +/* }}} */ -gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) +gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) /* {{{ */ { /* 1.4 int imageNumber; */ int BitPixel; @@ -205,6 +206,7 @@ BitSet(buf[8], INTERLACE)); /*1.4//imageCount != imageNumber); */ } + if (Transparent != (-1)) { gdImageColorTransparent(im, Transparent); } @@ -234,8 +236,9 @@ } return im; } +/* }}} */ -static int ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256]) +static int ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256]) /* {{{ */ { int i; unsigned char rgb[3]; @@ -253,8 +256,9 @@ return FALSE; } +/* }}} */ -static int DoExtension(gdIOCtx *fd, int label, int *Transparent) +static int DoExtension(gdIOCtx *fd, int label, int *Transparent) /* {{{ */ { static unsigned char buf[256]; @@ -278,9 +282,9 @@ return FALSE; } +/* }}} */ - static int -GetDataBlock_(gdIOCtx *fd, unsigned char *buf) +static int GetDataBlock_(gdIOCtx *fd, unsigned char *buf) /* {{{ */ { unsigned char count; @@ -296,8 +300,9 @@ return count; } +/* }}} */ -static int GetDataBlock(gdIOCtx *fd, unsigned char *buf) +static int GetDataBlock(gdIOCtx *fd, unsigned char *buf) /* {{{ */ { int rv; int i; @@ -318,8 +323,9 @@ } return(rv); } +/* }}} */ -static int GetCode_(gdIOCtx *fd, int code_size, int flag) +static int GetCode_(gdIOCtx *fd, int code_size, int flag) /* {{{ */ { static unsigned char buf[280]; static int curbit, lastbit, done, last_byte; @@ -359,8 +365,7 @@ return ret; } - static int -GetCode(gdIOCtx *fd, int code_size, int flag) +static int GetCode(gdIOCtx *fd, int code_size, int flag) /* {{{ */ { int rv; @@ -368,9 +373,10 @@ if (VERBOSE) php_gd_error_ex(E_NOTICE, "[GetCode(,%d,%d) returning %d]",code_size,flag,rv); return(rv); } +/* }}} */ #define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2) -static int LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size) +static int LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size) /* {{{ */ { static int fresh = FALSE; int code, incode; @@ -489,8 +495,9 @@ } return code; } +/* }}} */ -static int LWZReadByte(gdIOCtx *fd, int flag, int input_code_size) +static int LWZReadByte(gdIOCtx *fd, int flag, int input_code_size) /* {{{ */ { int rv; @@ -498,8 +505,9 @@ if (VERBOSE) php_gd_error_ex(E_NOTICE, "[LWZReadByte(,%d,%d) returning %d]",flag,input_code_size,rv); return(rv); } +/* }}} */ -static void ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */ +static void ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /* {{{ */ /*1.4//, int ignore) */ { unsigned char c; int v; @@ -586,4 +594,4 @@ /* Ignore extra */ } } - +/* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php