app: in gimp_composite_blend(), avoid another alloca when doing in-place output

2017-01-21 06:52:12 -05:00
parent 4d985d11df
commit fb3b99553c
1 changed files with 9 additions and 4 deletions
--- a/app/operations/layer-modes/gimpblendcomposite.h
+++ b/app/operations/layer-modes/gimpblendcomposite.h
@ -294,9 +294,14 @@ gimp_composite_blend (gfloat                 *in,
    blend_out = g_alloca (sizeof (gfloat) * 4 * samples);

  if (fish_to_blend)
+    {
+      if (! (blend_in == out &&
+             composite_trc != GIMP_LAYER_COLOR_SPACE_RGB_LINEAR))
        {
          blend_in = g_alloca (sizeof (gfloat) * 4 * samples);
+        }
      blend_layer  = g_alloca (sizeof (gfloat) * 4 * samples);
+
      babl_process (fish_to_blend, in,    blend_in,    samples);
      babl_process (fish_to_blend, layer, blend_layer, samples);
    }