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

cogl-atlas: Fix a compiler warning when Cogl debug is disabled

Browse Source 
When Cogl debugging is disabled then the 'waste' variable is not used
so it throws a compiler warning. This patch removes the variable and
the value is calculated directly as the parameter to COGL_NOTE.
This commit is contained in:
Neil Roberts 2011-02-15 12:50:15 +00:00
parent 167c8aac1b
commit b77276c99a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl-atlas.c
View File

@ -332,16 +332,15 @@ _cogl_atlas_reserve_space (CoglAtlas *atlas,
user_data, user_data,
&new_position)) &new_position))
{ {
int waste =
_cogl_rectangle_map_get_remaining_space (atlas->map) *
100 / (_cogl_rectangle_map_get_width (atlas->map) *
_cogl_rectangle_map_get_height (atlas->map));
COGL_NOTE (ATLAS, "%p: Atlas is %ix%i, has %i textures and is %i%% waste", COGL_NOTE (ATLAS, "%p: Atlas is %ix%i, has %i textures and is %i%% waste",
atlas, atlas,
_cogl_rectangle_map_get_width (atlas->map), _cogl_rectangle_map_get_width (atlas->map),
_cogl_rectangle_map_get_height (atlas->map), _cogl_rectangle_map_get_height (atlas->map),
_cogl_rectangle_map_get_n_rectangles (atlas->map), _cogl_rectangle_map_get_n_rectangles (atlas->map),
waste); /* waste as a percentage */
_cogl_rectangle_map_get_remaining_space (atlas->map) *
100 / (_cogl_rectangle_map_get_width (atlas->map) *
_cogl_rectangle_map_get_height (atlas->map)));
atlas->update_position_cb (user_data, atlas->update_position_cb (user_data,
atlas->texture, atlas->texture,