aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2004-12-11 23:50:39 +0000
committerMax Horn2004-12-11 23:50:39 +0000
commit41a7e6674cface371c1a923beb3c955d711eb042 (patch)
treed66f56e029abf6467c9a7426c9bd28db1c842ec6 /common
parente1f6101140f3243caf407a7be934a02cc44c1a57 (diff)
downloadscummvm-rg350-41a7e6674cface371c1a923beb3c955d711eb042.tar.gz
scummvm-rg350-41a7e6674cface371c1a923beb3c955d711eb042.tar.bz2
scummvm-rg350-41a7e6674cface371c1a923beb3c955d711eb042.zip
Remove the 24 bit read/write methods -- we don't use them anymore and they are weird anyway ;-)
svn-id: r16037
Diffstat (limited to 'common')
-rw-r--r--common/stream.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/common/stream.h b/common/stream.h
index 55d27bc11d..1dec5cdab6 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -61,11 +61,6 @@ public:
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 @@ public:
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 @@ public:
writeUint16LE((uint16)value);
}
- void writeSint24LE(int32 value) {
- writeUint24LE((uint32)value);
- }
-
void writeSint32LE(int32 value) {
writeUint32LE((uint32)value);
}
@@ -102,10 +88,6 @@ public:
writeUint16BE((uint16)value);
}
- void writeSint24BE(int32 value) {
- writeUint24BE((uint32)value);
- }
-
void writeSint32BE(int32 value) {
writeUint32BE((uint32)value);
}
@@ -149,12 +131,6 @@ public:
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 @@ public:
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 @@ public:
return (int16)readUint16BE();
}
- int32 readSint24BE() {
- return (int32)readUint24BE();
- }
-
int32 readSint32BE() {
return (int32)readUint32BE();
}