diff options
| author | Eugene Sandulenko | 2010-08-06 10:59:50 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:30:57 +0000 |
| commit | a17ec87b7dd09e7b251a3f578d1f788917550451 (patch) | |
| tree | c77bdbb06d39d9a200b5e0514d2aedc7f43c8e28 /engines/sword25/gfx/opengl/glimage.h | |
| parent | 6dcf9f0ee557e692df3c70a263ca35068ff45380 (diff) | |
| download | scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.tar.gz scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.tar.bz2 scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.zip | |
SWORD25: Number of compilation and warning fixes
svn-id: r53219
Diffstat (limited to 'engines/sword25/gfx/opengl/glimage.h')
| -rw-r--r-- | engines/sword25/gfx/opengl/glimage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/gfx/opengl/glimage.h b/engines/sword25/gfx/opengl/glimage.h index 62f84ef3cf..ae94473778 100644 --- a/engines/sword25/gfx/opengl/glimage.h +++ b/engines/sword25/gfx/opengl/glimage.h @@ -60,7 +60,7 @@ typedef void * GLS_Sprite; class BS_GLImage : public BS_Image { public: - BS_GLImage(const std::string & Filename, bool & Result); + BS_GLImage(const Common::String & Filename, bool & Result); /** @brief Erzeugt ein leeres BS_GLImage @@ -83,7 +83,7 @@ public: unsigned int Color = BS_ARGB(255, 255, 255, 255), int Width = -1, int Height = -1); virtual bool Fill(const BS_Rect* pFillRect, unsigned int Color); - virtual bool SetContent(const std::vector<unsigned char> & Pixeldata, unsigned int Offset = 0, unsigned int Stride = 0); + virtual bool SetContent(const byte *Pixeldata, unsigned int Offset = 0, unsigned int Stride = 0); virtual unsigned int GetPixel(int X, int Y); virtual bool IsBlitSource() const { return true; } |