From 2ad7625831897d97524891cb88af8b3e48e4facb Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Wed, 5 Feb 2014 17:18:18 +0100 Subject: WINTERMUTE: Change the copyFrom-simplifications to depend on pitch instead of width. (Fix bug #6157) --- engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/wintermute/base/gfx') diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index c33e8ba54b..cbc32387e1 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); -- cgit v1.2.3