author | ecalot
<ecalot> 2005-03-24 21:21:59 UTC |
committer | ecalot
<ecalot> 2005-03-24 21:21:59 UTC |
parent | 63edc1bf10bf36e0ef49c1b74e0bdc3bd8dc2964 |
PR/src/lib/compression/lzg_decompress.c | +5 | -3 |
PR/src/lib/compression/rle_decompress.c | +8 | -8 |
PR/src/lib/compression/rlev_decompress.c | +8 | -8 |
diff --git a/PR/src/lib/compression/lzg_decompress.c b/PR/src/lib/compression/lzg_decompress.c index 077e6ef..6109f3a 100644 --- a/PR/src/lib/compression/lzg_decompress.c +++ b/PR/src/lib/compression/lzg_decompress.c @@ -47,9 +47,11 @@ unsigned char popBit(unsigned char *byte) { int expandLzg(const unsigned char* input, int inputSize, unsigned char** output2, int *outputSize) { - int loc, oCursor=0, iCursor=0; - unsigned char maskbyte=0, rep, k; - unsigned char output[65000]; + int oCursor=0, iCursor=0; + unsigned char maskbyte=0; + unsigned char output[65000]; + register int loc; + register unsigned char rep, k; /* initialize the first 1024 bytes of the window with zeros */ for(oCursor=0;oCursor<LZG_WINDOW_SIZE;output[oCursor++]=0); diff --git a/PR/src/lib/compression/rle_decompress.c b/PR/src/lib/compression/rle_decompress.c index 1fe0dde..cc3d1ab 100644 --- a/PR/src/lib/compression/rle_decompress.c +++ b/PR/src/lib/compression/rle_decompress.c @@ -39,28 +39,28 @@ compress.c: Princed Resources : Image Compression Library /* Expands RLE algorithm */ int expandRle(const unsigned char* input, int inputSize, unsigned char** output, int *outputSize) { - int cursor=0; register signed char rep=1; - int pos=0; + int oCursor=0; + int iCursor=0; /* reserve memory */ if ((*output=malloc(40000))==NULL) return COMPRESS_RESULT_FATAL; /* main loop */ - while (pos<inputSize) { - rep=(signed char)(input[pos++]); + while (iCursor<inputSize) { + rep=(signed char)(input[iCursor++]); if (rep<0) { /* Negative */ - while (rep++) (*output)[cursor++]=input[pos]; - pos++; + while (rep++) (*output)[oCursor++]=input[iCursor]; + iCursor++; } else { /* Positive */ rep=~rep; - while ((rep++)&&(pos<inputSize)) (*output)[cursor++]=input[pos++]; + while ((rep++)&&(iCursor<inputSize)) (*output)[oCursor++]=input[iCursor++]; } } - *outputSize=cursor; + *outputSize=oCursor; return (rep==1)?COMPRESS_RESULT_SUCCESS:COMPRESS_RESULT_WARNING; } diff --git a/PR/src/lib/compression/rlev_decompress.c b/PR/src/lib/compression/rlev_decompress.c index 1fe0dde..cc3d1ab 100644 --- a/PR/src/lib/compression/rlev_decompress.c +++ b/PR/src/lib/compression/rlev_decompress.c @@ -39,28 +39,28 @@ compress.c: Princed Resources : Image Compression Library /* Expands RLE algorithm */ int expandRle(const unsigned char* input, int inputSize, unsigned char** output, int *outputSize) { - int cursor=0; register signed char rep=1; - int pos=0; + int oCursor=0; + int iCursor=0; /* reserve memory */ if ((*output=malloc(40000))==NULL) return COMPRESS_RESULT_FATAL; /* main loop */ - while (pos<inputSize) { - rep=(signed char)(input[pos++]); + while (iCursor<inputSize) { + rep=(signed char)(input[iCursor++]); if (rep<0) { /* Negative */ - while (rep++) (*output)[cursor++]=input[pos]; - pos++; + while (rep++) (*output)[oCursor++]=input[iCursor]; + iCursor++; } else { /* Positive */ rep=~rep; - while ((rep++)&&(pos<inputSize)) (*output)[cursor++]=input[pos++]; + while ((rep++)&&(iCursor<inputSize)) (*output)[oCursor++]=input[iCursor++]; } } - *outputSize=cursor; + *outputSize=oCursor; return (rep==1)?COMPRESS_RESULT_SUCCESS:COMPRESS_RESULT_WARNING; }