[Scummvm-git-logs] scummvm master -> 385d8ad997ee623a9209fc509c876b289aa32136

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
806ab17c1a IPHONE: Fix compilation
6b15c6102b WII: Fix compilation
385d8ad997 N64: Fix compilation


Commit: 806ab17c1ad28f1f528b809463ed930b8ce0ba68
    https://github.com/scummvm/scummvm/commit/806ab17c1ad28f1f528b809463ed930b8ce0ba68
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T00:13:35+02:00

Commit Message:
IPHONE: Fix compilation

Changed paths:
    backends/platform/iphone/osys_main.h
    backends/platform/iphone/osys_video.mm


diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index a5755062bf..e737c96178 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -130,6 +130,7 @@ public:
 
 	virtual void beginGFXTransaction();
 	virtual TransactionError endGFXTransaction();
+	virtual Graphics::PixelBuffer getScreenPixelBuffer();
 
 	virtual int16 getHeight();
 	virtual int16 getWidth();
diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
index 07fc93ce8d..22b5081850 100644
--- a/backends/platform/iphone/osys_video.mm
+++ b/backends/platform/iphone/osys_video.mm
@@ -27,6 +27,7 @@
 #include "backends/platform/iphone/iphone_video.h"
 
 #include "graphics/conversion.h"
+#include "graphics/pixelbuffer.h"
 
 void OSystem_IPHONE::engineInit() {
 	EventsBaseBackend::engineInit();
@@ -137,6 +138,10 @@ OSystem::TransactionError OSystem_IPHONE::endGFXTransaction() {
 	return _gfxTransactionError;
 }
 
+Graphics::PixelBuffer OSystem_IPHONE::getScreenPixelBuffer() {
+	return Graphics::PixelBuffer();
+}
+
 void OSystem_IPHONE::updateOutputSurface() {
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
 }


Commit: 6b15c6102be4d9cbd9f0e3a0dff9fc560ea9e26a
    https://github.com/scummvm/scummvm/commit/6b15c6102be4d9cbd9f0e3a0dff9fc560ea9e26a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T00:16:40+02:00

Commit Message:
WII: Fix compilation

Changed paths:
    backends/platform/wii/osystem.h
    backends/platform/wii/osystem_gfx.cpp


diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 350a3f45a0..90520b7d5e 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -166,6 +166,8 @@ protected:
 	virtual void setPalette(const byte *colors, uint start, uint num);
 	virtual void grabPalette(byte *colors, uint start, uint num) const;
 public:
+	virtual Graphics::PixelBuffer getScreenPixelBuffer();
+
 	virtual void setCursorPalette(const byte *colors, uint start, uint num);
 	virtual void copyRectToScreen(const void *buf, int pitch, int x, int y,
 									int w, int h);
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 6a7adce3dd..d1e7e0c434 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -29,6 +29,7 @@
 
 #include "common/config-manager.h"
 #include "graphics/conversion.h"
+#include "graphics/pixelbuffer.h"
 #include "backends/fs/wii/wii-fs-factory.h"
 
 #include "osystem.h"
@@ -374,6 +375,10 @@ void OSystem_Wii::grabPalette(byte *colors, uint start, uint num) const {
 	}
 }
 
+Graphics::PixelBuffer OSystem_Wii::getScreenPixelBuffer() {
+	return Graphics::PixelBuffer();
+}
+
 void OSystem_Wii::setCursorPalette(const byte *colors, uint start, uint num) {
 	if (!_texMouse.palette) {
 		printf("switching to palette based cursor\n");


Commit: 385d8ad997ee623a9209fc509c876b289aa32136
    https://github.com/scummvm/scummvm/commit/385d8ad997ee623a9209fc509c876b289aa32136
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T00:18:06+02:00

Commit Message:
N64: Fix compilation

Changed paths:
    backends/platform/n64/osys_n64.h
    backends/platform/n64/osys_n64_base.cpp


diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 40e7e3b33e..f29a140ca9 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -153,6 +153,7 @@ public:
 	virtual int16 getWidth();
 
 	virtual PaletteManager *getPaletteManager() { return this; }
+	virtual Graphics::PixelBuffer getScreenPixelBuffer();
 protected:
 	// PaletteManager API
 	virtual void setPalette(const byte *colors, uint start, uint num);
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 277cc1ff18..ef9278c8ba 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -32,6 +32,7 @@
 #include "backends/fs/n64/n64-fs-factory.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
+#include "graphics/pixelbuffer.h"
 
 typedef unsigned long long uint64;
 
@@ -220,6 +221,9 @@ const OSystem::GraphicsMode* OSystem_N64::getSupportedGraphicsModes() const {
 	return s_supportedGraphicsModes;
 }
 
+Graphics::PixelBuffer OSystem_N64::getScreenPixelBuffer() {
+	return Graphics::PixelBuffer();
+}
 
 int OSystem_N64::getDefaultGraphicsMode() const {
 	return OVERS_NTSC_340X240;