diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-21 07:31:05 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-21 07:31:05 (GMT) |
| commit | beaa92cb293a4147aef8ed03027500804535ed96 (patch) | |
| tree | c8427746983418476a99b5c61847e0b4eeca5f1d /src/compression/vals16.c | |
| parent | 885f2782f9f48b69bc229612b0734b4de48b890b (diff) | |
Fixed compiler warnings and linking errors in MSVC.
Changed tabs to spaces in tng_compression functions.
Diffstat (limited to 'src/compression/vals16.c')
| -rw-r--r-- | src/compression/vals16.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/compression/vals16.c b/src/compression/vals16.c index df44d8d..10a1cd8 100644 --- a/src/compression/vals16.c +++ b/src/compression/vals16.c @@ -16,29 +16,29 @@ /* Coding 32 bit ints in sequences of 16 bit ints. Worst case the output is 3*nvals long. */ void Ptngc_comp_conv_to_vals16(unsigned int *vals,int nvals, - unsigned int *vals16, int *nvals16) + unsigned int *vals16, int *nvals16) { int i; int j=0; for (i=0; i<nvals; i++) { if (vals[i]<=0x7FFFU) - vals16[j++]=vals[i]; + vals16[j++]=vals[i]; else - { - unsigned int lo=(vals[i]&0x7FFFU)|0x8000U; - unsigned int hi=vals[i]>>15; - vals16[j++]=lo; - if (hi<=0x7FFFU) - vals16[j++]=hi; - else - { - unsigned int lohi=(hi&0x7FFFU)|0x8000U; - unsigned int hihi=hi>>15; - vals16[j++]=lohi; - vals16[j++]=hihi; - } - } + { + unsigned int lo=(vals[i]&0x7FFFU)|0x8000U; + unsigned int hi=vals[i]>>15; + vals16[j++]=lo; + if (hi<=0x7FFFU) + vals16[j++]=hi; + else + { + unsigned int lohi=(hi&0x7FFFU)|0x8000U; + unsigned int hihi=hi>>15; + vals16[j++]=lohi; + vals16[j++]=hihi; + } + } } #if 0 /* Test that things that detect that this is bad really works. */ @@ -48,26 +48,26 @@ void Ptngc_comp_conv_to_vals16(unsigned int *vals,int nvals, } void Ptngc_comp_conv_from_vals16(unsigned int *vals16,int nvals16, - unsigned int *vals, int *nvals) + unsigned int *vals, int *nvals) { int i=0; int j=0; while (i<nvals16) { if (vals16[i]<=0x7FFFU) - vals[j++]=vals16[i++]; + vals[j++]=vals16[i++]; else - { - unsigned int lo=vals16[i++]; - unsigned int hi=vals16[i++]; - if (hi<=0x7FFFU) - vals[j++]=(lo&0x7FFFU)|(hi<<15); - else - { - unsigned int hihi=vals16[i++]; - vals[j++]=(lo&0x7FFFU)|((hi&0x7FFFU)<<15)|(hihi<<30); - } - } + { + unsigned int lo=vals16[i++]; + unsigned int hi=vals16[i++]; + if (hi<=0x7FFFU) + vals[j++]=(lo&0x7FFFU)|(hi<<15); + else + { + unsigned int hihi=vals16[i++]; + vals[j++]=(lo&0x7FFFU)|((hi&0x7FFFU)<<15)|(hihi<<30); + } + } } *nvals=j; } |