[Scummvm-git-logs] scummvm master -> 89123110d260cabf46f68f65fdec4d20eb933969

[sev-]

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:
770d8b0b92 NDS: Fix compilation
89123110d2 GRIM: Fix compilation on some systems


Commit: 770d8b0b92d99ff33ddc00c2ad9c294f001bc868
    https://github.com/scummvm/scummvm/commit/770d8b0b92d99ff33ddc00c2ad9c294f001bc868
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T02:03:34+02:00

Commit Message:
NDS: Fix compilation

Changed paths:
    backends/platform/ds/arm9/source/osystem_ds.cpp
    backends/platform/ds/arm9/source/osystem_ds.h


diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 3e80c8b6b8..0a4f054ebf 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -42,6 +42,7 @@
 #include "common/str.h"
 #include "cdaudio.h"
 #include "graphics/surface.h"
+#include "graphics/pixelbuffer.h"
 #include "touchkeyboard.h"
 #include "backends/fs/ds/ds-fs-factory.h"
 
@@ -162,6 +163,10 @@ bool OSystem_DS::getFeatureState(Feature f) {
 	return false;
 }
 
+Graphics::PixelBuffer OSystem_DS::getScreenPixelBuffer() {
+	return Graphics::PixelBuffer();
+}
+
 void OSystem_DS::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	// For Lost in Time, the title screen is displayed in 640x400.
 	// In order to support this game, the screen mode is set, but
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 052790395b..c61842181b 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -88,6 +88,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);


Commit: 89123110d260cabf46f68f65fdec4d20eb933969
    https://github.com/scummvm/scummvm/commit/89123110d260cabf46f68f65fdec4d20eb933969
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-10T02:05:25+02:00

Commit Message:
GRIM: Fix compilation on some systems

Changed paths:
    engines/grim/grim.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 9be85c49b0..1f955e022c 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -24,6 +24,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_fgetc
 #define FORBIDDEN_SYMBOL_EXCEPTION_stderr
 #define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
 
 #include "common/archive.h"
 #include "common/debug-channels.h"
@@ -186,8 +187,8 @@ GrimEngine::GrimEngine(OSystem *syst, uint32 gameFlags, GrimGameType gameType, C
 	SearchMan.addSubDirectoryMatching(gameDataDir, "widescreen");
 
 	Debug::registerDebugChannels();
-	
-	
+
+
 	//Remastered:
 	if (getGameFlags() & ADGF_REMASTERED) {
 		for (int i = 0; i < kNumCutscenes; i++) {
@@ -196,7 +197,7 @@ GrimEngine::GrimEngine(OSystem *syst, uint32 gameFlags, GrimGameType gameType, C
 		for (int i = 0; i < kNumConcepts; i++) {
 			_conceptEnabled[i] = false;
 		}
-		
+
 		_saveMeta1 = "";
 		_saveMeta2 = 0;
 		_saveMeta3 = "";
@@ -620,7 +621,7 @@ Common::KeymapArray GrimEngine::initKeymapsEMI(const char *target) {
 
 void GrimEngine::playAspyrLogo() {
 	// A trimmed down version of the code found in mainloop
-	// for the purpose of playing the Aspyr-logo. 
+	// for the purpose of playing the Aspyr-logo.
 	// The reason for this, is that the logo needs a different
 	// codec than all the other videos (which are Bink).
 	// Code is provided to keep within the fps-limit, as well as to
@@ -1698,7 +1699,7 @@ void GrimEngine::enableConcept(uint32 number) {
 	assert (number < kNumConcepts);
 	_conceptEnabled[number] = true;
 }
-	
+
 bool GrimEngine::isCutsceneEnabled(uint32 number) const {
 	assert (number < kNumCutscenes);
 	return _cutsceneEnabled[number];