diff options
| author | Johannes Schickel | 2010-06-15 19:25:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-06-15 19:25:45 +0000 |
| commit | a8598767c627d8be616f31855b1ff5d6e0f752f9 (patch) | |
| tree | c31399ad464a84b5577e5e13840d4b7ab784408d | |
| parent | a6fc45b29b07c6b619b4889893846e6dec151b34 (diff) | |
| download | scummvm-rg350-a8598767c627d8be616f31855b1ff5d6e0f752f9.tar.gz scummvm-rg350-a8598767c627d8be616f31855b1ff5d6e0f752f9.tar.bz2 scummvm-rg350-a8598767c627d8be616f31855b1ff5d6e0f752f9.zip | |
Fix some warnings inside convbdf.c
svn-id: r49887
| -rw-r--r-- | tools/convbdf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/convbdf.c b/tools/convbdf.c index 4341eac2e7..ad0d9d2373 100644 --- a/tools/convbdf.c +++ b/tools/convbdf.c @@ -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 @@ int bdf_read_bitmaps(FILE *fp, struct font* pf) { /* 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 @@ int bdf_read_bitmaps(FILE *fp, struct font* pf) { /* 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 { |