[Scummvm-git-logs] scummvm master -> cccf0925446b60e4c319afe0faff294fe2c3d0f0

[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:
cccf092544 GLK: COMPREHEND: Fix dumping in-progress rendering display when enabled


Commit: cccf0925446b60e4c319afe0faff294fe2c3d0f0
    https://github.com/scummvm/scummvm/commit/cccf0925446b60e4c319afe0faff294fe2c3d0f0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-03T21:26:11-08:00

Commit Message:
GLK: COMPREHEND: Fix dumping in-progress rendering display when enabled

Changed paths:
    engines/glk/comprehend/draw_surface.cpp
    engines/glk/comprehend/draw_surface.h
    engines/glk/comprehend/pics.cpp


diff --git a/engines/glk/comprehend/draw_surface.cpp b/engines/glk/comprehend/draw_surface.cpp
index 5d80b46f13..fe62a7114d 100644
--- a/engines/glk/comprehend/draw_surface.cpp
+++ b/engines/glk/comprehend/draw_surface.cpp
@@ -391,13 +391,11 @@ bool FloodFillSurface::isPixelWhite(int16 x, int16 y) const {
 	}
 }
 
-#define SCALE 4
-
 void FloodFillSurface::dumpToScreen() {
-	Graphics::ManagedSurface s(w * SCALE, h * SCALE, format);
-	s.transBlitFrom(*this, Common::Rect(0, 0, w, h), Common::Rect(0, 0, w * SCALE,h * SCALE), 0x888888);
-	g_system->copyRectToScreen(s.getPixels(), s.pitch, 0, 0,
-		MIN(s.w, (uint16)g_system->getWidth()), MIN(s.h, (uint16)g_system->getHeight()));
+	Graphics::ManagedSurface s(w * 2, h * 2, g_system->getScreenFormat());
+	s.transBlitFrom(*this, Common::Rect(0, 0, w, h), Common::Rect(0, 0, w * 2, h * 2), 0x888888);
+
+	g_system->copyRectToScreen(s.getPixels(), s.pitch, 0, 0, w * 2, h * 2);
 	g_system->updateScreen();
 }
 
diff --git a/engines/glk/comprehend/draw_surface.h b/engines/glk/comprehend/draw_surface.h
index 88d0bdc42e..59c78a12fe 100644
--- a/engines/glk/comprehend/draw_surface.h
+++ b/engines/glk/comprehend/draw_surface.h
@@ -114,9 +114,10 @@ private:
 	bool isPixelWhite(int16 x, int16 y) const;
 
 	void floodFillRow(int16 x, int16 y, uint32 fillColor);
-	void dumpToScreen();
 public:
 	void floodFill(int16 x, int16 y, uint32 fillColor);
+
+	void dumpToScreen();
 };
 
 class DrawSurface : public FloodFillSurface {
diff --git a/engines/glk/comprehend/pics.cpp b/engines/glk/comprehend/pics.cpp
index c64060c23a..4a3916e7f3 100644
--- a/engines/glk/comprehend/pics.cpp
+++ b/engines/glk/comprehend/pics.cpp
@@ -255,6 +255,8 @@ bool Pics::ImageFile::doImageOp(Pics::ImageContext *ctx) const {
 		break;
 	}
 
+	//ctx->_drawSurface->dumpToScreen();
+
 	return false;
 }