aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-07-10 18:06:10 -0500
committerrichiesams2013-08-04 13:32:09 -0500
commit0451503ecc415a7f871652040fc23e221d3e4d63 (patch)
tree5a523688bfd6b6f62354ac0ef12fc1592240a73c
parent4398c04a7b20c5ccb5033d04430479c795f9dff8 (diff)
downloadscummvm-rg350-0451503ecc415a7f871652040fc23e221d3e4d63.tar.gz
scummvm-rg350-0451503ecc415a7f871652040fc23e221d3e4d63.tar.bz2
scummvm-rg350-0451503ecc415a7f871652040fc23e221d3e4d63.zip
ZVISION: Remove implicit cast between integer types
-rw-r--r--engines/zvision/zfs_archive.cpp4
-rw-r--r--engines/zvision/zfs_archive.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/zvision/zfs_archive.cpp b/engines/zvision/zfs_archive.cpp
index 85933b3240..fbfe3d3dc4 100644
--- a/engines/zvision/zfs_archive.cpp
+++ b/engines/zvision/zfs_archive.cpp
@@ -76,7 +76,7 @@ void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
nextOffset = stream->readUint32LE();
// Read in each entry header
- for (int i = 0; i < _header.filesPerBlock; i++) {
+ for (uint32 i = 0; i < _header.filesPerBlock; i++) {
ZfsEntryHeader entryHeader;
entryHeader.name = readEntryName(stream);
@@ -145,7 +145,7 @@ Common::SeekableReadStream *ZfsArchive::createReadStreamForMember(const Common::
return new Common::MemoryReadStream(buffer, entryHeader->size, DisposeAfterUse::YES);
}
-void ZfsArchive::unXor(byte *buffer, int length, const byte *xorKey) const {
+void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
for (uint32 i = 0; i < length; i++)
buffer[i] ^= xorKey[i % 4];
}
diff --git a/engines/zvision/zfs_archive.h b/engines/zvision/zfs_archive.h
index ccdf192571..cb371f2c87 100644
--- a/engines/zvision/zfs_archive.h
+++ b/engines/zvision/zfs_archive.h
@@ -113,7 +113,7 @@ private:
* @param buffer The data to decode
* @param length Length of buffer
*/
- void unXor(byte *buffer, int length, const byte *xorKey) const;
+ void unXor(byte *buffer, uint32 length, const byte *xorKey) const;
};
} // End of namespace ZVision