better png handling

src/cmd/jpg/readpng.c

@@ -1,6 +1,3 @@
-//  work in progress...  this version only good enough to read
-//  non-interleaved, 24bit RGB images
-
 #include <u.h>
 #include <libc.h>
 #include <ctype.h>
@@ -17,30 +14,39 @@ enum{  IDATSIZE=1000000,
 	FilterSub	=	1,	/* new[x][y] = buf[x][y] + new[x-1][y] */ 
 	FilterUp	=	2,	/* new[x][y] = buf[x][y] + new[x][y-1] */ 
 	FilterAvg	=	3,	/* new[x][y] = buf[x][y] + (new[x-1][y]+new[x][y-1])/2 */ 
-	FilterPaeth=	4,	/* new[x][y] = buf[x][y] + paeth(new[x-1][y],new[x][y-1],new[x-1][y-1]) */ 
+	FilterPaeth=	4,	/* new[x][y] = buf[x][y] + paeth(new[x-1][y],new[x][y-1],new[x-1][y-1]) */
 	FilterLast	=	5,
 	PropertyBit =	1<<5,
 };
 
+
+typedef struct ZlibW{
+	uchar *chan[4]; // Rawimage channels
+	uchar *scan;	// new scanline
+	uchar *pscan;	// previous scanline
+	int scanl;		// scan len
+	int scanp;		// scan pos
+	int nchan;		// number of input chans
+	int npix;		// pixels read so far
+	int	chanl;		// number of bytes allocated to chan[x]
+	int scanpix;
+	int bpp;		// bits per sample
+	int palsize;
+	int row;		// current scanline number
+	uchar palette[3*256];
+} ZlibW;
+
 typedef struct ZlibR{
 	Biobuf *bi;
 	uchar *buf;
 	uchar *b;	// next byte to decompress
 	uchar *e;	// past end of buf
+	ZlibW *w;
 } ZlibR;
 
-typedef struct ZlibW{
-	uchar *r, *g, *b; // Rawimage channels
-	int chan;	// next channel to write
-	int col;	// column index of current pixel
-			// -1 = one-byte pseudo-column for filter spec
-	int row;	// row index of current pixel
-	int ncol, nrow;	// image width, height
-	int filter;	// algorithm for current scanline
-} ZlibW;
-
 static ulong *crctab;
 static uchar PNGmagic[] = {137,80,78,71,13,10,26,10};
+static char readerr[] = "ReadPNG: read error: %r";
 static char memerr[] = "ReadPNG: malloc failed: %r";
 
 static ulong
@@ -119,10 +125,19 @@ refill_buffer:
 		if(n < 0 || strcmp(type, "IEND") == 0)
 			return -1;
 		z->e = z->b + n;
+		if(!strcmp(type,"PLTE")) {
+			if (n < 3 || n > 3*256 || n%3)
+				sysfatal("invalid PLTE chunk len %d", n);
+			memcpy(z->w->palette, z->b, n);
+			z->w->palsize = n/3;
+			goto refill_buffer;
+		}
 		if(type[0] & PropertyBit)
 			goto refill_buffer;  /* skip auxiliary chunks for now */
-		if(strcmp(type,"IDAT") != 0)
+		if(strcmp(type,"IDAT")) {
 			sysfatal("unrecognized mandatory chunk %s", type);
+			goto refill_buffer;
+		}
 	}
 	return *z->b++;
 }
@@ -145,88 +160,144 @@ paeth(uchar a, uchar b, uchar c)
 }
 
 static void
-unfilter(int alg, uchar *buf, uchar *ebuf, int up)
+unfilter(int alg, uchar *buf, uchar *up, int len, int bypp)
 {
+	int i;
 	switch(alg){
+	case FilterNone:
+		break;
+
 	case FilterSub:
-		while (++buf < ebuf)
+		for (i = bypp; i < len; ++i)
-			*buf += buf[-1];
+			buf[i] += buf[i-bypp];
 		break;
+
 	case FilterUp:
-		if (up != 0)
+		for (i = 0; i < len; ++i)
-			do
+			buf[i] += up[i];
-				*buf += buf[up];
-			while (++buf < ebuf);
 		break;
+
 	case FilterAvg:
-		if (up == 0)
+		for (i = 0; i < bypp; ++i)
-			while (++buf < ebuf)
+			buf[i] += (0+up[i])/2;
-				*buf += buf[-1]/2;
+		for (; i < len; ++i)
-		else{
+			buf[i] += (buf[i-bypp]+up[i])/2;
-			*buf += buf[up]/2;
-			while (++buf < ebuf)
-				*buf += (buf[-1]+buf[up])/2;
-		}
 		break;
+
 	case FilterPaeth:
-		if (up == 0)
+		for (i = 0; i < bypp; ++i)
-			while (++buf < ebuf)
+			buf[i] += paeth(0, up[i], 0);
-				*buf += buf[-1];
+		for (; i < len; ++i)
-		else{
+			buf[i] += paeth(buf[i-bypp], up[i], up[i-bypp]);
-			*buf += paeth(0, buf[up], 0);
-			while (++buf < ebuf)
-				*buf += paeth(buf[-1], buf[up], buf[up-1]);
-		}
 		break;
+	default:
+		sysfatal("unknown filtering scheme %d\n", alg);
 	}
 }
 
