app/base/tile-manager.[ch] removed "level_below" from the TileManager

2007-06-21  Sven Neumann  <sven@gimp.org>

	* app/base/tile-manager.[ch]
	* app/base/tile-manager-private.h: removed "level_below" from the
	TileManager struct.
	
	* app/base/tile-pyramid.c: use the TileManager's user_data to
	store a pointer to the lower level.

svn path=/trunk/; revision=22819
This commit is contained in:
Sven Neumann 2007-06-21 14:13:01 +00:00 committed by Sven Neumann
parent 173c9d40aa
commit f2e9d552b2
5 changed files with 12 additions and 28 deletions

View File

@ -1,3 +1,12 @@
2007-06-21 Sven Neumann <sven@gimp.org>
* app/base/tile-manager.[ch]
* app/base/tile-manager-private.h: removed "level_below" from the
TileManager struct.
* app/base/tile-pyramid.c: use the TileManager's user_data to
store a pointer to the lower level.
2007-06-21 Sven Neumann <sven@gimp.org>
* app/base/tile-manager.[ch]: use gboolean for boolean parameters.

View File

@ -40,10 +40,6 @@ struct _TileManager
gint cached_num; /* number of cached tile */
Tile *cached_tile; /* the actual cached tile */
TileManager *level_below; /* The TileManager containing the level
* below in an image pyramid.
*/
gpointer user_data; /* hook for hanging data off of */
};

View File

@ -64,7 +64,6 @@ tile_manager_new (gint width,
tm->ntile_rows = (height + TILE_HEIGHT - 1) / TILE_HEIGHT;
tm->ntile_cols = (width + TILE_WIDTH - 1) / TILE_WIDTH;
tm->cached_num = -1;
tm->level_below = NULL;
return tm;
}
@ -546,23 +545,6 @@ tile_manager_tiles_per_row (const TileManager *tm)
return tm->ntile_rows;
}
TileManager *
tile_manager_get_level_below (const TileManager *tm)
{
g_return_val_if_fail (tm != NULL, NULL);
return tm->level_below;
}
void
tile_manager_set_level_below (TileManager *tm,
TileManager *level_below)
{
g_return_if_fail (tm != NULL);
tm->level_below = level_below;
}
void
tile_manager_get_offsets (const TileManager *tm,
gint *x,

View File

@ -96,9 +96,6 @@ gint tile_manager_height (const TileManager *tm);
gint tile_manager_bpp (const TileManager *tm);
gint tile_manager_tiles_per_col (const TileManager *tm);
gint tile_manager_tiles_per_row (const TileManager *tm);
TileManager *tile_manager_get_level_below (const TileManager *tm);
void tile_manager_set_level_below (TileManager *tm,
TileManager *level_below);
void tile_manager_get_offsets (const TileManager *tm,
gint *x,

View File

@ -359,8 +359,8 @@ tile_pyramid_alloc_levels (TilePyramid *pyramid,
tile_manager_set_validate_proc (pyramid->tiles[level],
tile_pyramid_validate_tile);
tile_manager_set_level_below (pyramid->tiles[level],
pyramid->tiles[level - 1]);
tile_manager_set_user_data (pyramid->tiles[level],
pyramid->tiles[level - 1]);
}
return pyramid->top_level;
@ -370,7 +370,7 @@ static void
tile_pyramid_validate_tile (TileManager *tm,
Tile *tile)
{
TileManager *level_below = tile_manager_get_level_below (tm);
TileManager *level_below = tile_manager_get_user_data (tm);
gint tile_col;
gint tile_row;
gint i, j;