[Scummvm-cvs-logs] CVS: scummvm/common stream.h,1.9,1.10
Max Horn
fingolfin at users.sourceforge.net
Sat Dec 11 15:51:03 CET 2004
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26154
Modified Files:
stream.h
Log Message:
Remove the 24 bit read/write methods -- we don't use them anymore and they are weird anyway ;-)
Index: stream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stream.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- stream.h 11 Dec 2004 23:16:36 -0000 1.9
+++ stream.h 11 Dec 2004 23:50:39 -0000 1.10
@@ -61,11 +61,6 @@
writeByte((byte)(value >> 8));
}
- void writeUint24LE(uint32 value) {
- writeUint16LE((uint16)(value & 0xffff));
- writeByte((byte)(value >> 16));
- }
-
void writeUint32LE(uint32 value) {
writeUint16LE((uint16)(value & 0xffff));
writeUint16LE((uint16)(value >> 16));
@@ -76,11 +71,6 @@
writeByte((byte)(value & 0xff));
}
- void writeUint24BE(uint32 value) {
- writeByte((byte)(value >> 16));
- writeUint16BE((uint16)(value & 0xffff));
- }
-
void writeUint32BE(uint32 value) {
writeUint16BE((uint16)(value >> 16));
writeUint16BE((uint16)(value & 0xffff));
@@ -90,10 +80,6 @@
writeUint16LE((uint16)value);
}
- void writeSint24LE(int32 value) {
- writeUint24LE((uint32)value);
- }
-
void writeSint32LE(int32 value) {
writeUint32LE((uint32)value);
}
@@ -102,10 +88,6 @@
writeUint16BE((uint16)value);
}
- void writeSint24BE(int32 value) {
- writeUint24BE((uint32)value);
- }
-
void writeSint32BE(int32 value) {
writeUint32BE((uint32)value);
}
@@ -149,12 +131,6 @@
return a | (b << 8);
}
- uint32 readUint24LE() {
- uint32 a = readUint16LE();
- uint32 b = readByte();
- return (b << 16) | a;
- }
-
uint32 readUint32LE() {
uint32 a = readUint16LE();
uint32 b = readUint16LE();
@@ -167,27 +143,16 @@
return a | (b << 8);
}
- uint32 readUint24BE() {
- uint32 b = readByte();
- uint32 a = readUint16BE();
- return (b << 16) | a;
- }
-
uint32 readUint32BE() {
uint32 b = readUint16BE();
uint32 a = readUint16BE();
return (b << 16) | a;
}
-
int16 readSint16LE() {
return (int16)readUint16LE();
}
- int32 readSint24LE() {
- return (int32)readUint24LE();
- }
-
int32 readSint32LE() {
return (int32)readUint32LE();
}
@@ -196,10 +161,6 @@
return (int16)readUint16BE();
}
- int32 readSint24BE() {
- return (int32)readUint24BE();
- }
-
int32 readSint32BE() {
return (int32)readUint32BE();
}
More information about the Scummvm-git-logs
mailing list