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.cpp | |
| 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.cpp')
| -rw-r--r-- | engines/sword25/gfx/opengl/glimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp index 80a822adcc..54d660aa7f 100644 --- a/engines/sword25/gfx/opengl/glimage.cpp +++ b/engines/sword25/gfx/opengl/glimage.cpp @@ -50,7 +50,7 @@ namespace Sword25 { // CONSTRUCTION / DESTRUCTION // ----------------------------------------------------------------------------- -BS_GLImage::BS_GLImage(const std::string & Filename, bool & Result) : +BS_GLImage::BS_GLImage(const Common::String & Filename, bool & Result) : m_Sprite(0), m_Width(0), m_Height(0) @@ -148,7 +148,7 @@ bool BS_GLImage::Fill(const BS_Rect* pFillRect, unsigned int Color) // ----------------------------------------------------------------------------- -bool BS_GLImage::SetContent(const std::vector<unsigned char> & Pixeldata, unsigned int Offset, unsigned int Stride) +bool BS_GLImage::SetContent(const byte *Pixeldata, unsigned int Offset, unsigned int Stride) { // Überprüfen, ob PixelData ausreichend viele Pixel enthält um ein Bild der Größe Width * Height zu erzeugen if (Pixeldata.size() < static_cast<unsigned int>(m_Width * m_Height * 4)) |