Fix problems with > 4GB iso files.

unknownbrackets · Apr 11, 2015 · 6a6a0f8 · 6a6a0f8
1 parent bd98eb2
commit 6a6a0f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/compress.h b/src/compress.h
@@ -7,7 +7,7 @@
 
 namespace maxcso {
 
-static const char *VERSION = "1.4.4";
+static const char *VERSION = "1.4.5";
 
 struct Task;
 

diff --git a/src/input.cpp b/src/input.cpp
@@ -216,7 +216,7 @@ void Input::ReadSector() {
 			pos = static_cast<uint64_t>(index & 0x7FFFFFFF) << csoIndexShift_;
 			const int64_t nextPos = static_cast<uint64_t>(nextIndex & 0x7FFFFFFF) << csoIndexShift_;
 			len = static_cast<unsigned int>(nextPos - pos);
-			offset = pos_ & (csoBlockSize_ - 1);
+			offset = pos_ & static_cast<uint64_t>(csoBlockSize_ - 1);
 
 			switch (type_) {
 			case CSO1:

diff --git a/src/sector.cpp b/src/sector.cpp
@@ -65,7 +65,7 @@ void Sector::Process(int64_t pos, uint8_t *buffer, SectorCallback ready) {
 	if (!busy_) {
 		busy_ = true;
 
-		pos_ = pos & ~(blockSize_ - 1);
+		pos_ = pos & ~static_cast<uint64_t>(blockSize_ - 1);
 		bestSize_ = blockSize_;
 		bestFmt_ = SECTOR_FMT_ORIG;