[Scummvm-cvs-logs] scummvm master -> 39bbcfa59e89f065757d418d4406fe7f42acde57

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d594f62662 TOOLS: Create Mortdat - Fix CID 1063349
39bbcfa59e TOOLS: Extract_mort - FIX CID 1060932, 1060933


Commit: d594f626625ef78c659e3bd5936816ffba1886b7
    https://github.com/scummvm/scummvm/commit/d594f626625ef78c659e3bd5936816ffba1886b7
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-30T15:33:38-07:00

Commit Message:
TOOLS: Create Mortdat - Fix CID 1063349

Changed paths:
    devtools/create_mortdat/create_mortdat.cpp



diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp
index 0065407..693e277 100644
--- a/devtools/create_mortdat/create_mortdat.cpp
+++ b/devtools/create_mortdat/create_mortdat.cpp
@@ -210,7 +210,7 @@ void writeMenuData(const char *menuData, int languageId) {
 	outputFile.writeByte(languageId);
 	// Write each 8-characters block as a byte (one bit per character)
 	// ' ' -> 0, anything else -> 1
-	byte value;
+	byte value = 0;
 	int valueCpt = 0;
 	const char* str = menuData;
 	while (*str != 0) {


Commit: 39bbcfa59e89f065757d418d4406fe7f42acde57
    https://github.com/scummvm/scummvm/commit/39bbcfa59e89f065757d418d4406fe7f42acde57
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-30T15:46:05-07:00

Commit Message:
TOOLS: Extract_mort - FIX CID 1060932, 1060933

Changed paths:
    devtools/extract_mort/extract_mort.cpp



diff --git a/devtools/extract_mort/extract_mort.cpp b/devtools/extract_mort/extract_mort.cpp
index 4346f1f..a52458f 100644
--- a/devtools/extract_mort/extract_mort.cpp
+++ b/devtools/extract_mort/extract_mort.cpp
@@ -104,9 +104,9 @@ public:
 		return ftell(f);
 	}
 	uint32 size() {
-		int position = ftell(f);
+		uint32 position = ftell(f);
 		fseek (f, 0, SEEK_END);
-		int end = ftell (f);
+		uint32 end = ftell(f);
 		fseek (f, position, SEEK_SET);
 
 		return end;