[Scummvm-cvs-logs] scummvm master -> 40b085c905473a5549eb0edb204b5d5f53e53e7c

[lordhoto]

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:
76a5580930 TIZEN: fix compile errors
40b085c905 Merge pull request #451 from chrisws/branch-1-6-1


Commit: 76a5580930b79007612d466c8d1e58e9b0263399
    https://github.com/scummvm/scummvm/commit/76a5580930b79007612d466c8d1e58e9b0263399
Author: Chris Warren-Smith (cwarrensmith at gmail.com)
Date: 2014-03-23T20:30:47+10:00

Commit Message:
TIZEN: fix compile errors

Changed paths:
    backends/platform/tizen/system.cpp
    backends/platform/tizen/system.h



diff --git a/backends/platform/tizen/system.cpp b/backends/platform/tizen/system.cpp
index 585eb20..a235456 100644
--- a/backends/platform/tizen/system.cpp
+++ b/backends/platform/tizen/system.cpp
@@ -266,8 +266,8 @@ result TizenSystem::initModules() {
 		return E_OUT_OF_MEMORY;
 	}
 
-	_graphicsManager = (GraphicsManager *)new TizenGraphicsManager(_appForm);
-	if (!_graphicsManager || graphicsManager->Construct() != E_SUCCESS) {
+	_graphicsManager = new TizenGraphicsManager(_appForm);
+	if (!_graphicsManager || getGraphics()->Construct() != E_SUCCESS) {
 		return E_OUT_OF_MEMORY;
 	}
 
diff --git a/backends/platform/tizen/system.h b/backends/platform/tizen/system.h
index 1974055..3f668ba 100644
--- a/backends/platform/tizen/system.h
+++ b/backends/platform/tizen/system.h
@@ -73,7 +73,7 @@ public:
 	bool isClosing() { return _appForm->isClosing(); }
 
 	TizenGraphicsManager *getGraphics() {
-		return (TizenGraphicsManager *)_graphicsManager;
+		return dynamic_cast<TizenGraphicsManager *>(_graphicsManager);
 	}
 
 private:


Commit: 40b085c905473a5549eb0edb204b5d5f53e53e7c
    https://github.com/scummvm/scummvm/commit/40b085c905473a5549eb0edb204b5d5f53e53e7c
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-03-23T18:39:38+01:00

Commit Message:
Merge pull request #451 from chrisws/branch-1-6-1

TIZEN: fix compile errors

Changed paths:
    backends/platform/tizen/system.cpp
    backends/platform/tizen/system.h