[Scummvm-cvs-logs] scummvm master -> 2ad7625831897d97524891cb88af8b3e48e4facb

somaen einarjohants at gmail.com
Wed Feb 5 17:19:56 CET 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:
2ad7625831 WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157)


Commit: 2ad7625831897d97524891cb88af8b3e48e4facb
    https://github.com/scummvm/scummvm/commit/2ad7625831897d97524891cb88af8b3e48e4facb
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-02-05T08:18:46-08:00

Commit Message:
WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157)

Changed paths:
    engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
    engines/wintermute/video/video_theora_player.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index c33e8ba..cbc3238 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -447,7 +447,7 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect,
 
 bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAlpha) {
 	_loaded = true;
-	if (surface.format == _surface->format && surface.w == _surface->w && surface.h == _surface->h) {
+	if (surface.format == _surface->format && surface.pitch == _surface->pitch && surface.h == _surface->h) {
 		const byte *src = (const byte *)surface.getBasePtr(0, 0);
 		byte *dst = (byte *)_surface->getBasePtr(0, 0);
 		memcpy(dst, src, surface.pitch * surface.h);
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 299b64f..3bce862 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -305,7 +305,7 @@ bool VideoTheoraPlayer::update() {
 			if (!_theoraDecoder->endOfVideo() && _theoraDecoder->getTimeToNextFrame() == 0) {
 				const Graphics::Surface *decodedFrame = _theoraDecoder->decodeNextFrame();
 				if (decodedFrame) {
-					if (decodedFrame->format == _surface.format && decodedFrame->w == _surface.w && decodedFrame->h == _surface.h) {
+					if (decodedFrame->format == _surface.format && decodedFrame->pitch == _surface.pitch && decodedFrame->h == _surface.h) {
 						const byte *src = (const byte *)decodedFrame->getBasePtr(0, 0);
 						byte *dst = (byte *)_surface.getBasePtr(0, 0);
 						memcpy(dst, src, _surface.pitch * _surface.h);






More information about the Scummvm-git-logs mailing list