removed gimp_layer_has_alpha(), use gimp_drawable_has_alpha() instead.
2002-01-31 Michael Natterer <mitch@gimp.org> * app/core/gimplayer.[ch]: removed gimp_layer_has_alpha(), use gimp_drawable_has_alpha() instead. * app/core/gimpimage-convert.c * app/core/gimpimage-merge.c * app/core/gimpimage-projection.c * app/display/gimpdisplayshell.c * app/gui/layers-commands.c: changed accordingly. * app/core/gimpimage.[ch]: added gimp_image_has_alphe(), made some variable names more verbose and use enum types instead of "gint" in functions calling initial_region() and combine_regions(). * app/widgets/gimpchannellistview.c: show an alpha channel preview only if the image has alpha. * app/widgets/gimppreview.c: reordered functions, gimp_preview_render_and_flush(): fixed channel preview rendering, calculate the component byte offsets before entering the render loop instead of duplicating the render code for the gray/alpha case.
This commit is contained in:
committed by
Michael Natterer
parent
4f033e6837
commit
65d3b34d15
@ -543,7 +543,7 @@ gimp_image_initialize_projection (GimpImage *gimage,
|
||||
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
|
||||
|
||||
if (gimp_drawable_get_visible (GIMP_DRAWABLE (layer)) &&
|
||||
! gimp_layer_has_alpha (layer) &&
|
||||
! gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)) &&
|
||||
(off_x <= x) &&
|
||||
(off_y <= y) &&
|
||||
(off_x + gimp_drawable_width (GIMP_DRAWABLE (layer)) >= x + w) &&
|
||||
@ -588,7 +588,7 @@ gimp_image_construct (GimpImage *gimage,
|
||||
|
||||
if ((gimage->layers) && /* There's a layer. */
|
||||
(! g_slist_next (gimage->layers)) && /* It's the only layer. */
|
||||
(gimp_layer_has_alpha ((GimpLayer *) (gimage->layers->data))) &&
|
||||
(gimp_drawable_has_alpha (GIMP_DRAWABLE (gimage->layers->data))) &&
|
||||
/* It's !flat. */
|
||||
(gimp_drawable_get_visible (GIMP_DRAWABLE (gimage->layers->data))) &&
|
||||
/* It's visible. */
|
||||
|
||||
Reference in New Issue
Block a user