diff options
author | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
---|---|---|
committer | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
commit | cbeb0b26e4c7caa8d1b47de791a7418dc20a4567 (patch) | |
tree | e0f7e445de1aa22a42ef873dc4b1118a8105ae93 /src/cmd/jpg/readpng.c | |
parent | 226d80b8213821af0cbf092d1507c52b504fd368 (diff) | |
download | plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.gz plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.bz2 plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.zip |
Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
Diffstat (limited to 'src/cmd/jpg/readpng.c')
-rw-r--r-- | src/cmd/jpg/readpng.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/cmd/jpg/readpng.c b/src/cmd/jpg/readpng.c index f6e8e9d1..2985c5ff 100644 --- a/src/cmd/jpg/readpng.c +++ b/src/cmd/jpg/readpng.c @@ -16,31 +16,31 @@ enum{ IDATSIZE=1000000, 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]) */ FilterLast = 5, - PropertyBit = 1<<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] + 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 bpp; /* bits per sample */ int palsize; - int row; // current scanline number + 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 + uchar *b; /* next byte to decompress */ + uchar *e; /* past end of buf */ ZlibW *w; } ZlibR; |