diff --git a/src/anacompress.c b/src/anacompress.c index d4dfa5b..496c3fc 100644 --- a/src/anacompress.c +++ b/src/anacompress.c @@ -13,12 +13,12 @@ int anacrunchrun8(uint8_t *x,uint8_t *array,int slice,int nx,int ny,int limit,in uint8_t bits[8]={1,2,4,8,16,32,64,128}; struct compresshead *ch; uint8_t *p; - unsigned nb,ixa,ixb; + unsigned nb; unsigned register i,j,r1; - int r0,r2,r3,r4,mask,fac, ii, nrun, lrun, ic; - int *dif, *d, nc, zq, yq, test, *dd; - int i2,k,ix,iy; - unsigned char xq; + int r0,r2,r3,mask,fac, nrun, lrun, ic; + int *dif, *d, nc, zq, yq, *dd; + int i2,k,iy; + union { int i; short w; unsigned char b[4]; } y; /* begin execution */ if (limit<25) { printf("limit (%d) too small in crunchrun8\n", limit); return -1;} @@ -187,12 +187,12 @@ int anacrunch8(uint8_t *x,uint8_t *array,int slice,int nx,int ny,int limit,int t { uint8_t bits[8]={1,2,4,8,16,32,64,128}; struct compresshead *ch; - short iq; + unsigned nb,ixa,ixb; unsigned register i,j,r1,in; int r0,r2,r3,mask,fac; - int i2,k,ix,iy; - unsigned char xq; + int i2,k,iy; + union { int i; short w; unsigned char b[4]; } y; /* begin execution */ if (limit<25) { printf("limit (%d) too small in crunch8\n", limit); return -1;} @@ -289,14 +289,14 @@ int anacrunchrun(uint8_t *x,int16_t *array,int slice,int nx,int ny,int limit,int { uint8_t bits[8]={1,2,4,8,16,32,64,128}; struct compresshead *ch; - short iq, *p; - unsigned nb,ixa,ixb; + short *p; + unsigned nb; unsigned register i,j,r1; - int r0,r2,r3,r4,mask,fac, ii, nrun, lrun, ic; - int *dif, *d, nc, zq, yq, test, *dd; - enum {RUN, LITERAL } state; - int i2,k,ix,iy; - unsigned char xq; + int r0,r2,r3,mask,fac, nrun, lrun, ic; + int *dif, *d, nc, zq, yq, *dd; + + int i2,k,iy; + union { int i; short w; unsigned char b[4]; } y; /* begin execution */ if (limit<25) { printf("limit (%d) too small in crunchrun\n", limit); return -1;} @@ -469,7 +469,7 @@ int anacrunch(uint8_t *x,int16_t *array,int slice,int nx,int ny,int limit,int t_ uint8_t bits[8]={1,2,4,8,16,32,64,128}; unsigned register i,j,r1,in; int r0,r2,r3,mask,fac; - unsigned char xq; + union{ int i; short w; @@ -614,13 +614,13 @@ int anacrunch32(uint8_t *x,int32_t *array,int slice,int nx,int ny,int limit,int { uint8_t bits[8]={1,2,4,8,16,32,64,128}; struct compresshead *ch; - short iq; + unsigned int nb,ixa,ixb,big=0; unsigned register i,j,r1,in; - int r0,r2,r4,fac; + int r0,r2,fac; long long r3, mask, y64; - int i2,k,ix,iy; - unsigned char xq; + int i2,k,iy; + union { int i; short w; unsigned char b[4]; } y; union { long long l64; unsigned char b[8]; } yy; /* begin execution */ diff --git a/src/anadecompress.c b/src/anadecompress.c index a376a6d..e5e404c 100644 --- a/src/anadecompress.c +++ b/src/anadecompress.c @@ -11,7 +11,7 @@ int anadecrunch32(unsigned char *x,int32_t *array,int r9,int nx,int ny,int littl bit slice size r9 */ { int iq; - int r0,r1,r2,r4,nb; + int r0=0,r1,r2,nb; int j,in,i,k,ix,iy, mask; long long y64; unsigned char xq; @@ -130,7 +130,7 @@ int anadecrunch(unsigned char *x,int16_t *array,int r9,int nx,int ny,int little_ bit slice size r9 */ { short iq; - int r0,r1,r2,r4,nb,mask; + int r0=0,r1,r2,r4,nb,mask; int j,in,i,k,ix,iy; unsigned char xq; union { @@ -297,7 +297,7 @@ int anadecrunch8(unsigned char *x,int8_t *array,int r9,int nx,int ny,int little_ bit slice size r9 */ { uint8_t iq; - int r0,r1,r2,r4,nb,mask; + int r0=0,r1,r2,r4,nb,mask; int j,in,i,k,ix,iy; uint8_t xq; union { int i; short w; unsigned char b[4]; } y; @@ -394,7 +394,7 @@ int anadecrunchrun(unsigned char *x,int16_t *array,int r9,int nx,int ny,int litt /* this version handles the run length encoding used in anacrunchrun */ { short iq; - int r0,r1,r2,r3,r4,nb,mask,nrun,n,nc; + int r0=0,r1,r2,r4,nb,mask,nrun,n,nc; int j,in,i,k,iy; unsigned char xq; union { int i; short w; unsigned char b[4]; } y; @@ -536,7 +536,7 @@ int anadecrunchrun8(unsigned char *x,int8_t *array,int r9,int nx,int ny,int litt /* this version handles the run length encoding used in anacrunchrun */ { uint8_t iq; - int r0,r1,r2,r3,r4,nb,mask,nrun,n,nc; + int r0=0,r1,r2,r4,nb,mask,nrun,n,nc; int j,in,i,k,iy; unsigned char xq; union { int i; short w; unsigned char b[4]; } y; diff --git a/src/anarw.c b/src/anarw.c index 35fce14..a6ec9e1 100644 --- a/src/anarw.c +++ b/src/anarw.c @@ -246,8 +246,8 @@ void ana_fzwrite(uint8_t *data,char *file_name,int *ds,int nd,char *header,int t // int n_elem=1,n; for(n=0;n