[Scummvm-git-logs] scummvm master -> 1a25abbd739bdeaa04d562d35c0e3d9336a317ed

[dreammaster]

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:
1a25abbd73 GRAPHICS: Apply eriktorbjorn's fix for non-origin transBlitFrom calls


Commit: 1a25abbd739bdeaa04d562d35c0e3d9336a317ed
    https://github.com/scummvm/scummvm/commit/1a25abbd739bdeaa04d562d35c0e3d9336a317ed
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-21T20:41:35-05:00

Commit Message:
GRAPHICS: Apply eriktorbjorn's fix for non-origin transBlitFrom calls

Changed paths:
    graphics/managed_surface.cpp


diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index fe52472..60b2941 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -256,7 +256,7 @@ void transBlit(const Surface &src, const Common::Rect &srcRect, Surface &dest, c
 	for (int destY = destRect.top, scaleYCtr = 0; destY < destRect.bottom; ++destY, scaleYCtr += scaleY) {
 		if (destY < 0 || destY >= dest.h)
 			continue;
-		const TSRC *srcLine = (const TSRC *)src.getBasePtr(0, scaleYCtr / SCALE_THRESHOLD);
+		const TSRC *srcLine = (const TSRC *)src.getBasePtr(srcRect.left, scaleYCtr / SCALE_THRESHOLD + srcRect.top);
 		TDEST *destLine = (TDEST *)dest.getBasePtr(destRect.left, destY);
 
 		// Loop through drawing the pixels of the row