xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gif: just read and decode the first image when -9 or -c flag is specified

Browse source
This commit is contained in:
cinap_lenrek 2016-10-22 00:35:17 +02:00
parent 6d97f77c2d
commit a8d00e5d56
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/jpg/gif.c
View file

@ -288,7 +288,7 @@ show(int fd, char *name)
char buf[32];
err = nil;
images = readgif(fd, CRGB);
images = readgif(fd, CRGB, dflag);
if(images == nil){
fprint(2, "gif: decode %s failed: %r\n", name);
return "decode";

2
sys/src/cmd/jpg/imagefile.h
View file

@ -55,7 +55,7 @@ Rawimage** readpng(int, int);
Rawimage** Breadpng(Biobuf*, int);
Rawimage** readtif(int, int);
Rawimage** Breadtif(Biobuf*, int);
Rawimage** readgif(int, int);
Rawimage** readgif(int, int, int);
Rawimage** readpixmap(int, int);
Rawimage* torgbv(Rawimage*, int);
Rawimage* totruecolor(Rawimage*, int);

10
sys/src/cmd/jpg/readgif.c
View file

@ -39,7 +39,7 @@ static char readerr[] = "ReadGIF: read error: %r";
static char extreaderr[] = "ReadGIF: can't read extension: %r";
static char memerr[] = "ReadGIF: malloc failed: %r";
static Rawimage** readarray(Header*);
static Rawimage** readarray(Header*, int);
static Rawimage* readone(Header*);
static void readheader(Header*);
static void skipextension(Header*);
@ -100,7 +100,7 @@ giferror(Header *h, char *fmt, ...)
Rawimage**
readgif(int fd, int colorspace)
readgif(int fd, int colorspace, int justone)
{
Rawimage **a;
Biobuf b;
@ -122,7 +122,7 @@ readgif(int fd, int colorspace)
if(setjmp(h->errlab))
a = nil;
else
a = readarray(h);
a = readarray(h, justone);
giffreeall(h, 0);
free(h);
return a;
@ -144,7 +144,7 @@ inittbl(Header *h)
static
Rawimage**
readarray(Header *h)
readarray(Header *h, int justone)
{
Entry *tbl;
Rawimage *new, **array;
@ -202,6 +202,8 @@ readarray(Header *h)
array[nimages] = nil;
h->array = array;
h->new = nil;
if(justone)
goto Return;
break;
case 0x3B: /* Trailer */