[Scummvm-cvs-logs] SF.net SVN: scummvm:[53293] scummvm/trunk/engines/sword25/gfx

[sev at users.sourceforge.net]

Revision: 53293
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53293&view=rev
Author:   sev
Date:     2010-10-12 23:19:21 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Fix more warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
    scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp

Modified: scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp	2010-10-12 23:18:58 UTC (rev 53292)
+++ scummvm/trunk/engines/sword25/gfx/image/pngloader.cpp	2010-10-12 23:19:21 UTC (rev 53293)
@@ -320,7 +320,7 @@
 
 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;
 }

Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp	2010-10-12 23:18:58 UTC (rev 53292)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp	2010-10-12 23:19:21 UTC (rev 53293)
@@ -169,7 +169,7 @@
 		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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.