[Scummvm-git-logs] scummvm master -> 18b4f15eb90fb84137f8811d393b043f75b72843

[ccawley2011]

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:
18b4f15eb9 ANDROID3D: Fix compilation


Commit: 18b4f15eb90fb84137f8811d393b043f75b72843
    https://github.com/scummvm/scummvm/commit/18b4f15eb90fb84137f8811d393b043f75b72843
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-24T23:51:55+01:00

Commit Message:
ANDROID3D: Fix compilation

Changed paths:
    backends/platform/android3d/graphics.cpp


diff --git a/backends/platform/android3d/graphics.cpp b/backends/platform/android3d/graphics.cpp
index 148e719a9a..938459ded2 100644
--- a/backends/platform/android3d/graphics.cpp
+++ b/backends/platform/android3d/graphics.cpp
@@ -335,8 +335,6 @@ void AndroidGraphicsManager::clearOverlay() {
 }
 
 void AndroidGraphicsManager::grabOverlay(Graphics::Surface &surface) const {
-	ENTER("%p, %d", buf, pitch);
-
 	GLTHREADCHECK;
 
 	const Graphics::Surface *overlaySurface = _overlay_texture->surface_const();
@@ -348,7 +346,7 @@ void AndroidGraphicsManager::grabOverlay(Graphics::Surface &surface) const {
 
 	const byte *src = (const byte *)overlaySurface->getPixels();
 	byte *dst = (byte *)surface.getPixels();
-	Graphics::copyBlit(dst, src, surface.pitch, overlaySurface->pitch, w, h, sizeof(uint16));
+	Graphics::copyBlit(dst, src, surface.pitch, overlaySurface->pitch, surface.w, surface.h, sizeof(uint16));
 }
 
 void AndroidGraphicsManager::copyRectToOverlay(const void *buf, int pitch,