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

[fingolfin at users.sourceforge.net]

Revision: 48694
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48694&view=rev
Author:   fingolfin
Date:     2010-04-17 23:19:52 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
Fixing some warnings (with gcc 3.3.6)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
    scummvm/trunk/engines/teenagent/surface.cpp
    scummvm/trunk/graphics/conversion.cpp
    scummvm/trunk/sound/softsynth/opl/dbopl.cpp

Modified: scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp	2010-04-17 20:43:09 UTC (rev 48693)
+++ scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp	2010-04-17 23:19:52 UTC (rev 48694)
@@ -34,7 +34,7 @@
 #define BASE_NOTE 129	// A10
 #define BASE_OCTAVE 10	// A10, as I said
 
-const static int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12)
+static const int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12)
 	28160, // A10
 	29834,
 	31608,

Modified: scummvm/trunk/engines/teenagent/surface.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/surface.cpp	2010-04-17 20:43:09 UTC (rev 48693)
+++ scummvm/trunk/engines/teenagent/surface.cpp	2010-04-17 23:19:52 UTC (rev 48694)
@@ -87,7 +87,7 @@
 		return Common::Rect();
 
 	if (zoom == 256) {
-		byte *src = (byte *)getBasePtr(0, src_rect.top);
+		const byte *src = (const byte *)getBasePtr(0, src_rect.top);
 		byte *dst_base = (byte *)surface->getBasePtr(dst_rect.left, dst_rect.top);
 
 		for (int i = src_rect.top; i < src_rect.bottom; ++i) {
@@ -107,7 +107,7 @@
 		for(int i = 0; i < dst_rect.height(); ++i) {
 			for (int j = 0; j < dst_rect.width(); ++j) {
 				int px = j * 256 / zoom;
-				byte *src = (byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom);
+				const byte *src = (const byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom);
 				byte p = *src;
 				if (p != 0xff)
 					dst[j] = p;

Modified: scummvm/trunk/graphics/conversion.cpp
===================================================================
--- scummvm/trunk/graphics/conversion.cpp	2010-04-17 20:43:09 UTC (rev 48693)
+++ scummvm/trunk/graphics/conversion.cpp	2010-04-17 23:19:52 UTC (rev 48694)
@@ -107,7 +107,7 @@
 		if (srcFmt.bytesPerPixel == 2) {
 			for (int y = 0; y < h; y++) {
 				for (int x = 0; x < w; x++, src += 2, dst += 4) {
-					color = *(uint16 *) src;
+					color = *(const uint16 *)src;
 					srcFmt.colorToARGB(color, a, r, g, b);
 					color = dstFmt.ARGBToColor(a, r, g, b);
 					*(uint32 *)dst = color;
@@ -133,7 +133,7 @@
 		} else {
 			for (int y = 0; y < h; y++) {
 				for (int x = 0; x < w; x++, src += 4, dst += 4) {
-					color = *(uint32 *) src;
+					color = *(const uint32 *)src;
 					srcFmt.colorToARGB(color, a, r, g, b);
 					color = dstFmt.ARGBToColor(a, r, g, b);
 					*(uint32 *)dst = color;

Modified: scummvm/trunk/sound/softsynth/opl/dbopl.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/dbopl.cpp	2010-04-17 20:43:09 UTC (rev 48693)
+++ scummvm/trunk/sound/softsynth/opl/dbopl.cpp	2010-04-17 23:19:52 UTC (rev 48694)
@@ -586,7 +586,7 @@
 #endif
 }
 
-Bits INLINE Operator::GetSample( Bits modulation ) {
+INLINE Bits Operator::GetSample( Bits modulation ) {
 	Bitu vol = ForwardVolume();
 	if ( ENV_SILENT( vol ) ) {
 		//Simply forward the wave


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