[Scummvm-git-logs] scummvm master -> 1669ef624416f0bccc9524182538659457072993

[sev-]

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:
176109da59 GRAPHICS: Fix wrong rect size when blitting subsurface to ManagedSurface
1669ef6244 GRAPHICS: Fix ManagedSurface transBlitFrom ignoring flipped parameter


Commit: 176109da59c4358a9ef2f3903b024bf35d8bf2d0
    https://github.com/scummvm/scummvm/commit/176109da59c4358a9ef2f3903b024bf35d8bf2d0
Author: SupSuper (supsuper at gmail.com)
Date: 2019-07-14T00:46:30+02:00

Commit Message:
GRAPHICS: Fix wrong rect size when blitting subsurface to ManagedSurface

We want the srcRect size and not the original surface size

Changed paths:
    graphics/managed_surface.cpp


diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 8a2911b..2b4e702 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -250,7 +250,7 @@ void ManagedSurface::transBlitFrom(const Surface &src, const Common::Point &dest
 void ManagedSurface::transBlitFrom(const Surface &src, const Common::Rect &srcRect,
 		const Common::Point &destPos, uint transColor, bool flipped, uint overrideColor) {
 	transBlitFrom(src, srcRect, Common::Rect(destPos.x, destPos.y,
-		destPos.x + src.w, destPos.y + src.h), transColor, false, overrideColor);
+		destPos.x + srcRect.width(), destPos.y + srcRect.height()), transColor, false, overrideColor);
 }
 
 template<typename TSRC, typename TDEST>


Commit: 1669ef624416f0bccc9524182538659457072993
    https://github.com/scummvm/scummvm/commit/1669ef624416f0bccc9524182538659457072993
Author: SupSuper (supsuper at gmail.com)
Date: 2019-07-14T00:46:30+02:00

Commit Message:
GRAPHICS: Fix ManagedSurface transBlitFrom ignoring flipped parameter

Changed paths:
    graphics/managed_surface.cpp


diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 2b4e702..3124f8a 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -238,19 +238,19 @@ void ManagedSurface::blitFrom(const Surface &src, const Common::Rect &srcRect,
 
 void ManagedSurface::transBlitFrom(const Surface &src, uint transColor, bool flipped, uint overrideColor) {
 	transBlitFrom(src, Common::Rect(0, 0, src.w, src.h), Common::Rect(0, 0, this->w, this->h),
-		transColor, false, overrideColor);
+		transColor, flipped, overrideColor);
 }
 
 void ManagedSurface::transBlitFrom(const Surface &src, const Common::Point &destPos,
 		uint transColor, bool flipped, uint overrideColor) {
 	transBlitFrom(src, Common::Rect(0, 0, src.w, src.h), Common::Rect(destPos.x, destPos.y,
-		destPos.x + src.w, destPos.y + src.h), transColor, false, overrideColor);
+		destPos.x + src.w, destPos.y + src.h), transColor, flipped, overrideColor);
 }
 
 void ManagedSurface::transBlitFrom(const Surface &src, const Common::Rect &srcRect,
 		const Common::Point &destPos, uint transColor, bool flipped, uint overrideColor) {
 	transBlitFrom(src, srcRect, Common::Rect(destPos.x, destPos.y,
-		destPos.x + srcRect.width(), destPos.y + srcRect.height()), transColor, false, overrideColor);
+		destPos.x + srcRect.width(), destPos.y + srcRect.height()), transColor, flipped, overrideColor);
 }
 
 template<typename TSRC, typename TDEST>