diff options
| author | Eugene Sandulenko | 2010-08-10 12:16:31 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:38:23 +0000 |
| commit | ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e (patch) | |
| tree | 8e2591e31c02ba29ad6c6927fbf1a0a4292973e0 /engines/sword25/gfx/opengl/glimage.cpp | |
| parent | ab85540a1bb59d7f69b89868805d1fe2a2adc89c (diff) | |
| download | scummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.tar.gz scummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.tar.bz2 scummvm-rg350-ad5b74c9de1eb3d6eda91e1bf21b24c87a78391e.zip | |
SWORD25: Clean compile!
Under MinGW, with OpenGL and tinyxml.
svn-id: r53225
Diffstat (limited to 'engines/sword25/gfx/opengl/glimage.cpp')
| -rw-r--r-- | engines/sword25/gfx/opengl/glimage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp index 1434a93e4e..d5e1376299 100644 --- a/engines/sword25/gfx/opengl/glimage.cpp +++ b/engines/sword25/gfx/opengl/glimage.cpp @@ -36,7 +36,6 @@ // INCLUDES // ----------------------------------------------------------------------------- -#include "sword25/util/glsprites/glsprites.h" #include "sword25/package/packagemanager.h" #include "sword25/gfx/image/imageloader.h" #include "sword25/gfx/opengl/openglgfx.h" @@ -139,9 +138,9 @@ bool BS_GLImage::Fill(const BS_Rect *pFillRect, unsigned int Color) { // ----------------------------------------------------------------------------- -bool BS_GLImage::SetContent(const byte *Pixeldata, unsigned int Offset, unsigned int Stride) { +bool BS_GLImage::SetContent(const byte *Pixeldata, uint size, 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)) { + if (size < static_cast<unsigned int>(m_Width * m_Height * 4)) { BS_LOG_ERRORLN("PixelData vector is too small to define a 32 bit %dx%d image.", m_Width, m_Height); return false; } |