[Scummvm-cvs-logs] CVS: scummvm/sky rnc_deco.h,1.1,1.2 rnc_deco.cpp,1.14,1.15

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv15562

Modified Files:
	rnc_deco.h rnc_deco.cpp 
Log Message:
add const qualifier

Index: rnc_deco.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rnc_deco.h	6 Mar 2003 15:35:07 -0000	1.1
+++ rnc_deco.h	6 Jul 2003 22:50:37 -0000	1.2
@@ -35,16 +35,17 @@
 	uint16 _bitBuffh;
 	uint8 _bitCount;
 
-	uint8 *_srcPtr, *_dstPtr;
+	const uint8 *_srcPtr;
+	uint8 *_dstPtr;
 
 public:
 	RncDecoder();
 	~RncDecoder();
-	int32 unpackM1(void *input, void *output, uint16 key);	
+	int32 unpackM1(const void *input, void *output, uint16 key);	
 	
 protected:
 	void initCrc();
-	uint16 crcBlock(uint8 *block, uint32 size);
+	uint16 crcBlock(const uint8 *block, uint32 size);
 	uint16 inputBits(uint8 amount);
 	void makeHufftable(uint16 *table);
 	uint16 inputValue(uint16 *table);

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rnc_deco.cpp	1 May 2003 10:49:03 -0000	1.14
+++ rnc_deco.cpp	6 Jul 2003 22:50:37 -0000	1.15
@@ -62,7 +62,7 @@
 }
 
 //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 @@
 	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 @@
 	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;