aboutsummaryrefslogtreecommitdiff
path: root/sky/rnc_deco.cpp
diff options
context:
space:
mode:
authorMax Horn2003-07-06 22:50:37 +0000
committerMax Horn2003-07-06 22:50:37 +0000
commit68ee2e9051a005373faab81cf98632731a971877 (patch)
tree7cc228436f104aecc4ce62db032d80ba66ff2524 /sky/rnc_deco.cpp
parent2061741bd5112e1fbb05c203d45737cbd7d00d80 (diff)
downloadscummvm-rg350-68ee2e9051a005373faab81cf98632731a971877.tar.gz
scummvm-rg350-68ee2e9051a005373faab81cf98632731a971877.tar.bz2
scummvm-rg350-68ee2e9051a005373faab81cf98632731a971877.zip
add const qualifier
svn-id: r8818
Diffstat (limited to 'sky/rnc_deco.cpp')
-rw-r--r--sky/rnc_deco.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp
index 28bb5fce63..95a1ee7b33 100644
--- a/sky/rnc_deco.cpp
+++ b/sky/rnc_deco.cpp
@@ -62,7 +62,7 @@ void RncDecoder::initCrc() {
}
//calculate 16 bit crc of a block of memory
-uint16 RncDecoder::crcBlock(uint8 *block, uint32 size) {
+uint16 RncDecoder::crcBlock(const uint8 *block, uint32 size) {
uint16 crc = 0;
uint8 *crcTable8 = (uint8 *)_crcTable; //make a uint8* to crc_table
uint8 tmp;
@@ -164,9 +164,9 @@ uint16 RncDecoder::inputValue(uint16 *table) {
return value;
}
-int32 RncDecoder::unpackM1(void *input, void *output, uint16 key) {
- uint8 *inputHigh, *outputLow, *outputHigh;
- uint8 *inputptr = (uint8 *)input;
+int32 RncDecoder::unpackM1(const void *input, void *output, uint16 key) {
+ uint8 *outputLow, *outputHigh;
+ const uint8 *inputHigh, *inputptr = (const uint8 *)input;
uint32 unpackLen = 0;
uint32 packLen = 0;
@@ -196,12 +196,12 @@ int32 RncDecoder::unpackM1(void *input, void *output, uint16 key) {
if (crcBlock(inputptr, packLen) != crcPacked)
return PACKED_CRC;
- inputptr = (((uint8 *)input) + HEADER_LEN);
+ inputptr = (((const uint8 *)input) + HEADER_LEN);
_srcPtr = inputptr;
- inputHigh = ((uint8 *)input) + packLen + HEADER_LEN;;
+ inputHigh = ((const uint8 *)input) + packLen + HEADER_LEN;;
outputLow = (uint8 *)output;
- outputHigh = *(((uint8 *)input) + 16) + unpackLen + outputLow;
+ outputHigh = *(((const uint8 *)input) + 16) + unpackLen + outputLow;
if (! ((inputHigh <= outputLow) || (outputHigh <= inputHigh)) ) {
_srcPtr = inputHigh;