diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-11-24 11:05:18 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-11-24 22:57:25 +0800 |
| commit | 16e863ce6575edb8be7907341ce443b1cb601221 (patch) | |
| tree | c98e4700ad8e59bde5ec66081bb62e1c65be9020 /gdk | |
| parent | c7f3b93d99f22ed066dbcce4d7bc5e6bd097ad67 (diff) | |
| download | gtk+-16e863ce6575edb8be7907341ce443b1cb601221.tar.gz | |
gdkgl.c: Avoid GCCism in Pointer Arithmetic
NULL-plus-something could be seen by the compiler to attempt to do
arithmetic with void *, which is a GCCism. Instead, do the math normally
and cast the results as a void *.
https://bugzilla.gnome.org/show_bug.cgi?id=740605
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkgl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c index 73888a2ee2..6791960100 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -240,7 +240,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, glBindBuffer (GL_ARRAY_BUFFER, paint_data->tmp_vertex_buffer); glVertexAttribPointer (program->position_location, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, NULL); - glVertexAttribPointer (program->uv_location, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, NULL + sizeof(float) * 2); + glVertexAttribPointer (program->uv_location, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, (void *) (sizeof(float) * 2)); #define VERTEX_SIZE 4 |