git: 9front

Info  •  Files  •  Log  •  Branches

jpg: treat EOF as EOI marker

Some jpegs, rightly or wrongly, do not contain an EOI marker.  This
causes jpg(1) to bail out even after correctly parsing the entire
image.

--- a/sys/src/cmd/jpg/readjpg.c

+++ b/sys/src/cmd/jpg/readjpg.c

@@ -389,8 +389,12 @@

 	if(h->peek >= 0){

 		x = h->peek;

 		h->peek = -1;

-	}else if(Bread(h->fd, &x, 1) != 1)

-		jpgerror(h, readerr);

+	}else

+		switch(Bread(h->fd, &x, 1)){

+		case 0: return -1;

+		case 1: break;

+		default: jpgerror(h, readerr);

+		}

 	return x;

 }

@@ -403,6 +407,8 @@

 Again:

 	while((c=readbyte(h)) == 0)

 		;

+	if(c < 0)

+		return EOI;

 	if(c != 0xFF)

 		goto Again;

 	while(c == 0xFF)

-- 

⑨