[Scummvm-git-logs] scummvm master -> 982c8f4eeb132f2e20ff9af1d71b0f3de6477bb5

[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:
982c8f4eeb GRAPHICS: Allow 32-bit fast blitting when formats match in ManagedSurface


Commit: 982c8f4eeb132f2e20ff9af1d71b0f3de6477bb5
    https://github.com/scummvm/scummvm/commit/982c8f4eeb132f2e20ff9af1d71b0f3de6477bb5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-23T19:51:44-05:00

Commit Message:
GRAPHICS: Allow 32-bit fast blitting when formats match in ManagedSurface

Changed paths:
    graphics/managed_surface.cpp



diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 0b29b19..e2d87b6 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -185,8 +185,8 @@ void ManagedSurface::blitFrom(const Surface &src, const Common::Rect &srcRect,
 		const byte *srcP = (const byte *)src.getBasePtr(srcBounds.left, srcBounds.top + y);
 		byte *destP = (byte *)getBasePtr(destBounds.left, destBounds.top + y);
 
-		if (src.format == format && format.bytesPerPixel <= 2) {
-			// Matching 8-bit or 16-bit surfaces (no alpha), so we can do a straight copy
+		if (src.format == format) {
+			// Matching surface formats, so we can do a straight copy
 			Common::copy(srcP, srcP + srcBounds.width() * format.bytesPerPixel, destP);
 		} else {
 			for (int x = 0; x < srcBounds.width(); ++x,