From f98d003e354a1792117b7cbc771d1dd91475a156 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Mar 2011 17:48:29 +0200 Subject: Fix most old style cast except manaserv and libxml2 defines. --- src/openglgraphics.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/openglgraphics.cpp') diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 6b71da13e..302c895d0 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -105,7 +105,8 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) logger->log("Using OpenGL %s double buffering.", (gotDoubleBuffer ? "with" : "without")); - char const *glExtensions = (char const *)glGetString(GL_EXTENSIONS); + char const *glExtensions = reinterpret_cast( + glGetString(GL_EXTENSIONS)); GLint texSize; bool rectTex = strstr(glExtensions, "GL_ARB_texture_rectangle"); if (rectTex) @@ -631,7 +632,8 @@ void OpenGLGraphics::_beginDraw() glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho(0.0, (double)mTarget->w, (double)mTarget->h, 0.0, -1.0, 1.0); + glOrtho(0.0, static_cast(mTarget->w), + static_cast(mTarget->h), 0.0, -1.0, 1.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -681,12 +683,14 @@ SDL_Surface* OpenGLGraphics::getScreenshot() // Flip the screenshot, as OpenGL has 0,0 in bottom left unsigned int lineSize = 3 * w; - GLubyte* buf = (GLubyte*)malloc(lineSize); + GLubyte* buf = static_cast(malloc(lineSize)); for (int i = 0; i < (h / 2); i++) { - GLubyte *top = (GLubyte*)screenshot->pixels + lineSize * i; - GLubyte *bot = (GLubyte*)screenshot->pixels + lineSize * (h - 1 - i); + GLubyte *top = static_cast( + screenshot->pixels) + lineSize * i; + GLubyte *bot = static_cast( + screenshot->pixels) + lineSize * (h - 1 - i); memcpy(buf, top, lineSize); memcpy(top, bot, lineSize); -- cgit v1.2.3-60-g2f50