[Scummvm-cvs-logs] SF.net SVN: scummvm:[49887] scummvm/trunk/tools/convbdf.c

[lordhoto at users.sourceforge.net]

Revision: 49887
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49887&view=rev
Author:   lordhoto
Date:     2010-06-15 19:25:45 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Fix some warnings inside convbdf.c

Modified Paths:
--------------
    scummvm/trunk/tools/convbdf.c

Modified: scummvm/trunk/tools/convbdf.c
===================================================================
--- scummvm/trunk/tools/convbdf.c	2010-06-15 19:21:20 UTC (rev 49886)
+++ scummvm/trunk/tools/convbdf.c	2010-06-15 19:25:45 UTC (rev 49887)
@@ -38,12 +38,12 @@
 #include <time.h>
 
 int READ_UINT16(void *addr) {
-	unsigned char *buf = addr;
+	unsigned char *buf = (unsigned char *)addr;
 	return (buf[0] << 8) | buf[1];
 }
 
 void WRITE_UINT16(void *addr, int value) {
-	unsigned char *buf = addr;
+	unsigned char *buf = (unsigned char *)addr;
 	buf[0] = (value >> 8) & 0xFF;
 	buf[1] = value & 0xFF;
 }
@@ -611,7 +611,7 @@
 	/* determine whether font doesn't require encode table*/
 	l = 0;
 	for (i = 0; i < pf->size; ++i) {
-		if (pf->offset[i] != l) {
+		if (pf->offset[i] != (unsigned long)l) {
 			encodetable = 1;
 			break;
 		}
@@ -648,7 +648,7 @@
 
 	/* reallocate bits array to actual bits used*/
 	if (ofs < pf->bits_size) {
-		pf->bits = realloc(pf->bits, ofs * sizeof(bitmap_t));
+		pf->bits = (bitmap_t *)realloc(pf->bits, ofs * sizeof(bitmap_t));
 		pf->bits_size = ofs;
 	}
 	else {


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