callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor API cleanup. Use horizontal and vertical scale to determine the

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

	* app/core/gimpprojection.[ch]: minor API cleanup. Use 
horizontal
	and vertical scale to determine the pyramid level to use.

	* app/display/gimpdisplayshell-draw.c
	* app/display/gimpdisplayshell-render.c: follow the API change.


svn path=/trunk/; revision=22730
This commit is contained in:
Sven Neumann
2007-06-06 21:40:31 +00:00
committed by Sven Neumann
parent f7b73192c0
commit a4079a37db
5 changed files with 48 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/core/gimpprojection.c
View File

@ -349,57 +349,27 @@ gimp_projection_get_tiles_at_level (GimpProjection *proj,
}
/**
* gimp_projection_level_size_from_scale:
* @proj: pointer to a GimpProjection
* @scalex: scale to use
* @level: where to store level used
* @width: where to store width of level
* @height: where to store height of level
* gimp_projection_get_level:
* @proj: pointer to a GimpProjection
* @scale_x: horizontal scale factor
* @scale_y: vertical scale factor
*
* Calculates what level and the width and height of that level that should be
* used for scale @scalex.
**/
void
gimp_projection_level_size_from_scale (GimpProjection *proj,
gdouble scalex,
gint *level,
gint *width,
gint *height)
{
TileManager *src_tiles;
g_return_if_fail (GIMP_IS_PROJECTION (proj) &&
level &&
width &&
height);
/* We must make sure the pyramid is up to date. */
gimp_projection_alloc_levels (proj);
*level = gimp_projection_scale_to_level (proj, scalex);
src_tiles = gimp_projection_get_tiles_at_level (proj, *level);
*width = tile_manager_width (src_tiles);
*height = tile_manager_height (src_tiles);
}
/**
* gimp_projection_scale_to_level:
* @proj: pointer to a GimpProjection
* @scalex: scale to use
*
* Return value: Returns the level (base level = 0) that should be used
* for scale @scalex.
* Return value: the pyramid level to use for a given display scale factor.
**/
gint
gimp_projection_scale_to_level (GimpProjection *proj,
gdouble scalex)
gimp_projection_get_level (GimpProjection *proj,
gdouble scale_x,
gdouble scale_y)
{
gdouble scale;
gint level;
g_return_val_if_fail (GIMP_IS_PROJECTION (proj), PYRAMID_BASE_LEVEL);
return CLAMP ((gint) -(log (scalex) / log(2)),
PYRAMID_BASE_LEVEL,
proj->top_level);
scale = MAX (scale_x, scale_y);
level = -(log (scale) / G_LN2);
return CLAMP (level, PYRAMID_BASE_LEVEL, proj->top_level);
}
GimpImage *

12
app/core/gimpprojection.h
View File

@ -92,15 +92,9 @@ TileManager * gimp_projection_get_tiles (GimpProjection *proj);
TileManager * gimp_projection_get_tiles_at_level
(GimpProjection *proj,
gint level);
void gimp_projection_level_size_from_scale
(GimpProjection *proj,
gdouble scalex,
gint *level,
gint *width,
gint *height);
gint gimp_projection_scale_to_level (GimpProjection *proj,
gdouble scalex);
gint gimp_projection_get_level (GimpProjection *proj,
gdouble scale_x,
gdouble scale_y);
GimpImage * gimp_projection_get_image (const GimpProjection *proj);
GimpImageType gimp_projection_get_image_type (const GimpProjection *proj);