From: Jaka K. <lyn...@us...> - 2012-12-09 20:28:39
|
gemrb: Infinity Engine emulator The branch master has been updated via 8cdccdeebc103d16b4a0144e7fbbfa64d9121696 (commit) Summary of changes: gemrb/plugins/BIKPlayer/BIKPlayer.cpp | 3 ++- gemrb/plugins/BIKPlayer/BIKPlayer.h | 2 +- gemrb/plugins/BIKPlayer/GetBitContext.h | 8 ++++---- gemrb/plugins/GUIScript/GUIScript.cpp | 20 ++++++++++---------- gemrb/plugins/SDLVideo/SDLVideo.cpp | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) from 769774557914834a35f23fcd97ee70376abb3967 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=8cdccdeebc103d16b4a0144e7fbbfa64d9121696 commit 8cdccdeebc103d16b4a0144e7fbbfa64d9121696 Author: Armin Preiml <ap...@st...> Date: Sun Dec 9 21:21:57 2012 +0100 fixed -Wcast-align warnings so clang can be built with -Werror on by default diff --git a/gemrb/plugins/BIKPlayer/BIKPlayer.cpp b/gemrb/plugins/BIKPlayer/BIKPlayer.cpp index 91c0f31..2e00c3b 100644 --- a/gemrb/plugins/BIKPlayer/BIKPlayer.cpp +++ b/gemrb/plugins/BIKPlayer/BIKPlayer.cpp @@ -1155,7 +1155,8 @@ int BIKPlayer::read_colors(Bundle *b) int BIKPlayer::read_dcs(Bundle *b, int start_bits, int has_sign) { int i, j, len, len2, bsize, v, v2; - SET_INT_TYPE *dst = (SET_INT_TYPE*)b->cur_dec; + + SET_INT_TYPE *dst = reinterpret_cast<SET_INT_TYPE*>(b->cur_dec); //int16_t *dst = (int16_t*)b->cur_dec; CHECK_READ_VAL(v_gb, b, len); diff --git a/gemrb/plugins/BIKPlayer/BIKPlayer.h b/gemrb/plugins/BIKPlayer/BIKPlayer.h index cd1de7d..94a0738 100644 --- a/gemrb/plugins/BIKPlayer/BIKPlayer.h +++ b/gemrb/plugins/BIKPlayer/BIKPlayer.h @@ -64,7 +64,7 @@ namespace GemRB { (ptr)++; #else #define GET_INT_VALUE(value, ptr)\ - (value) = *(int16_t*)(ptr); \ + (value) = *reinterpret_cast<int16_t*>(ptr); \ (ptr) += 2; #endif diff --git a/gemrb/plugins/BIKPlayer/GetBitContext.h b/gemrb/plugins/BIKPlayer/GetBitContext.h index d056f37..47bf917 100644 --- a/gemrb/plugins/BIKPlayer/GetBitContext.h +++ b/gemrb/plugins/BIKPlayer/GetBitContext.h @@ -64,16 +64,16 @@ private: #else #define GET_DATA(v, table, i, wrap, size) \ {\ - const uint8_t *ptr = (const uint8_t *)table + i * wrap;\ + const uint8_t *ptr = reinterpret_cast<const uint8_t *>(table) + i * wrap;\ switch(size) {\ case 1:\ - v = *(const uint8_t *)ptr;\ + v = *reinterpret_cast<const uint8_t *>(ptr);\ break;\ case 2:\ - v = *(const uint16_t *)ptr;\ + v = *reinterpret_cast<const uint16_t *>(ptr);\ break;\ default:\ - v = *(const uint32_t *)ptr;\ + v = *reinterpret_cast<const uint32_t *>(ptr);\ break;\ }\ } diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 573e82b..cceb569 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -9950,12 +9950,12 @@ static PyObject* GemRB_SetupMaze(PyObject* /*self*/, PyObject* args) GET_GAME(); - maze_header *h = (maze_header *) (game->AllocateMazeData()+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); + maze_header *h = reinterpret_cast<maze_header *> (game->AllocateMazeData()+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); memset(h, 0, MAZE_HEADER_SIZE); h->maze_sizex = xsize; h->maze_sizey = ysize; for(int i=0;i<MAZE_ENTRY_COUNT;i++) { - maze_entry *m = (maze_entry *) (game->mazedata+i*MAZE_ENTRY_SIZE); + maze_entry *m = reinterpret_cast<maze_entry *> (game->mazedata+i*MAZE_ENTRY_SIZE); memset(m, 0, MAZE_ENTRY_SIZE); bool used = (i/MAZE_MAX_DIM<ysize) && (i%MAZE_MAX_DIM<xsize); m->valid = used; @@ -9991,7 +9991,7 @@ static PyObject* GemRB_SetMazeEntry(PyObject* /*self*/, PyObject* args) return RuntimeError( "No maze set up!" ); } - maze_entry *m = (maze_entry *) (game->mazedata+entry*MAZE_ENTRY_SIZE); + maze_entry *m = reinterpret_cast<maze_entry *> (game->mazedata+entry*MAZE_ENTRY_SIZE); maze_entry *m2; switch(index) { case ME_OVERRIDE: @@ -10015,28 +10015,28 @@ static PyObject* GemRB_SetMazeEntry(PyObject* /*self*/, PyObject* args) m->walls |= value; if (value & WALL_SOUTH) { if (entry%MAZE_MAX_DIM!=MAZE_MAX_DIM-1) { - m2 = (maze_entry *) (game->mazedata+(entry+1)*MAZE_ENTRY_SIZE); + m2 = reinterpret_cast<maze_entry *> (game->mazedata+(entry+1)*MAZE_ENTRY_SIZE); m2->walls|=WALL_NORTH; } } if (value & WALL_NORTH) { if (entry%MAZE_MAX_DIM) { - m2 = (maze_entry *) (game->mazedata+(entry-1)*MAZE_ENTRY_SIZE); + m2 = reinterpret_cast<maze_entry *> (game->mazedata+(entry-1)*MAZE_ENTRY_SIZE); m2->walls|=WALL_SOUTH; } } if (value & WALL_EAST) { if (entry+MAZE_MAX_DIM<MAZE_ENTRY_COUNT) { - m2 = (maze_entry *) (game->mazedata+(entry+MAZE_MAX_DIM)*MAZE_ENTRY_SIZE); + m2 = reinterpret_cast<maze_entry *> (game->mazedata+(entry+MAZE_MAX_DIM)*MAZE_ENTRY_SIZE); m2->walls|=WALL_WEST; } } if (value & WALL_WEST) { if (entry>=MAZE_MAX_DIM) { - m2 = (maze_entry *) (game->mazedata+(entry-MAZE_MAX_DIM)*MAZE_ENTRY_SIZE); + m2 = reinterpret_cast<maze_entry *> (game->mazedata+(entry-MAZE_MAX_DIM)*MAZE_ENTRY_SIZE); m2->walls|=WALL_EAST; } } @@ -10071,7 +10071,7 @@ static PyObject* GemRB_SetMazeData(PyObject* /*self*/, PyObject* args) return RuntimeError( "No maze set up!" ); } - maze_header *h = (maze_header *) (game->mazedata+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); + maze_header *h = reinterpret_cast<maze_header *> (game->mazedata+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); switch(entry) { case MH_POS1X: h->pos1x = value; @@ -10131,7 +10131,7 @@ static PyObject* GemRB_GetMazeHeader(PyObject* /*self*/, PyObject* /*args*/) } PyObject* dict = PyDict_New(); - maze_header *h = (maze_header *) (game->mazedata+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); + maze_header *h = reinterpret_cast<maze_header *> (game->mazedata+MAZE_ENTRY_COUNT*MAZE_ENTRY_SIZE); PyDict_SetItemString(dict, "MazeX", PyInt_FromLong (h->maze_sizex)); PyDict_SetItemString(dict, "MazeY", PyInt_FromLong (h->maze_sizey)); PyDict_SetItemString(dict, "Pos1X", PyInt_FromLong (h->pos1x)); @@ -10170,7 +10170,7 @@ static PyObject* GemRB_GetMazeEntry(PyObject* /*self*/, PyObject* args) } PyObject* dict = PyDict_New(); - maze_entry *m = (maze_entry *) (game->mazedata+entry*MAZE_ENTRY_SIZE); + maze_entry *m = reinterpret_cast<maze_entry *> (game->mazedata+entry*MAZE_ENTRY_SIZE); PyDict_SetItemString(dict, "Override", PyInt_FromLong (m->override)); PyDict_SetItemString(dict, "Accessible", PyInt_FromLong (m->accessible)); PyDict_SetItemString(dict, "Valid", PyInt_FromLong (m->valid)); diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp index 90f5890..84107f6 100644 --- a/gemrb/plugins/SDLVideo/SDLVideo.cpp +++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp @@ -953,7 +953,7 @@ void SDLVideoDriver::BlitGameSprite(const Sprite2D* spr, int x, int y, // NB: GemRB::Color has exactly the same layout as SDL_Color if (!palette) - col = (const Color*)surf->format->palette->colors; + col = reinterpret_cast<const Color*>(surf->format->palette->colors); else col = palette->col; ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |