[Scummvm-git-logs] scummvm master -> 6f1b1c8525b670fa856fa7888d4d3dfa9a09c3bc

ccawley2011 ccawley2011 at gmail.com
Mon Jun 15 16:00:19 UTC 2020 

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:
00e3c03755 ALL: Remove unnecessary graphics/colormasks.h includes
6f1b1c8525 GUI: Fix compilation when the event recorder is enabled


Commit: 00e3c0375532f132e0d500dc37d98a675aae4a02
    https://github.com/scummvm/scummvm/commit/00e3c0375532f132e0d500dc37d98a675aae4a02
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-15T16:59:34+01:00

Commit Message:
ALL: Remove unnecessary graphics/colormasks.h includes

Changed paths:
    backends/platform/wii/osystem.h
    backends/platform/wii/osystem_gfx.cpp
    engines/access/detection.cpp
    engines/glk/detection.cpp
    engines/hopkins/detection.cpp
    engines/mads/detection.cpp
    engines/petka/objects/object.cpp
    engines/petka/objects/object_bg.cpp
    engines/petka/objects/object_cursor.cpp
    engines/petka/q_system.cpp
    engines/sci/graphics/video32.cpp
    engines/titanic/detection.cpp
    engines/tony/detection.cpp
    engines/voyeur/detection.cpp
    engines/zvision/graphics/render_table.cpp
    engines/zvision/text/string_manager.cpp
    engines/zvision/text/text.cpp
    graphics/VectorRendererSpec.cpp
    gui/recorderdialog.cpp
    image/codecs/qtrle.cpp


diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 6481d61d15..c4e8959e5d 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -33,7 +33,6 @@
 #include "common/rect.h"
 #include "common/events.h"
 #include "backends/base-backend.h"
-#include "graphics/colormasks.h"
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 #include "audio/mixer_intern.h"
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 621f45cd99..2431cd3b7c 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -28,6 +28,7 @@
 #include <gxflux/gfx_con.h>
 
 #include "common/config-manager.h"
+#include "graphics/colormasks.h"
 #include "graphics/conversion.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 30ca3c0e37..9a51ed2e17 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -30,7 +30,6 @@
 #include "common/memstream.h"
 #include "engines/advancedDetector.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #define MAX_SAVES 99
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index e3271966e9..53919f2e0a 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -63,7 +63,6 @@
 #include "common/savefile.h"
 #include "common/str-array.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "common/config-manager.h"
 #include "common/file.h"
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 81a3c0c2c0..9e8fb5b90c 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -29,7 +29,6 @@
 #include "engines/advancedDetector.h"
 #include "common/system.h"
 #include "common/translation.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #define MAX_SAVES 99
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index fe65446cac..d5d7415c10 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -30,7 +30,6 @@
 #include "engines/advancedDetector.h"
 #include "common/system.h"
 #include "common/translation.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "mads/events.h"
 #include "mads/game.h"
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 8876d791ca..6b3ef0d3d2 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -25,7 +25,6 @@
 #include "common/system.h"
 #include "common/events.h"
 
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #include "petka/big_dialogue.h"
diff --git a/engines/petka/objects/object_bg.cpp b/engines/petka/objects/object_bg.cpp
index 1555e30fe5..846fd5fa77 100644
--- a/engines/petka/objects/object_bg.cpp
+++ b/engines/petka/objects/object_bg.cpp
@@ -25,7 +25,6 @@
 #include "common/system.h"
 #include "common/events.h"
 
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #include "petka/flc.h"
diff --git a/engines/petka/objects/object_cursor.cpp b/engines/petka/objects/object_cursor.cpp
index 4826512857..13c0a82edf 100644
--- a/engines/petka/objects/object_cursor.cpp
+++ b/engines/petka/objects/object_cursor.cpp
@@ -25,7 +25,6 @@
 #include "common/system.h"
 #include "common/events.h"
 
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #include "petka/flc.h"
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 4a47530f3b..11e8eb1541 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -24,8 +24,6 @@
 #include "common/substream.h"
 #include "common/system.h"
 
-#include "graphics/colormasks.h"
-
 #include "petka/petka.h"
 #include "petka/interfaces/startup.h"
 #include "petka/interfaces/main.h"
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 6d4e321a08..6b8f9e54b5 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -29,7 +29,6 @@
 #include "common/util.h"                 // for ARRAYSIZE
 #include "common/system.h"               // for g_system
 #include "engines/engine.h"              // for Engine, g_engine
-#include "graphics/colormasks.h"         // for createPixelFormat
 #include "graphics/palette.h"            // for PaletteManager
 #include "graphics/transparent_surface.h" // for TransparentSurface
 #include "sci/console.h"                 // for Console
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index 9288b1bc34..66cd05f0cf 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -30,7 +30,6 @@
 #include "common/memstream.h"
 #include "engines/advancedDetector.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 namespace Titanic {
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 5366e2e6f9..a694035a86 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -25,7 +25,6 @@
 #include "common/memstream.h"
 #include "engines/advancedDetector.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #include "tony/tony.h"
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 782f8c1a1a..5692efd242 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -28,7 +28,6 @@
 #include "common/memstream.h"
 #include "engines/advancedDetector.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 #define MAX_SAVES 99
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index 96c2c41572..a6de42cb1b 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -25,7 +25,6 @@
 #include "common/math.h"
 #include "common/rect.h"
 #include "common/scummsys.h"
-#include "graphics/colormasks.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index c62e18f4b0..59f8bfc92d 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -25,7 +25,6 @@
 #include "common/tokenizer.h"
 #include "common/debug.h"
 #include "graphics/fontman.h"
-#include "graphics/colormasks.h"
 
 #include "zvision/zvision.h"
 #include "zvision/file/search_manager.h"
diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp
index 38ae6c57a7..2e4de8bb78 100644
--- a/engines/zvision/text/text.cpp
+++ b/engines/zvision/text/text.cpp
@@ -26,7 +26,6 @@
 #include "common/debug.h"
 #include "common/rect.h"
 #include "graphics/fontman.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index cec3980ed4..06ce7c271d 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -27,7 +27,6 @@
 #include "graphics/surface.h"
 #include "graphics/transparent_surface.h"
 #include "graphics/nine_patch.h"
-#include "graphics/colormasks.h"
 
 #include "gui/ThemeEngine.h"
 #include "graphics/VectorRenderer.h"
diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index ab0ce348b1..97149609cd 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -24,7 +24,6 @@
 #include "common/bufferedstream.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "graphics/colormasks.h"
 #include "graphics/palette.h"
 #include "graphics/scaler.h"
 #include "graphics/thumbnail.h"
diff --git a/image/codecs/qtrle.cpp b/image/codecs/qtrle.cpp
index 700e2e1756..8b5dcb1727 100644
--- a/image/codecs/qtrle.cpp
+++ b/image/codecs/qtrle.cpp
@@ -30,7 +30,6 @@
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/textconsole.h"
-#include "graphics/colormasks.h"
 #include "graphics/surface.h"
 
 namespace Image {


Commit: 6f1b1c8525b670fa856fa7888d4d3dfa9a09c3bc
    https://github.com/scummvm/scummvm/commit/6f1b1c8525b670fa856fa7888d4d3dfa9a09c3bc
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-06-15T16:59:56+01:00

Commit Message:
GUI: Fix compilation when the event recorder is enabled

Changed paths:
    gui/recorderdialog.cpp


diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index 97149609cd..62999ca3b6 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -94,7 +94,7 @@ void RecorderDialog::reflowLayout() {
 
 	if (g_gui.xmlEval()->getVar("Globals.RecorderDialog.ExtInfo.Visible") == 1) {
 		int16 x, y;
-		uint16 w, h;
+		int16 w, h;
 
 		if (!g_gui.xmlEval()->getWidgetData("RecorderDialog.Thumbnail", x, y, w, h)) {
 			error("Error when loading position data for Recorder Thumbnails");

More information about the Scummvm-git-logs mailing list