[Scummvm-cvs-logs] SF.net SVN: scummvm:[46415] scummvm/trunk

[mthreepwood at users.sourceforge.net]

Revision: 46415
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46415&view=rev
Author:   mthreepwood
Date:     2009-12-19 02:03:41 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
Silence some gcc 3.4.5 warnings.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/graphics.cpp
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp	2009-12-18 18:32:09 UTC (rev 46414)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp	2009-12-19 02:03:41 UTC (rev 46415)
@@ -1583,9 +1583,9 @@
 #ifdef USE_RGB_COLOR
 			if (_cursorFormat.bytesPerPixel > 1) {
 				if (_cursorFormat.bytesPerPixel == 2)
-					color = *(uint16 *)srcPtr;
+					color = *(const uint16 *)srcPtr;
 				else
-					color = *(uint32 *)srcPtr;
+					color = *(const uint32 *)srcPtr;
 				if (color != _mouseKeyColor) {	// transparent, don't draw
 					uint8 r, g, b;
 					_cursorFormat.colorToRGB(color, r, g, b);

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-18 18:32:09 UTC (rev 46414)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-19 02:03:41 UTC (rev 46415)
@@ -34,7 +34,7 @@
 static const int nMidiParams[] = { 2, 2, 2, 2, 1, 1, 2, 0 };
 
 static int f_compare(const void *arg1, const void *arg2) {
-	return ((sciSound *)arg2)->prio - ((sciSound *)arg1)->prio;
+	return ((const sciSound *)arg2)->prio - ((const sciSound *)arg1)->prio;
 }
 
 SciMusic::SciMusic() {


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