[Scummvm-cvs-logs] SF.net SVN: scummvm:[54441] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Nov 23 23:27:21 CET 2010


Revision: 54441
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54441&view=rev
Author:   fingolfin
Date:     2010-11-23 22:27:20 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
COMMON: Remove default value for endianess in ReadStreamEndian subclasses

Modified Paths:
--------------
    scummvm/trunk/common/memstream.h
    scummvm/trunk/common/stream.h
    scummvm/trunk/common/substream.h
    scummvm/trunk/engines/saga/sprite.cpp

Modified: scummvm/trunk/common/memstream.h
===================================================================
--- scummvm/trunk/common/memstream.h	2010-11-23 22:27:00 UTC (rev 54440)
+++ scummvm/trunk/common/memstream.h	2010-11-23 22:27:20 UTC (rev 54441)
@@ -81,7 +81,7 @@
  */
 class MemoryReadStreamEndian : public MemoryReadStream, public ReadStreamEndian {
 public:
-	MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian = false)
+	MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian)
 		: MemoryReadStream(buf, len), ReadStreamEndian(bigEndian) {}
 };
 

Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h	2010-11-23 22:27:00 UTC (rev 54440)
+++ scummvm/trunk/common/stream.h	2010-11-23 22:27:20 UTC (rev 54441)
@@ -398,7 +398,7 @@
 	const bool _bigEndian;
 
 public:
-	ReadStreamEndian(bool bigEndian = false) : _bigEndian(bigEndian) {}
+	ReadStreamEndian(bool bigEndian) : _bigEndian(bigEndian) {}
 
 	uint16 readUint16() {
 		uint16 val;

Modified: scummvm/trunk/common/substream.h
===================================================================
--- scummvm/trunk/common/substream.h	2010-11-23 22:27:00 UTC (rev 54440)
+++ scummvm/trunk/common/substream.h	2010-11-23 22:27:20 UTC (rev 54441)
@@ -95,7 +95,7 @@
  */
 class SeekableSubReadStreamEndian : public SeekableSubReadStream, public ReadStreamEndian {
 public:
-	SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian = false, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
+	SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
 		: SeekableSubReadStream(parentStream, begin, end, disposeParentStream),
 		  ReadStreamEndian(bigEndian) {
 	}

Modified: scummvm/trunk/engines/saga/sprite.cpp
===================================================================
--- scummvm/trunk/engines/saga/sprite.cpp	2010-11-23 22:27:00 UTC (rev 54440)
+++ scummvm/trunk/engines/saga/sprite.cpp	2010-11-23 22:27:20 UTC (rev 54441)
@@ -132,7 +132,7 @@
 
 			spriteDataPointer = spritePointer + readS2.pos();
 		} else {
-			Common::MemoryReadStreamEndian readS2(spritePointer, 4);
+			Common::MemoryReadStreamEndian readS2(spritePointer, 4, false);
 
 			spriteInfo->xAlign = readS2.readSByte();
 			spriteInfo->yAlign = readS2.readSByte();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list