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

m-kiewitz m_kiewitz at users.sourceforge.net
Fri Jun 12 13:30:26 CEST 2015


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:
b668b1edd7 SHERLOCK: 3DO: fix setPixels() for RGB565


Commit: b668b1edd724b8c281edacb68665cd037c5d9bd2
    https://github.com/scummvm/scummvm/commit/b668b1edd724b8c281edacb68665cd037c5d9bd2
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-12T13:30:16+02:00

Commit Message:
SHERLOCK: 3DO: fix setPixels() for RGB565

Changed paths:
    engines/sherlock/surface.cpp



diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 8f3690b..48045be 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -270,8 +270,9 @@ void Surface::free() {
 
 void Surface::setPixels(byte *pixels, int width, int height, Graphics::PixelFormat pixelFormat) {
 	_surface.format = pixelFormat;
-	_surface.w = _surface.pitch = width;
+	_surface.w = width;
 	_surface.h = height;
+	_surface.pitch = width * pixelFormat.bytesPerPixel;
 	_surface.setPixels(pixels);
 }
 






More information about the Scummvm-git-logs mailing list