- CS (spaces > tabs)

This commit is contained in:
Pierre Joye 2006-05-08 11:12:49 +00:00
parent 65de977ea0
commit 570511c9b2

View File

@ -17,9 +17,9 @@ static int verbose;
static int set_verbose(void) static int set_verbose(void)
{ {
verbose = !!getenv("GIF_VERBOSE"); verbose = !!getenv("GIF_VERBOSE");
verbose_set = 1; verbose_set = 1;
return(verbose); return(verbose);
} }
#else #else
@ -51,21 +51,21 @@ static int set_verbose(void)
/* We may eventually want to use this information, but def it out for now */ /* We may eventually want to use this information, but def it out for now */
#if 0 #if 0
static struct { static struct {
unsigned int Width; unsigned int Width;
unsigned int Height; unsigned int Height;
unsigned char ColorMap[3][MAXCOLORMAPSIZE]; unsigned char ColorMap[3][MAXCOLORMAPSIZE];
unsigned int BitPixel; unsigned int BitPixel;
unsigned int ColorResolution; unsigned int ColorResolution;
unsigned int Background; unsigned int Background;
unsigned int AspectRatio; unsigned int AspectRatio;
} GifScreen; } GifScreen;
#endif #endif
static struct { static struct {
int transparent; int transparent;
int delayTime; int delayTime;
int inputFlag; int inputFlag;
int disposal; int disposal;
} Gif89 = { -1, -1, -1, 0 }; } Gif89 = { -1, -1, -1, 0 };
static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]); static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]);
@ -80,222 +80,218 @@ int ZeroDataBlock;
gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource) gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
{ {
gdIOCtx *in = gdNewSSCtx(inSource, NULL); gdIOCtx *in = gdNewSSCtx(inSource, NULL);
gdImagePtr im; gdImagePtr im;
im = gdImageCreateFromGifCtx(in); im = gdImageCreateFromGifCtx(in);
in->gd_free(in); in->gd_free(in);
return im; return im;
} }
gdImagePtr gdImagePtr
gdImageCreateFromGif(FILE *fdFile) gdImageCreateFromGif(FILE *fdFile)
{ {
gdIOCtx *fd = gdNewFileCtx(fdFile); gdIOCtx *fd = gdNewFileCtx(fdFile);
gdImagePtr im = 0; gdImagePtr im = 0;
im = gdImageCreateFromGifCtx(fd); im = gdImageCreateFromGifCtx(fd);
fd->gd_free(fd); fd->gd_free(fd);
return im; return im;
} }
gdImagePtr gdImagePtr
gdImageCreateFromGifCtx(gdIOCtxPtr fd) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
{ {
/* 1.4 int imageNumber; */ /* 1.4 int imageNumber; */
int BitPixel; int BitPixel;
int ColorResolution; int ColorResolution;
int Background; int Background;
int AspectRatio; int AspectRatio;
int Transparent = (-1); int Transparent = (-1);
unsigned char buf[16]; unsigned char buf[16];
unsigned char c; unsigned char c;
unsigned char ColorMap[3][MAXCOLORMAPSIZE]; unsigned char ColorMap[3][MAXCOLORMAPSIZE];
unsigned char localColorMap[3][MAXCOLORMAPSIZE]; unsigned char localColorMap[3][MAXCOLORMAPSIZE];
int imw, imh; int imw, imh;
int useGlobalColormap; int useGlobalColormap;
int bitPixel; int bitPixel;
int i; int i;
/*1.4//int imageCount = 0; */ /*1.4//int imageCount = 0; */
char version[4]; char version[4];
gdImagePtr im = 0; gdImagePtr im = 0;
ZeroDataBlock = FALSE; ZeroDataBlock = FALSE;
/*1.4//imageNumber = 1; */ /*1.4//imageNumber = 1; */
if (! ReadOK(fd,buf,6)) { if (! ReadOK(fd,buf,6)) {
return 0; return 0;
} }
if (strncmp((char *)buf,"GIF",3) != 0) { if (strncmp((char *)buf,"GIF",3) != 0) {
return 0; return 0;
} }
strncpy(version, (char *)buf + 3, 3); strncpy(version, (char *)buf + 3, 3);
version[3] = '\0'; version[3] = '\0';
if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) { if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
return 0; return 0;
} }
if (! ReadOK(fd,buf,7)) { if (! ReadOK(fd,buf,7)) {
return 0; return 0;
} }
BitPixel = 2<<(buf[4]&0x07); BitPixel = 2<<(buf[4]&0x07);
ColorResolution = (int) (((buf[4]&0x70)>>3)+1); ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
Background = buf[5]; Background = buf[5];
AspectRatio = buf[6]; AspectRatio = buf[6];
if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */ if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */
if (ReadColorMap(fd, BitPixel, ColorMap)) { if (ReadColorMap(fd, BitPixel, ColorMap)) {
return 0; return 0;
} }
} }
for (;;) { for (;;) {
if (! ReadOK(fd,&c,1)) { if (! ReadOK(fd,&c,1)) {
return 0; return 0;
} }
if (c == ';') { /* GIF terminator */ if (c == ';') { /* GIF terminator */
goto terminated; goto terminated;
} }
if (c == '!') { /* Extension */ if (c == '!') { /* Extension */
if (! ReadOK(fd,&c,1)) { if (! ReadOK(fd,&c,1)) {
return 0; return 0;
} }
DoExtension(fd, c, &Transparent); DoExtension(fd, c, &Transparent);
continue; continue;
} }
if (c != ',') { /* Not a valid start character */ if (c != ',') { /* Not a valid start character */
continue; continue;
} }
/*1.4//++imageCount; */ /*1.4//++imageCount; */
if (! ReadOK(fd,buf,9)) { if (! ReadOK(fd,buf,9)) {
return 0; return 0;
} }
useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP); useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP);
bitPixel = 1<<((buf[8]&0x07)+1); bitPixel = 1<<((buf[8]&0x07)+1);
imw = LM_to_uint(buf[4],buf[5]); imw = LM_to_uint(buf[4],buf[5]);
imh = LM_to_uint(buf[6],buf[7]); imh = LM_to_uint(buf[6],buf[7]);
if (!useGlobalColormap) { if (!useGlobalColormap) {
if (ReadColorMap(fd, bitPixel, localColorMap)) { if (ReadColorMap(fd, bitPixel, localColorMap)) {
return 0; return 0;
} }
} }
if (!(im = gdImageCreate(imw, imh))) { if (!(im = gdImageCreate(imw, imh))) {
return 0; return 0;
} }
im->interlace = BitSet(buf[8], INTERLACE); im->interlace = BitSet(buf[8], INTERLACE);
if (! useGlobalColormap) { if (! useGlobalColormap) {
ReadImage(im, fd, imw, imh, localColorMap, ReadImage(im, fd, imw, imh, localColorMap,
BitSet(buf[8], INTERLACE)); BitSet(buf[8], INTERLACE));
/*1.4//imageCount != imageNumber); */ /*1.4//imageCount != imageNumber); */
} else { } else {
ReadImage(im, fd, imw, imh, ReadImage(im, fd, imw, imh,
ColorMap, ColorMap,
BitSet(buf[8], INTERLACE)); BitSet(buf[8], INTERLACE));
/*1.4//imageCount != imageNumber); */ /*1.4//imageCount != imageNumber); */
} }
if (Transparent != (-1)) { if (Transparent != (-1)) {
gdImageColorTransparent(im, Transparent); gdImageColorTransparent(im, Transparent);
} }
goto terminated; goto terminated;
} }
terminated: terminated:
/* Terminator before any image was declared! */ /* Terminator before any image was declared! */
if (!im) { if (!im) {
return 0; return 0;
} }
/* Check for open colors at the end, so /* Check for open colors at the end, so
we can reduce colorsTotal and ultimately we can reduce colorsTotal and ultimately
BitsPerPixel */ BitsPerPixel */
for (i=((im->colorsTotal-1)); (i>=0); i--) { for (i=((im->colorsTotal-1)); (i>=0); i--) {
if (im->open[i]) { if (im->open[i]) {
im->colorsTotal--; im->colorsTotal--;
} else { } else {
break; break;
} }
} }
return im; return im;
} }
static int static int ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
{ {
int i; int i;
unsigned char rgb[3]; unsigned char rgb[3];
for (i = 0; i < number; ++i) { for (i = 0; i < number; ++i) {
if (! ReadOK(fd, rgb, sizeof(rgb))) { if (! ReadOK(fd, rgb, sizeof(rgb))) {
return TRUE; return TRUE;
} }
buffer[CM_RED][i] = rgb[0] ; buffer[CM_RED][i] = rgb[0] ;
buffer[CM_GREEN][i] = rgb[1] ; buffer[CM_GREEN][i] = rgb[1] ;
buffer[CM_BLUE][i] = rgb[2] ; buffer[CM_BLUE][i] = rgb[2] ;
} }
return FALSE; return FALSE;
} }
static int static int DoExtension(gdIOCtx *fd, int label, int *Transparent)
DoExtension(gdIOCtx *fd, int label, int *Transparent)
{ {
static unsigned char buf[256]; static unsigned char buf[256];
switch (label) { switch (label) {
case 0xf9: /* Graphic Control Extension */ case 0xf9: /* Graphic Control Extension */
(void) GetDataBlock(fd, (unsigned char*) buf); (void) GetDataBlock(fd, (unsigned char*) buf);
Gif89.disposal = (buf[0] >> 2) & 0x7; Gif89.disposal = (buf[0] >> 2) & 0x7;
Gif89.inputFlag = (buf[0] >> 1) & 0x1; Gif89.inputFlag = (buf[0] >> 1) & 0x1;
Gif89.delayTime = LM_to_uint(buf[1],buf[2]); Gif89.delayTime = LM_to_uint(buf[1],buf[2]);
if ((buf[0] & 0x1) != 0) if ((buf[0] & 0x1) != 0)
*Transparent = buf[3]; *Transparent = buf[3];
while (GetDataBlock(fd, (unsigned char*) buf) > 0) while (GetDataBlock(fd, (unsigned char*) buf) > 0)
; ;
return FALSE; return FALSE;
default: default:
break; break;
} }
while (GetDataBlock(fd, (unsigned char*) buf) > 0) while (GetDataBlock(fd, (unsigned char*) buf) > 0)
; ;
return FALSE; return FALSE;
} }
static int static int GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
{ {
unsigned char count; unsigned char count;
if (! ReadOK(fd,&count,1)) { if (! ReadOK(fd,&count,1)) {
return -1; return -1;
} }
ZeroDataBlock = count == 0; ZeroDataBlock = count == 0;
if ((count != 0) && (! ReadOK(fd, buf, count))) { if ((count != 0) && (! ReadOK(fd, buf, count))) {
return -1; return -1;
} }
return count; return count;
} }
static int static int GetDataBlock(gdIOCtx *fd, unsigned char *buf)
GetDataBlock(gdIOCtx *fd, unsigned char *buf)
{ {
int rv; int rv;
int i; int i;
@ -317,269 +313,264 @@ GetDataBlock(gdIOCtx *fd, unsigned char *buf)
return(rv); return(rv);
} }
static int static int GetCode_(gdIOCtx *fd, int code_size, int flag)
GetCode_(gdIOCtx *fd, int code_size, int flag)
{ {
static unsigned char buf[280]; static unsigned char buf[280];
static int curbit, lastbit, done, last_byte; static int curbit, lastbit, done, last_byte;
int i, j, ret; int i, j, ret;
unsigned char count; unsigned char count;
if (flag) { if (flag) {
curbit = 0; curbit = 0;
lastbit = 0; lastbit = 0;
done = FALSE; done = FALSE;
return 0; return 0;
} }
if ( (curbit+code_size) >= lastbit) { if ( (curbit+code_size) >= lastbit) {
if (done) { if (done) {
if (curbit >= lastbit) { if (curbit >= lastbit) {
/* Oh well */ /* Oh well */
} }
return -1; return -1;
} }
buf[0] = buf[last_byte-2]; buf[0] = buf[last_byte-2];
buf[1] = buf[last_byte-1]; buf[1] = buf[last_byte-1];
if ((count = GetDataBlock(fd, &buf[2])) <= 0) if ((count = GetDataBlock(fd, &buf[2])) <= 0)
done = TRUE; done = TRUE;
last_byte = 2 + count; last_byte = 2 + count;
curbit = (curbit - lastbit) + 16; curbit = (curbit - lastbit) + 16;
lastbit = (2+count)*8 ; lastbit = (2+count)*8 ;
} }
ret = 0; ret = 0;
for (i = curbit, j = 0; j < code_size; ++i, ++j) for (i = curbit, j = 0; j < code_size; ++i, ++j)
ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j; ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
curbit += code_size; curbit += code_size;
return ret; return ret;
} }
static int static int GetCode(gdIOCtx *fd, int code_size, int flag)
GetCode(gdIOCtx *fd, int code_size, int flag)
{ {
int rv; int rv;
rv = GetCode_(fd,code_size,flag); rv = GetCode_(fd,code_size,flag);
if (VERBOSE) php_gd_error_ex(E_NOTICE, "[GetCode(,%d,%d) returning %d]",code_size,flag,rv); if (VERBOSE) php_gd_error_ex(E_NOTICE, "[GetCode(,%d,%d) returning %d]",code_size,flag,rv);
return(rv); return(rv);
} }
#define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2) #define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
static int static int LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
{ {
static int fresh = FALSE; static int fresh = FALSE;
int code, incode; int code, incode;
static int code_size, set_code_size; static int code_size, set_code_size;
static int max_code, max_code_size; static int max_code, max_code_size;
static int firstcode, oldcode; static int firstcode, oldcode;
static int clear_code, end_code; static int clear_code, end_code;
static int table[2][(1<< MAX_LWZ_BITS)]; static int table[2][(1<< MAX_LWZ_BITS)];
static int stack[STACK_SIZE], *sp; static int stack[STACK_SIZE], *sp;
register int i; register int i;
if (flag) { if (flag) {
set_code_size = input_code_size; set_code_size = input_code_size;
code_size = set_code_size+1; code_size = set_code_size+1;
clear_code = 1 << set_code_size ; clear_code = 1 << set_code_size ;
end_code = clear_code + 1; end_code = clear_code + 1;
max_code_size = 2*clear_code; max_code_size = 2*clear_code;
max_code = clear_code+2; max_code = clear_code+2;
GetCode(fd, 0, TRUE); GetCode(fd, 0, TRUE);
fresh = TRUE; fresh = TRUE;
for (i = 0; i < clear_code; ++i) { for (i = 0; i < clear_code; ++i) {
table[0][i] = 0; table[0][i] = 0;
table[1][i] = i; table[1][i] = i;
} }
for (; i < (1<<MAX_LWZ_BITS); ++i) for (; i < (1<<MAX_LWZ_BITS); ++i)
table[0][i] = table[1][0] = 0; table[0][i] = table[1][0] = 0;
sp = stack; sp = stack;
return 0; return 0;
} else if (fresh) { } else if (fresh) {
fresh = FALSE; fresh = FALSE;
do { do {
firstcode = oldcode = firstcode = oldcode =
GetCode(fd, code_size, FALSE); GetCode(fd, code_size, FALSE);
} while (firstcode == clear_code); } while (firstcode == clear_code);
return firstcode; return firstcode;
} }
if (sp > stack) if (sp > stack)
return *--sp; return *--sp;
while ((code = GetCode(fd, code_size, FALSE)) >= 0) { while ((code = GetCode(fd, code_size, FALSE)) >= 0) {
if (code == clear_code) { if (code == clear_code) {
for (i = 0; i < clear_code; ++i) { for (i = 0; i < clear_code; ++i) {
table[0][i] = 0; table[0][i] = 0;
table[1][i] = i; table[1][i] = i;
} }
for (; i < (1<<MAX_LWZ_BITS); ++i) for (; i < (1<<MAX_LWZ_BITS); ++i)
table[0][i] = table[1][i] = 0; table[0][i] = table[1][i] = 0;
code_size = set_code_size+1; code_size = set_code_size+1;
max_code_size = 2*clear_code; max_code_size = 2*clear_code;
max_code = clear_code+2; max_code = clear_code+2;
sp = stack; sp = stack;
firstcode = oldcode = firstcode = oldcode =
GetCode(fd, code_size, FALSE); GetCode(fd, code_size, FALSE);
return firstcode; return firstcode;
} else if (code == end_code) { } else if (code == end_code) {
int count; int count;
unsigned char buf[260]; unsigned char buf[260];
if (ZeroDataBlock) if (ZeroDataBlock)
return -2; return -2;
while ((count = GetDataBlock(fd, buf)) > 0) while ((count = GetDataBlock(fd, buf)) > 0)
; ;
if (count != 0) if (count != 0)
return -2; return -2;
} }
incode = code; incode = code;
if (sp == (stack + STACK_SIZE)) { if (sp == (stack + STACK_SIZE)) {
/* Bad compressed data stream */ /* Bad compressed data stream */
return -1; return -1;
} }
if (code >= max_code) { if (code >= max_code) {
*sp++ = firstcode; *sp++ = firstcode;
code = oldcode; code = oldcode;
} }
while (code >= clear_code) { while (code >= clear_code) {
if (sp == (stack + STACK_SIZE)) { if (sp == (stack + STACK_SIZE)) {
/* Bad compressed data stream */ /* Bad compressed data stream */
return -1; return -1;
} }
*sp++ = table[1][code]; *sp++ = table[1][code];
if (code == table[0][code]) { if (code == table[0][code]) {
/* Oh well */ /* Oh well */
} }
code = table[0][code]; code = table[0][code];
} }
*sp++ = firstcode = table[1][code]; *sp++ = firstcode = table[1][code];
if ((code = max_code) <(1<<MAX_LWZ_BITS)) { if ((code = max_code) <(1<<MAX_LWZ_BITS)) {
table[0][code] = oldcode; table[0][code] = oldcode;
table[1][code] = firstcode; table[1][code] = firstcode;
++max_code; ++max_code;
if ((max_code >= max_code_size) && if ((max_code >= max_code_size) &&
(max_code_size < (1<<MAX_LWZ_BITS))) { (max_code_size < (1<<MAX_LWZ_BITS))) {
max_code_size *= 2; max_code_size *= 2;
++code_size; ++code_size;
} }
} }
oldcode = incode; oldcode = incode;
if (sp > stack) if (sp > stack)
return *--sp; return *--sp;
} }
return code; return code;
} }
static int static int LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
{ {
int rv; int rv;
rv = LWZReadByte_(fd,flag,input_code_size); rv = LWZReadByte_(fd,flag,input_code_size);
if (VERBOSE) php_gd_error_ex(E_NOTICE, "[LWZReadByte(,%d,%d) returning %d]",flag,input_code_size,rv); if (VERBOSE) php_gd_error_ex(E_NOTICE, "[LWZReadByte(,%d,%d) returning %d]",flag,input_code_size,rv);
return(rv); return(rv);
} }
static void static void ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
{ {
unsigned char c; unsigned char c;
int v; int v;
int xpos = 0, ypos = 0, pass = 0; int xpos = 0, ypos = 0, pass = 0;
int i; int i;
/* Stash the color map into the image */ /* Stash the color map into the image */
for (i=0; (i<gdMaxColors); i++) { for (i=0; (i<gdMaxColors); i++) {
im->red[i] = cmap[CM_RED][i]; im->red[i] = cmap[CM_RED][i];
im->green[i] = cmap[CM_GREEN][i]; im->green[i] = cmap[CM_GREEN][i];
im->blue[i] = cmap[CM_BLUE][i]; im->blue[i] = cmap[CM_BLUE][i];
im->open[i] = 1; im->open[i] = 1;
} }
/* Many (perhaps most) of these colors will remain marked open. */ /* Many (perhaps most) of these colors will remain marked open. */
im->colorsTotal = gdMaxColors; im->colorsTotal = gdMaxColors;
/* /*
** Initialize the Compression routines ** Initialize the Compression routines
*/ */
if (! ReadOK(fd,&c,1)) { if (! ReadOK(fd,&c,1)) {
return; return;
} }
if (LWZReadByte(fd, TRUE, c) < 0) { if (LWZReadByte(fd, TRUE, c) < 0) {
return; return;
} }
/* /*
** If this is an "uninteresting picture" ignore it. ** If this is an "uninteresting picture" ignore it.
** REMOVED For 1.4 ** REMOVED For 1.4
*/ */
/*if (ignore) { */ /*if (ignore) { */
/* while (LWZReadByte(fd, FALSE, c) >= 0) */ /* while (LWZReadByte(fd, FALSE, c) >= 0) */
/* ; */ /* ; */
/* return; */ /* return; */
/*} */ /*} */
while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) { while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) {
/* This how we recognize which colors are actually used. */ /* This how we recognize which colors are actually used. */
if (im->open[v]) { if (im->open[v]) {
im->open[v] = 0; im->open[v] = 0;
} }
gdImageSetPixel(im, xpos, ypos, v); gdImageSetPixel(im, xpos, ypos, v);
++xpos; ++xpos;
if (xpos == len) { if (xpos == len) {
xpos = 0; xpos = 0;
if (interlace) { if (interlace) {
switch (pass) { switch (pass) {
case 0: case 0:
case 1: case 1:
ypos += 8; break; ypos += 8; break;
case 2: case 2:
ypos += 4; break; ypos += 4; break;
case 3: case 3:
ypos += 2; break; ypos += 2; break;
} }
if (ypos >= height) { if (ypos >= height) {
++pass; ++pass;
switch (pass) { switch (pass) {
case 1: case 1:
ypos = 4; break; ypos = 4; break;
case 2: case 2:
ypos = 2; break; ypos = 2; break;
case 3: case 3:
ypos = 1; break; ypos = 1; break;
default: default:
goto fini; goto fini;
} }
} }
} else { } else {
++ypos; ++ypos;
} }
} }
if (ypos >= height) if (ypos >= height)
break; break;
} }
fini: fini:
if (LWZReadByte(fd,FALSE,c)>=0) { if (LWZReadByte(fd,FALSE,c)>=0) {
/* Ignore extra */ /* Ignore extra */
} }
} }