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

app: in gimp:layer-mode, implement GeglOperation::get_bounding_box()

Browse Source 
... to take the layer's composite mode and opacity into account.

(cherry picked from commit 89c97bcf26)
This commit is contained in:
Ell
2019-08-01 23:38:00 +03:00
parent 05a2061776
commit ea5b5e305a
1 changed files with 98 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/operations/layer-modes/gimpoperationlayermode.c
View File

@ -78,6 +78,7 @@ static void gimp_operation_layer_mode_get_property (GObject
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_operation_layer_mode_prepare (GeglOperation *operation); static void gimp_operation_layer_mode_prepare (GeglOperation *operation);
static GeglRectangle gimp_operation_layer_mode_get_bounding_box (GeglOperation *operation);
static gboolean gimp_operation_layer_mode_parent_process (GeglOperation *operation, static gboolean gimp_operation_layer_mode_parent_process (GeglOperation *operation,
GeglOperationContext *context, GeglOperationContext *context,
const gchar *output_prop, const gchar *output_prop,
@ -145,6 +146,7 @@ gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
object_class->get_property = gimp_operation_layer_mode_get_property; object_class->get_property = gimp_operation_layer_mode_get_property;
operation_class->prepare = gimp_operation_layer_mode_prepare; operation_class->prepare = gimp_operation_layer_mode_prepare;
operation_class->get_bounding_box = gimp_operation_layer_mode_get_bounding_box;
operation_class->process = gimp_operation_layer_mode_parent_process; operation_class->process = gimp_operation_layer_mode_parent_process;
point_composer3_class->process = gimp_operation_layer_mode_process; point_composer3_class->process = gimp_operation_layer_mode_process;
@ -370,6 +372,57 @@ gimp_operation_layer_mode_prepare (GeglOperation *operation)
gegl_operation_set_format (operation, "aux2", babl_format ("Y float")); gegl_operation_set_format (operation, "aux2", babl_format ("Y float"));
} }
static GeglRectangle
gimp_operation_layer_mode_get_bounding_box (GeglOperation *op)
{
GimpOperationLayerMode *self = (gpointer) op;
GeglRectangle *in_rect;
GeglRectangle *aux_rect;
GeglRectangle *aux2_rect;
GeglRectangle src_rect = {};
GeglRectangle dst_rect = {};
GeglRectangle result;
GimpLayerCompositeRegion included_region;
in_rect = gegl_operation_source_get_bounding_box (op, "input");
aux_rect = gegl_operation_source_get_bounding_box (op, "aux");
aux2_rect = gegl_operation_source_get_bounding_box (op, "aux2");
if (in_rect)
dst_rect = *in_rect;
if (aux_rect)
{
src_rect = *aux_rect;
if (aux2_rect)
gegl_rectangle_intersect (&src_rect, &src_rect, aux2_rect);
}
if (self->is_last_node)
{
included_region = GIMP_LAYER_COMPOSITE_REGION_SOURCE;
}
else
{
included_region = gimp_layer_mode_get_included_region (self->layer_mode,
self->composite_mode);
}
if (self->opacity == 0.0)
included_region &= ~GIMP_LAYER_COMPOSITE_REGION_SOURCE;
gegl_rectangle_intersect (&result, &src_rect, &dst_rect);
if (included_region & GIMP_LAYER_COMPOSITE_REGION_SOURCE)
gegl_rectangle_bounding_box (&result, &result, &src_rect);
if (included_region & GIMP_LAYER_COMPOSITE_REGION_DESTINATION)
gegl_rectangle_bounding_box (&result, &result, &dst_rect);
return result;
}
static gboolean static gboolean
gimp_operation_layer_mode_parent_process (GeglOperation *operation, gimp_operation_layer_mode_parent_process (GeglOperation *operation,
GeglOperationContext *context, GeglOperationContext *context,