[Scummvm-cvs-logs] scummvm master -> 1fa74e355cd95c0daec2c8fa0981668aa6446a8b

lordhoto lordhoto at gmail.com
Wed Jan 22 17:34:03 CET 2014


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:
1fa74e355c WINTERMUTE: Two minor formatting fixes.


Commit: 1fa74e355cd95c0daec2c8fa0981668aa6446a8b
    https://github.com/scummvm/scummvm/commit/1fa74e355cd95c0daec2c8fa0981668aa6446a8b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-22T08:33:04-08:00

Commit Message:
WINTERMUTE: Two minor formatting fixes.

Changed paths:
    engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
    engines/wintermute/video/video_theora_player.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 73797f2..c33e8ba 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -448,8 +448,8 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect,
 bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAlpha) {
 	_loaded = true;
 	if (surface.format == _surface->format && surface.w == _surface->w && surface.h == _surface->h) {
-		const byte *src = (const byte*) surface.getBasePtr(0, 0);
-		byte *dst = (byte*) _surface->getBasePtr(0, 0);
+		const byte *src = (const byte *)surface.getBasePtr(0, 0);
+		byte *dst = (byte *)_surface->getBasePtr(0, 0);
 		memcpy(dst, src, surface.pitch * surface.h);
 	} else {
 		_surface->free();
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index aedc9bf..299b64f 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -306,8 +306,8 @@ bool VideoTheoraPlayer::update() {
 				const Graphics::Surface *decodedFrame = _theoraDecoder->decodeNextFrame();
 				if (decodedFrame) {
 					if (decodedFrame->format == _surface.format && decodedFrame->w == _surface.w && decodedFrame->h == _surface.h) {
-						const byte *src = (const byte*) decodedFrame->getBasePtr(0, 0);
-						byte *dst = (byte*) _surface.getBasePtr(0, 0);
+						const byte *src = (const byte *)decodedFrame->getBasePtr(0, 0);
+						byte *dst = (byte *)_surface.getBasePtr(0, 0);
 						memcpy(dst, src, _surface.pitch * _surface.h);
 					} else {
 						_surface.free();






More information about the Scummvm-git-logs mailing list