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

app: in gimp_composite_blend(), more alloca avoiding

Browse Source
This commit is contained in:
Ell
2017-01-21 08:57:05 -05:00
parent c993adf91e
commit 0c35baecca
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/operations/layer-modes/gimpblendcomposite.h
View File

@ -212,22 +212,30 @@ gimp_composite_blend (gpointer op,
GimpBlendFunc blend_func) GimpBlendFunc blend_func)
{ {
GimpOperationPointLayerMode *layer_mode = op; GimpOperationPointLayerMode *layer_mode = op;
gfloat opacity = layer_mode->opacity;
GimpLayerColorSpace blend_trc = layer_mode->blend_trc;
GimpLayerColorSpace composite_trc = layer_mode->composite_trc;
GimpLayerCompositeMode composite_mode = layer_mode->composite_mode;
gfloat *blend_in = in; gfloat *blend_in = in;
gfloat *blend_layer = layer; gfloat *blend_layer = layer;
gfloat *blend_out = out; gfloat *blend_out = out;
gfloat *composite_in; gfloat *composite_in = NULL;
gfloat *composite_layer; gfloat *composite_layer = NULL;
gboolean composite_needs_in_color =
composite_mode == GIMP_LAYER_COMPOSITE_SRC_OVER ||
composite_mode == GIMP_LAYER_COMPOSITE_SRC_ATOP;
gboolean composite_needs_layer_color =
composite_mode == GIMP_LAYER_COMPOSITE_SRC_OVER ||
composite_mode == GIMP_LAYER_COMPOSITE_DST_ATOP;
const Babl *fish_to_blend = NULL; const Babl *fish_to_blend = NULL;
const Babl *fish_to_composite = NULL; const Babl *fish_to_composite = NULL;
const Babl *fish_from_composite = NULL; const Babl *fish_from_composite = NULL;
float opacity = layer_mode->opacity;
GimpLayerColorSpace blend_trc = layer_mode->blend_trc;
GimpLayerColorSpace composite_trc = layer_mode->composite_trc;
GimpLayerCompositeMode composite_mode = layer_mode->composite_mode;
switch (blend_trc) switch (blend_trc)
{ {
default: default:
@ -298,9 +306,12 @@ gimp_composite_blend (gpointer op,
if (fish_to_blend) if (fish_to_blend)
{ {
if (! (blend_in == out && if (in != out || (composite_needs_in_color &&
composite_trc != GIMP_LAYER_COLOR_SPACE_RGB_LINEAR)) composite_trc == GIMP_LAYER_COLOR_SPACE_RGB_LINEAR))
{ {
/* don't convert input in-place if we're not doing in-place output,
* or if we're going to need the original input for compositing.
*/
blend_in = g_alloca (sizeof (gfloat) * 4 * samples); blend_in = g_alloca (sizeof (gfloat) * 4 * samples);
} }
blend_layer = g_alloca (sizeof (gfloat) * 4 * samples); blend_layer = g_alloca (sizeof (gfloat) * 4 * samples);
@ -323,8 +334,7 @@ gimp_composite_blend (gpointer op,
} }
else else
{ {
if (composite_mode == GIMP_LAYER_COMPOSITE_SRC_OVER || if (composite_needs_in_color)
composite_mode == GIMP_LAYER_COMPOSITE_SRC_ATOP)
{ {
if (composite_in == in && in != out) if (composite_in == in && in != out)
composite_in = g_alloca (sizeof (gfloat) * 4 * samples); composite_in = g_alloca (sizeof (gfloat) * 4 * samples);
@ -333,8 +343,7 @@ gimp_composite_blend (gpointer op,
blend_in, composite_in, samples); blend_in, composite_in, samples);
} }
if (composite_mode == GIMP_LAYER_COMPOSITE_SRC_OVER || if (composite_needs_layer_color)
composite_mode == GIMP_LAYER_COMPOSITE_DST_ATOP)
{ {
if (composite_layer == layer) if (composite_layer == layer)
composite_layer = g_alloca (sizeof (gfloat) * 4 * samples); composite_layer = g_alloca (sizeof (gfloat) * 4 * samples);