[Scummvm-cvs-logs] scummvm master -> cd595cb0ea65b5bd8b79cb7af35457d032d82e98

[wjp]

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:
5791f600e9 ZVISION: Fix TGZ images on BE systems
cd595cb0ea ZVISION: Fix cursors on BE systems


Commit: 5791f600e9b9808714b40a63acd09b5657c855f5
    https://github.com/scummvm/scummvm/commit/5791f600e9b9808714b40a63acd09b5657c855f5
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-27T23:35:35+01:00

Commit Message:
ZVISION: Fix TGZ images on BE systems

Changed paths:
    engines/zvision/graphics/render_manager.cpp



diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 4f26123..a178c97 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -209,13 +209,17 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
 		isTGZ = true;
 
 		// TGZ files have a header and then Bitmap data that is compressed with LZSS
-		uint32 decompressedSize = file.readSint32LE();
+		uint32 decompressedSize = file.readSint32LE() / 2;
 		imageWidth = file.readSint32LE();
 		imageHeight = file.readSint32LE();
 
 		LzssReadStream lzssStream(&file);
 		buffer = (uint16 *)(new uint16[decompressedSize]);
-		lzssStream.read(buffer, decompressedSize);
+		lzssStream.read(buffer, 2 * decompressedSize);
+#ifndef SCUMMVM_LITTLE_ENDIAN
+		for (uint32 i = 0; i < decompressedSize; ++i)
+			buffer[i] = FROM_LE_16(buffer[i]);
+#endif
 	} else {
 		isTGZ = false;
 


Commit: cd595cb0ea65b5bd8b79cb7af35457d032d82e98
    https://github.com/scummvm/scummvm/commit/cd595cb0ea65b5bd8b79cb7af35457d032d82e98
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-12-27T23:35:47+01:00

Commit Message:
ZVISION: Fix cursors on BE systems

Changed paths:
    engines/zvision/graphics/cursors/cursor.cpp



diff --git a/engines/zvision/graphics/cursors/cursor.cpp b/engines/zvision/graphics/cursors/cursor.cpp
index eb25e92..1b471d8 100644
--- a/engines/zvision/graphics/cursors/cursor.cpp
+++ b/engines/zvision/graphics/cursors/cursor.cpp
@@ -60,6 +60,12 @@ ZorkCursor::ZorkCursor(ZVision *engine, const Common::String &fileName)
 	_surface.create(_width, _height, engine->_resourcePixelFormat);
 	uint32 bytesRead = file.read(_surface.getPixels(), dataSize);
 	assert(bytesRead == dataSize);
+
+#ifndef SCUMMVM_LITTLE_ENDIAN
+	int16 *buffer = (int16 *)_surface.getPixels();
+	for (uint32 i = 0; i < dataSize / 2; ++i)
+		buffer[i] = FROM_LE_16(buffer[i]);
+#endif
 }
 
 ZorkCursor::ZorkCursor(const ZorkCursor &other) {