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

app: simplify leftover and now useless nested if()

Browse Source
This commit is contained in:
Michael Natterer
2012-04-05 20:37:47 +02:00
parent d180c894be
commit cb3e8f82d4
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/core/gimp-edit.c
View File

@ -465,19 +465,18 @@ gimp_edit_fill_full (GimpImage *image,
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE); g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
g_return_val_if_fail (color != NULL || pattern != NULL, FALSE); g_return_val_if_fail (color != NULL || pattern != NULL, FALSE);
if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height)) if (! gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height))
return TRUE; /* nothing to do, but the fill succeded */ return TRUE; /* nothing to do, but the fill succeded */
format = gimp_drawable_get_format (drawable); if (pattern &&
(pattern->mask->bytes == 2 || pattern->mask->bytes == 4) &&
if (pattern) ! gimp_drawable_has_alpha (drawable))
{ {
if (! gimp_drawable_has_alpha (drawable) && format = gimp_drawable_get_format_with_alpha (drawable);
(pattern->mask->bytes == 2 || pattern->mask->bytes == 4)) }
{ else
format = gimp_drawable_get_format_with_alpha (drawable); {
} format = gimp_drawable_get_format (drawable);
} }
dest_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height), dest_buffer = gimp_gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),