o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make flate crc32 work when ulong is 64 bits

Browse source 
R=, rsc
CC=
http://codereview.appspot.com/203061
This commit is contained in:
Russ Cox 2010-02-07 16:51:28 -08:00
parent 28afa898ee
commit 9a05452085
7 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/jpg/readpng.c
View file

@ -44,11 +44,11 @@ typedef struct ZlibR{
ZlibW *w;
} ZlibR;
static ulong *crctab;
static uint32 *crctab;
static uchar PNGmagic[] = {137,80,78,71,13,10,26,10};
static char memerr[] = "ReadPNG: malloc failed: %r";
static ulong
static uint32
get4(uchar *a)
{
return (a[0]<<24) | (a[1]<<16) | (a[2]<<8) | a[3];
@ -87,7 +87,7 @@ static int
getchunk(Biobuf *b, char *type, uchar *d, int m)
{
uchar buf[8];
ulong crc = 0, crc2;
uint32 crc = 0, crc2;
int n, nr;
if(Bread(b, buf, 8) != 8)

6
src/cmd/jpg/writepng.c
View file

@ -31,11 +31,11 @@ typedef struct ZlibW{
uchar *e; /* past end of buf */
} ZlibW;
static ulong *crctab;
static uint32 *crctab;
static uchar PNGmagic[] = {137,80,78,71,13,10,26,10};
static void
put4(uchar *a, ulong v)
put4(uchar *a, uint32 v)
{
a[0] = v>>24;
a[1] = v>>16;
@ -47,7 +47,7 @@ static void
chunk(Biobuf *bo, char *type, uchar *d, int n)
{
uchar buf[4];
ulong crc = 0;
uint32 crc = 0;
if(strlen(type) != 4)
return;

1
src/cmd/scat/sky.h
View file

@ -1,4 +1,3 @@
typedef s32int int32;
#define DIR "#9/sky"
/*