[Scummvm-cvs-logs] scummvm master -> c44d6ae60cfd1d06d2431918fb74c9ba1bfeb32e

eriktorbjorn eriktorbjorn at telia.com
Fri Jul 19 21:14:31 CEST 2013


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:
c44d6ae60c TONY: Fix parameter to RMGfxSourceBuffer8RLEWordAA::init()


Commit: c44d6ae60cfd1d06d2431918fb74c9ba1bfeb32e
    https://github.com/scummvm/scummvm/commit/c44d6ae60cfd1d06d2431918fb74c9ba1bfeb32e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-07-19T12:10:50-07:00

Commit Message:
TONY: Fix parameter to RMGfxSourceBuffer8RLEWordAA::init()

The method it is meant to override uses "const byte *buf" so this
one should too. I don't know if/when it's called, but fuzzie tells
me it should be a harmless change. Hopefully fixes CID 1003892.

Changed paths:
    engines/tony/gfxcore.cpp
    engines/tony/gfxcore.h



diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index dc82c78..d500262 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -1865,7 +1865,8 @@ void RMGfxSourceBuffer8RLEWordAA::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RM
 	CORO_END_CODE;
 }
 
-int RMGfxSourceBuffer8RLEWordAA::init(byte *buf, int dimx, int dimy, bool bLoadPalette) {
+int RMGfxSourceBuffer8RLEWordAA::init(const byte *buf, int dimx, int dimy, bool bLoadPalette) {
+  debug("Hello!!!");
 	return RMGfxSourceBuffer8RLE::init(buf, dimx, dimy, bLoadPalette);
 }
 
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index 1bacf7e..2548968 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -408,7 +408,7 @@ public:
 
 	// Overloaded initialization methods
 	virtual void init(Common::ReadStream &ds, int dimx, int dimy, bool bLoadPalette = false);
-	virtual int init(byte *buf, int dimx, int dimy, bool bLoadPalette = false);
+	virtual int init(const byte *buf, int dimx, int dimy, bool bLoadPalette = false);
 
 	virtual ~RMGfxSourceBuffer8RLEWordAA();
 };






More information about the Scummvm-git-logs mailing list