[Scummvm-cvs-logs] scummvm master -> 257f9fd2aed29747cef578b00d6c92266c6aef56

lordhoto lordhoto at gmail.com
Sun Jun 8 18:32:59 CEST 2014


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

Summary:
257f9fd2ae WINTERMUTE: Fix endian issues in findPackageSignature.


Commit: 257f9fd2aed29747cef578b00d6c92266c6aef56
    https://github.com/scummvm/scummvm/commit/257f9fd2aed29747cef578b00d6c92266c6aef56
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-08T18:28:13+02:00

Commit Message:
WINTERMUTE: Fix endian issues in findPackageSignature.

Thanks to somaen for looking over it too.

This also silences bug #6624 "SYMBIAN: WINTERMUTE: Warnings in base_package.cpp".

Changed paths:
    engines/wintermute/base/file/base_package.cpp



diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index b146128..ae49553 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -53,8 +53,8 @@ static bool findPackageSignature(Common::SeekableReadStream *f, uint32 *offset)
 	byte buf[32768];
 
 	byte signature[8];
-	((uint32 *)signature)[0] = PACKAGE_MAGIC_1;
-	((uint32 *)signature)[1] = PACKAGE_MAGIC_2;
+	WRITE_LE_UINT32(signature + 0, PACKAGE_MAGIC_1);
+	WRITE_LE_UINT32(signature + 4, PACKAGE_MAGIC_2);
 
 	uint32 fileSize = (uint32)f->size();
 	uint32 startPos = 1024 * 1024;






More information about the Scummvm-git-logs mailing list