brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reposition variable declarations to avoid C99.

Browse Source
This commit is contained in:
Haakon Sporsheim 2009-03-31 14:37:07 +02:00 committed by Neil Roberts
parent dbc9c16259
commit e4eed92177
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/cogl/common/cogl-material.c
View File

@ -1914,9 +1914,10 @@ cogl_set_source (CoglHandle material_handle)
void void
cogl_set_source_texture (CoglHandle texture_handle) cogl_set_source_texture (CoglHandle texture_handle)
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
CoglColor white; CoglColor white;
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
g_return_if_fail (texture_handle != COGL_INVALID_HANDLE); g_return_if_fail (texture_handle != COGL_INVALID_HANDLE);
cogl_material_set_layer (ctx->default_material, 0, texture_handle); cogl_material_set_layer (ctx->default_material, 0, texture_handle);

6
clutter/cogl/common/cogl-matrix.c
View File

@ -88,9 +88,11 @@ cogl_matrix_rotate (CoglMatrix *matrix,
{ {
CoglMatrix rotation; CoglMatrix rotation;
CoglMatrix result; CoglMatrix result;
float c, s;
angle *= G_PI / 180.0f; angle *= G_PI / 180.0f;
float c = cosf (angle); c = cosf (angle);
float s = sinf (angle); s = sinf (angle);
rotation.xx = x * x * (1.0f - c) + c; rotation.xx = x * x * (1.0f - c) + c;
rotation.yx = y * x * (1.0f - c) + z * s; rotation.yx = y * x * (1.0f - c) + z * s;