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

app: migrate gimpoperationmaskcomponents to new iterator api

Browse Source
This commit is contained in:
Øyvind Kolås
2018-09-11 01:47:31 +02:00
parent c6d23add65
commit 55b3438328
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/operations/gimpoperationmaskcomponents.c
View File

@ -81,7 +81,7 @@ gimp_operation_mask_components_class_init (GimpOperationMaskComponentsClass *kla
NULL); NULL);
operation_class->prepare = gimp_operation_mask_components_prepare; operation_class->prepare = gimp_operation_mask_components_prepare;
operation_class->process = gimp_operation_mask_components_parent_process; //operation_class->process = gimp_operation_mask_components_parent_process;
point_class->process = gimp_operation_mask_components_process; point_class->process = gimp_operation_mask_components_process;
@ -172,7 +172,7 @@ gimp_operation_mask_components_parent_process (GeglOperation *operation,
gint level) gint level)
{ {
GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation); GimpOperationMaskComponents *self = GIMP_OPERATION_MASK_COMPONENTS (operation);
#if 0
if (self->mask == 0) if (self->mask == 0)
{ {
GObject *input = gegl_operation_context_get_object (context, "input"); GObject *input = gegl_operation_context_get_object (context, "input");
@ -189,7 +189,7 @@ gimp_operation_mask_components_parent_process (GeglOperation *operation,
return TRUE; return TRUE;
} }
#endif
return GEGL_OPERATION_CLASS (parent_class)->process (operation, context, return GEGL_OPERATION_CLASS (parent_class)->process (operation, context,
output_prop, result, output_prop, result,
level); level);
@ -211,10 +211,24 @@ gimp_operation_mask_components_process (GeglOperation *operation,
GimpComponentMask mask = self->mask; GimpComponentMask mask = self->mask;
static const gfloat nothing[] = { 0.0, 0.0, 0.0, 1.0 }; static const gfloat nothing[] = { 0.0, 0.0, 0.0, 1.0 };
if (! aux) #if 0
aux = (gfloat *) nothing; if (self->mask == 0)
{
if (in_buf != out_buf)
memcpy (out_buf, in_buf, sizeof (float) * 4 * samples);
}
else if (self->mask == GIMP_COMPONENT_MASK_ALL && aux_buf)
{
if (aux_buf != out_buf)
memcpy (out_buf, aux_buf, sizeof (float) * 4 * samples);
}
else
#endif
{
if (! aux)
aux = (gfloat *) nothing;
while (samples--) while (samples--)
{ {
dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED]; dest[RED] = (mask & GIMP_COMPONENT_MASK_RED) ? aux[RED] : src[RED];
dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN]; dest[GREEN] = (mask & GIMP_COMPONENT_MASK_GREEN) ? aux[GREEN] : src[GREEN];
@ -228,6 +242,7 @@ gimp_operation_mask_components_process (GeglOperation *operation,
dest += 4; dest += 4;
} }
}
return TRUE; return TRUE;
} }