[Scummvm-cvs-logs] CVS: scummvm/kyra codecs.cpp,1.3,1.4
Max Horn
fingolfin at users.sourceforge.net
Thu Oct 21 09:01:27 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword1 resman.cpp,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 .cvsignore,NONE,1.1 freeverb.cpp,NONE,1.1 freeverb.h,NONE,1.1 mt32.cpp,NONE,1.1 partial.cpp,NONE,1.1 partial.h,NONE,1.1 structures.h,NONE,1.1 synth.cpp,NONE,1.1 synth.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2570
Modified Files:
codecs.cpp
Log Message:
Whitespace -> tab
Index: codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/codecs.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- codecs.cpp 16 Oct 2004 22:28:29 -0000 1.3
+++ codecs.cpp 21 Oct 2004 15:54:06 -0000 1.4
@@ -40,76 +40,76 @@
*/
namespace Kyra {
int Compression::decode80(const uint8* image_in, uint8* image_out) {
- /*
- 0 copy 0cccpppp p
- 1 copy 10cccccc
- 2 copy 11cccccc p p
- 3 fill 11111110 c c v
- 4 copy 11111111 c c p p
- */
+ /*
+ 0 copy 0cccpppp p
+ 1 copy 10cccccc
+ 2 copy 11cccccc p p
+ 3 fill 11111110 c c v
+ 4 copy 11111111 c c p p
+ */
- const uint8* copyp;
- const uint8* readp = image_in;
- uint8* writep = image_out;
- uint16 code;
- uint16 count;
+ const uint8* copyp;
+ const uint8* readp = image_in;
+ uint8* writep = image_out;
+ uint16 code;
+ uint16 count;
- while (1) {
- code = *readp++;
- if (~code & 0x80) {
- //bit 7 = 0
- //command 0 (0cccpppp p): copy
- count = (code >> 4) + 3;
- copyp = writep - (((code & 0xf) << 8) + *readp++);
- while (count--)
- *writep++ = *copyp++;
- } else {
- //bit 7 = 1
- count = code & 0x3f;
- if (~code & 0x40) {
- //bit 6 = 0
- if (!count)
- //end of image
- break;
- //command 1 (10cccccc): copy
- while (count--)
- *writep++ = *readp++;
- } else {
- //bit 6 = 1
- if (count < 0x3e) {
- //command 2 (11cccccc p p): copy
- count += 3;
+ while (1) {
+ code = *readp++;
+ if (~code & 0x80) {
+ //bit 7 = 0
+ //command 0 (0cccpppp p): copy
+ count = (code >> 4) + 3;
+ copyp = writep - (((code & 0xf) << 8) + *readp++);
+ while (count--)
+ *writep++ = *copyp++;
+ } else {
+ //bit 7 = 1
+ count = code & 0x3f;
+ if (~code & 0x40) {
+ //bit 6 = 0
+ if (!count)
+ //end of image
+ break;
+ //command 1 (10cccccc): copy
+ while (count--)
+ *writep++ = *readp++;
+ } else {
+ //bit 6 = 1
+ if (count < 0x3e) {
+ //command 2 (11cccccc p p): copy
+ count += 3;
- copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)];
- readp += 2;
+ copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)];
+ readp += 2;
- memcpy(writep, copyp, count);
- writep += count;
- copyp += count;
- } else if (count == 0x3e) {
- //command 3 (11111110 c c v): fill
+ memcpy(writep, copyp, count);
+ writep += count;
+ copyp += count;
+ } else if (count == 0x3e) {
+ //command 3 (11111110 c c v): fill
- count = READ_LE_UINT16(readp);
- readp += 2;
- code = *readp++;
- memset(writep, code, count);
- writep += count;
- } else {
- //command 4 (copy 11111111 c c p p): copy
+ count = READ_LE_UINT16(readp);
+ readp += 2;
+ code = *readp++;
+ memset(writep, code, count);
+ writep += count;
+ } else {
+ //command 4 (copy 11111111 c c p p): copy
- count = READ_LE_UINT16(readp);
- readp += 2;
+ count = READ_LE_UINT16(readp);
+ readp += 2;
- copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)];
- readp += 2;
- while (count--)
- *writep++ = *copyp++;
- }
- }
- }
- }
+ copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)];
+ readp += 2;
+ while (count--)
+ *writep++ = *copyp++;
+ }
+ }
+ }
+ }
- return (writep - image_out);
+ return (writep - image_out);
}
/** decompress format 40 compressed data.
@@ -118,72 +118,72 @@
* @returns size of uncompressed data.
*/
int Compression::decode40(const uint8* image_in, uint8* image_out) {
- /*
- 0 fill 00000000 c v
- 1 copy 0ccccccc
- 2 skip 10000000 c 0ccccccc
- 3 copy 10000000 c 10cccccc
- 4 fill 10000000 c 11cccccc v
- 5 skip 1ccccccc
- */
+ /*
+ 0 fill 00000000 c v
+ 1 copy 0ccccccc
+ 2 skip 10000000 c 0ccccccc
+ 3 copy 10000000 c 10cccccc
+ 4 fill 10000000 c 11cccccc v
+ 5 skip 1ccccccc
+ */
- const uint8* readp = image_in;
- uint8* writep = image_out;
- uint16 code;
- uint16 count;
+ const uint8* readp = image_in;
+ uint8* writep = image_out;
+ uint16 code;
+ uint16 count;
- while (1) {
- code = *readp++;
- if (~code & 0x80) {
- //bit 7 = 0
- if (!code) {
- //command 0 (00000000 c v): fill
- count = *readp++;
- code = *readp++;
- while (count--)
- *writep++ ^= code;
- } else {
- //command 1 (0ccccccc): copy
- count = code;
- while (count--)
- *writep++ ^= *readp++;
- }
+ while (1) {
+ code = *readp++;
+ if (~code & 0x80) {
+ //bit 7 = 0
+ if (!code) {
+ //command 0 (00000000 c v): fill
+ count = *readp++;
+ code = *readp++;
+ while (count--)
+ *writep++ ^= code;
+ } else {
+ //command 1 (0ccccccc): copy
+ count = code;
+ while (count--)
+ *writep++ ^= *readp++;
+ }
- } else {
- //bit 7 = 1
- if (!(count = code & 0x7f)) {
+ } else {
+ //bit 7 = 1
+ if (!(count = code & 0x7f)) {
- count = READ_LE_UINT16(readp);
- readp += 2;
- code = count >> 8;
- if (~code & 0x80) {
- //bit 7 = 0
- //command 2 (10000000 c 0ccccccc): skip
- if (!count)
- // end of image
- break;
- writep += count;
- } else {
- //bit 7 = 1
- count &= 0x3fff;
- if (~code & 0x40) {
- //bit 6 = 0
- //command 3 (10000000 c 10cccccc): copy
- while (count--)
- *writep++ ^= *readp++;
- } else {
- //bit 6 = 1
- //command 4 (10000000 c 11cccccc v): fill
- code = *readp++;
- while (count--)
- *writep++ ^= code;
- }
- }
- } else //command 5 (1ccccccc): skip
- writep += count;
- }
- }
- return (writep - image_out);
+ count = READ_LE_UINT16(readp);
+ readp += 2;
+ code = count >> 8;
+ if (~code & 0x80) {
+ //bit 7 = 0
+ //command 2 (10000000 c 0ccccccc): skip
+ if (!count)
+ // end of image
+ break;
+ writep += count;
+ } else {
+ //bit 7 = 1
+ count &= 0x3fff;
+ if (~code & 0x40) {
+ //bit 6 = 0
+ //command 3 (10000000 c 10cccccc): copy
+ while (count--)
+ *writep++ ^= *readp++;
+ } else {
+ //bit 6 = 1
+ //command 4 (10000000 c 11cccccc v): fill
+ code = *readp++;
+ while (count--)
+ *writep++ ^= code;
+ }
+ }
+ } else //command 5 (1ccccccc): skip
+ writep += count;
+ }
+ }
+ return (writep - image_out);
}
/** decompress format 3 compressed data.
@@ -191,42 +191,42 @@
* @param pointer to put uncompressed data in.
* @param size of uncompressed image.
*/
-int Compression::decode3(const uint8* image_in, uint8* image_out, int size)
-{ /* Untested on BIG-Endian machines */
+int Compression::decode3(const uint8* image_in, uint8* image_out, int size) {
+ /* Untested on BIG-Endian machines */
/*
- 0 copy
- 1 fill
- 2 fill
- */
- const uint8* readp = image_in;
- uint8* writep = image_out;
- int16 code;
- int16 count;
+ 0 copy
+ 1 fill
+ 2 fill
+ */
+ const uint8* readp = image_in;
+ uint8* writep = image_out;
+ int16 code;
+ int16 count;
do {
- code = *const_cast<int8*>((const int8*)readp++);
- if (code > 0) { // Copy
- count = code ;
- while (count--)
- *writep++ = *readp++;
- } else if (code == 0) { // Fill(1)
- count = READ_BE_UINT16(readp);
+ code = *const_cast<int8*>((const int8*)readp++);
+ if (code > 0) { // Copy
+ count = code ;
+ while (count--)
+ *writep++ = *readp++;
+ } else if (code == 0) { // Fill(1)
+ count = READ_BE_UINT16(readp);
- readp += 2;
- code = *readp++;
- while (count--)
- *writep++ = (uint8)code;
- } else if (code < 0) { // Fill (2)
- count = -code;
- code = *readp++;
- while (count--)
- *writep++ = (uint8)code;
- }
- } while ((writep - image_out) < size);
-
- //and, to be uniform to other decomp. functions...
- return (writep - image_out);
+ readp += 2;
+ code = *readp++;
+ while (count--)
+ *writep++ = (uint8)code;
+ } else if (code < 0) { // Fill (2)
+ count = -code;
+ code = *readp++;
+ while (count--)
+ *writep++ = (uint8)code;
+ }
+ } while ((writep - image_out) < size);
+
+ //and, to be uniform to other decomp. functions...
+ return (writep - image_out);
}
/** decompress format 20 compressed data.
@@ -236,20 +236,20 @@
* @returns size of uncompressed data?
*/
int Compression::decode2(const uint8* s, uint8* d, int cb_s) {
- const uint8* r = s;
- const uint8* r_end = s + cb_s;
- uint8* w = d;
- while (r < r_end) {
- int v = *r++;
- if (v)
- *w++ = v;
- else {
- v = *r++;
- memset(w, 0, v);
- w += v;
- }
- }
- return w - d;
+ const uint8* r = s;
+ const uint8* r_end = s + cb_s;
+ uint8* w = d;
+ while (r < r_end) {
+ int v = *r++;
+ if (v)
+ *w++ = v;
+ else {
+ v = *r++;
+ memset(w, 0, v);
+ w += v;
+ }
+ }
+ return w - d;
}
} // end of namespace Kyra
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword1 resman.cpp,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 .cvsignore,NONE,1.1 freeverb.cpp,NONE,1.1 freeverb.h,NONE,1.1 mt32.cpp,NONE,1.1 partial.cpp,NONE,1.1 partial.h,NONE,1.1 structures.h,NONE,1.1 synth.cpp,NONE,1.1 synth.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list