[gimp/soc-2011-seamless-clone2] app: fix GimpScanConvert compositing (as opposed to replacing)

[Clayton Walker <claytonw src gnome org>]

commit 2329cf2d4764eb51fcc4c9582817b7070f7520ac
Author: Michael Natterer <mitch gimp org>
Date:   Mon Apr 29 23:58:44 2013 +0200

    app: fix GimpScanConvert compositing (as opposed to replacing)
    
    It's only used in the foreground select tool so nobody noticed
    that it was broken.

 app/core/gimpscanconvert.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c
index 662f5a6..f5414e5 100644
--- a/app/core/gimpscanconvert.c
+++ b/app/core/gimpscanconvert.c
@@ -480,7 +480,7 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
   bpp    = babl_format_get_bytes_per_pixel (format);
 
   iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
-                                   GEGL_BUFFER_WRITE, GEGL_ABYSS_NONE);
+                                   GEGL_BUFFER_READWRITE, GEGL_ABYSS_NONE);
   roi = &iter->roi[0];
 
   while (gegl_buffer_iterator_next (iter))
@@ -497,14 +497,13 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
        */
       if (roi->width * bpp != stride)
         {
-          const guchar *src = data;
-          guchar       *dest;
-
-          dest = tmp_buf = g_alloca (stride * roi->height);
+          tmp_buf = g_alloca (stride * roi->height);
 
           if (! replace)
             {
-              gint i;
+              const guchar *src  = data;
+              guchar       *dest = tmp_buf;
+              gint          i;
 
               for (i = 0; i < roi->height; i++)
                 {
@@ -574,8 +573,8 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
 
       if (tmp_buf)
         {
-          guchar       *dest = data;
           const guchar *src  = tmp_buf;
+          guchar       *dest = data;
           gint          i;
 
           for (i = 0; i < roi->height; i++)