+static void
+convertpix(ZlibW *z, uchar *pixel, uchar *r, uchar *g, uchar *b)
+{
+	int off;
+	switch (z->nchan) {
+	case 1:	/* gray or indexed */
+	case 2:	/* gray+alpha */
+		if (z->bpp < 8)
+			pixel[0] >>= 8-z->bpp;
+		if (pixel[0] > z->palsize)
+			sysfatal("index %d out of bounds %d", pixel[0], z->palsize);
+		off = 3*pixel[0];
+		*r = z->palette[off];
+		*g = z->palette[off+1];
+		*b = z->palette[off+2];
+		break;
+	case 3:	/* rgb */
+	case 4:	/* rgb+alpha */
+		*r = pixel[0];
+		*g = pixel[1];
+		*b = pixel[2];
+		break;
+	default:
+		sysfatal("bad number of channels: %d", z->nchan);
+	} 
+}
+
+static void
+scan(ZlibW *z)
+{
+	uchar *p;
+	int i, bit, n, ch, nch, pd;
+	uchar cb;
+	uchar pixel[4];
+
+	p = z->scan;
+	nch = z->nchan;
+
+	unfilter(p[0], p+1, z->pscan+1, z->scanl-1, (nch*z->bpp+7)/8);
+/*
+ *	Adam7 interlace order. 
+ *	1 6 4 6 2 6 4 6
+ *	7 7 7 7 7 7 7 7
+ *	5 6 5 6 5 6 5 6
+ *	7 7 7 7 7 7 7 7
+ *	3 6 4 6 3 6 4 6
+ *	7 7 7 7 7 7 7 7
+ *	5 6 5 6 5 6 5 6
+ *	7 7 7 7 7 7 7 7
+ */
+	ch = 0;
+	n = 0;
+	cb = 128;
+	pd = z->row * z->scanpix;
+	for (i = 1; i < z->scanl; ++i)
+		for (bit = 128; bit > 0; bit /= 2) {
+
+			pixel[ch] &= ~cb;
+			if (p[i] & bit)
+				pixel[ch] |= cb;
+
+			cb >>= 1;
+
+			if (++n == z->bpp) {
+				cb = 128;
+				n = 0;
+				ch++;
+			}
+			if (ch == nch) {
+				if (z->npix++ < z->chanl)
+					convertpix(z,pixel,z->chan[0]+pd,z->chan[1]+pd,z->chan[2]+pd);
+				pd++;
+				if (pd % z->scanpix == 0)
+					goto out;
+				ch = 0;
+			}
+		}
+out: ;
+}
+
 static int
 zwrite(void *va, void *vb, int n)
 {
 	ZlibW *z = va;
 	uchar *buf = vb;
-	int i, up;
+	int i, j;
-	for(i=0; i<n; i++){
+
-		if(z->col == -1){
+	j = z->scanp;
-			// set filter byte
+	for (i = 0; i < n; ++i) {
-			z->filter = *buf++;
+		z->scan[j++] = buf[i];
-			if (z->filter >= FilterLast)
+		if (j == z->scanl) {
-				sysfatal("unknown filter algorithm %d for row %d", z->row, z->filter);
+			uchar *tp;
-			z->col++;
+			scan(z);
-			continue;
+
-		}
+			tp = z->scan;
-		switch(z->chan){
+			z->scan = z->pscan;
-		case 0:
+			z->pscan = tp;
-			*z->r++ = *buf++;
+			z->row++;
-			z->chan = 1;
+			j = 0;
-			break;
-		case 1:
-			*z->g++ = *buf++;
-			z->chan = 2;
-			break;
-		case 2:
-			*z->b++ = *buf++;
-			z->chan = 0;
-			z->col++;
-			if(z->col == z->ncol){
-				if (z->filter){
-					if(z->row == 0)
-						up = 0;
-					else
-						up = -z->ncol;
-					unfilter(z->filter, z->r - z->col, z->r, up);
-					unfilter(z->filter, z->g - z->col, z->g, up);
-					unfilter(z->filter, z->b - z->col, z->b, up);
-				}
-				z->col = -1;
-				z->row++;
-				if((z->row >= z->nrow) && (i < n-1) )
-					sysfatal("header said %d rows; data goes further", z->nrow);
-			}
-			break;
 		}
 	}
+	z->scanp = j;
+
 	return n;
 }
 
@@ -238,7 +309,9 @@ readslave(Biobuf *b)
 	Rawimage *image;
 	char type[5];
 	uchar *buf, *h;
-	int k, n, nrow, ncol, err;
+	int k, n, nrow, ncol, err, bpp, nch;
+
+	zr.w = &zw;
 
 	buf = pngmalloc(IDATSIZE, 0);
 	Bread(b, buf, sizeof PNGmagic);
@@ -255,10 +328,39 @@ readslave(Biobuf *b)
 		sysfatal("impossible image size nrow=%d ncol=%d", nrow, ncol);
 	if(debug)
 		fprint(2, "readpng nrow=%d ncol=%d\n", nrow, ncol);
-	if(*h++ != 8)
+
-		sysfatal("only 24 bit per pixel supported for now [%d]", h[-1]);
+	bpp = *h++;
-	if(*h++ != 2)
+	nch = 0;
-		sysfatal("only rgb supported for now [%d]", h[-1]);
+	switch (*h++) {
+	case 0:	/* grey */
+		nch = 1;
+		break;
+	case 2:	/* rgb */
+		nch = 3;
+		break;
+	case 3: /* indexed rgb with PLTE */
+		nch = 1;
+		break;
+	case 4:	/* grey+alpha */
+		nch = 2;
+		break;
+	case 6:	/* rgb+alpha */
+		nch = 4;
+		break;
+	default:
+		sysfatal("unsupported color scheme %d", h[-1]);
+	}
+
+	/* generate default palette for grayscale */
+	zw.palsize = 256;
+	if (nch < 3 && bpp < 9)
+		zw.palsize = 1<<bpp;
+	for (k = 0; k < zw.palsize; ++k) {
+		zw.palette[3*k] = (k*255)/(zw.palsize-1);
+		zw.palette[3*k+1] = (k*255)/(zw.palsize-1);
+		zw.palette[3*k+2] = (k*255)/(zw.palsize-1);
+	}
+
 	if(*h++ != 0)
 		sysfatal("only deflate supported for now [%d]", h[-1]);
 	if(*h++ != FilterNone)
@@ -277,23 +379,39 @@ readslave(Biobuf *b)
 	image->giftrindex = 0;
 	image->chandesc = CRGB;
 	image->nchans = 3;
-	for(k=0; k<3; k++)
+
-		image->chans[k] = pngmalloc(ncol*nrow, 0);
+	zw.chanl = ncol*nrow;
+	zw.npix = 0;
+	for(k=0; k<4; k++)
+		image->chans[k] = zw.chan[k] = pngmalloc(ncol*nrow, 1);
+
 	zr.bi = b;
 	zr.buf = buf;
 	zr.b = zr.e = buf + IDATSIZE;
-	zw.r = image->chans[0];
+
-	zw.g = image->chans[1];
+	zw.scanp = 0;
-	zw.b = image->chans[2];
-	zw.chan = 0;
-	zw.col = -1;
 	zw.row = 0;
-	zw.ncol = ncol;
+	zw.scanpix = ncol;
-	zw.nrow = nrow;
+	zw.scanl = (nch*ncol*bpp+7)/8+1;
+	zw.scan = pngmalloc(zw.scanl, 1);
+	zw.pscan = pngmalloc(zw.scanl, 1);
+	zw.nchan = nch;
+	zw.bpp = bpp;
+
 	err = inflatezlib(&zw, zwrite, &zr, zread);
+
+	if (zw.npix > zw.chanl)
+		fprint(2, "tried to overflow by %d pix\n", zw.npix - zw.chanl);
+
+
 	if(err)
 		sysfatal("inflatezlib %s\n", flateerr(err));
+
+	free(image->chans[3]);
+	image->chans[3] = nil;
 	free(buf);
+	free(zw.scan);
+	free(zw.pscan);
 	return image;
 }