diff options
| author | Johannes Schickel | 2012-02-15 00:47:08 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-15 02:23:08 +0100 |
| commit | 1f01fb330ca5a621c0a55293762806049ca98c35 (patch) | |
| tree | 470b2465888a59984a66d874f732e3ce43328f23 /backends | |
| parent | e5d48797d9866c155e3a4af8a6dd614a8978d428 (diff) | |
| download | scummvm-rg350-1f01fb330ca5a621c0a55293762806049ca98c35.tar.gz scummvm-rg350-1f01fb330ca5a621c0a55293762806049ca98c35.tar.bz2 scummvm-rg350-1f01fb330ca5a621c0a55293762806049ca98c35.zip | |
OPENGL: Use C-style casts.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/graphics/opengl/gltexture.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp index c4d29259b6..ce69dc4aab 100644 --- a/backends/graphics/opengl/gltexture.cpp +++ b/backends/graphics/opengl/gltexture.cpp @@ -60,8 +60,7 @@ void GLTexture::initGLExtensions() { return; // Get a string with all extensions - const char *ext_string = - reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)); + const char *ext_string = (const char *)glGetString(GL_EXTENSIONS); CHECK_GL_ERROR(); Common::StringTokenizer tokenizer(ext_string, " "); // Iterate all string tokens @@ -146,12 +145,12 @@ void GLTexture::updateBuffer(const void *buf, int pitch, GLuint x, GLuint y, GLu glBindTexture(GL_TEXTURE_2D, _textureName); CHECK_GL_ERROR(); // Check if the buffer has its data contiguously - if (static_cast<int>(w) * _bytesPerPixel == pitch) { + if ((int)w * _bytesPerPixel == pitch) { glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, _glFormat, _glType, buf); CHECK_GL_ERROR(); } else { // Update the texture row by row - const byte *src = static_cast<const byte *>(buf); + const byte *src = (const byte *)buf; do { glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, 1, _glFormat, _glType, src); CHECK_GL_ERROR(); |