diff options
| author | Eugene Sandulenko | 2010-08-28 20:58:11 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 23:19:21 +0000 |
| commit | 7a2142b8d6f545e99900460e5f03a43fb96f5337 (patch) | |
| tree | 44091010eaa0aa1f28b8174956e55c3a2ea7446c | |
| parent | deb7dcc8bb26483ea1f0271e04de441a586dd144 (diff) | |
| download | scummvm-rg350-7a2142b8d6f545e99900460e5f03a43fb96f5337.tar.gz scummvm-rg350-7a2142b8d6f545e99900460e5f03a43fb96f5337.tar.bz2 scummvm-rg350-7a2142b8d6f545e99900460e5f03a43fb96f5337.zip | |
SWORD25: Fix more warnings
svn-id: r53293
| -rw-r--r-- | engines/sword25/gfx/image/pngloader.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/gfx/opengl/glimage.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp index 0fb1fa509e..59e0f21e84 100644 --- a/engines/sword25/gfx/image/pngloader.cpp +++ b/engines/sword25/gfx/image/pngloader.cpp @@ -320,7 +320,7 @@ bool PNGLoader::ImageProperties(const byte *FileDataPtr, unsigned int FileSize, bool PNGLoader::DoIsCorrectImageFormat(const byte *FileDataPtr, unsigned int FileSize) { if (FileSize > 8) - return png_check_sig((byte *)FileDataPtr, 8) ? true : false; + return png_check_sig(const_cast<byte *>(FileDataPtr), 8) ? true : false; else return false; } diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp index ec691d8b66..994a61241e 100644 --- a/engines/sword25/gfx/opengl/glimage.cpp +++ b/engines/sword25/gfx/opengl/glimage.cpp @@ -169,7 +169,7 @@ bool GLImage::Blit(int PosX, int PosY, int Flipping, Common::Rect *pPartRect, un Height = m_Height; ScaleY = (float) Height / (float) m_Height; - if (Color & 0xff000000 != 0xff000000) { + if ((Color & 0xff000000) != 0xff000000) { warning("STUB: Image transparent bg color: %x", Color); } int cr = (Color >> 16) & 0xff; |