[gegl] buffer: fix single-column case of gegl_buffer_{get,set}()

[N/A <ell src gnome org>]

commit 7bab2a7433889758649eccd77a03305ee652bc27
Author: Ell <ell_se yahoo com>
Date:   Tue Mar 13 06:01:10 2018 -0400

    buffer: fix single-column case of gegl_buffer_{get,set}()
    
    In the single-column case of gegl_buffer_get(), compare the output
    rowstride to the output format's bpp, rather than the buffer
    format's bpp, when deciding if to use the optimized path.
    
    In the single-column case of gegl_buffer_set(), only take the
    optimized path when the input rowstride equals the input format's
    bpp, fix the temp-buffer's rowstride in the call to
    _gegl_buffer_set_with_flags(), and return after it to avoid re-
    writing to the buffer.

 gegl/buffer/gegl-buffer-access.c |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index 06f62a3..93335cf 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -1826,18 +1826,17 @@ gegl_buffer_set (GeglBuffer          *buffer,
                                   GEGL_BUFFER_SET_FLAG_NOTIFY);
           return;
         }
-      else
+      else if (buffer->soft_format != format &&
+               rowstride == babl_format_get_bytes_per_pixel (format))
         {
-          int bpp = babl_format_get_bytes_per_pixel (buffer->soft_format);
-          if (buffer->soft_format != format)
-            {
-              uint8_t tmp[rect->width * rect->height * bpp];
-              babl_process (babl_fish (format, buffer->soft_format),
-                            src, &tmp[0], rect->height);
-              _gegl_buffer_set_with_flags (buffer, rect, level, buffer->soft_format, tmp, rowstride,
-                        GEGL_BUFFER_SET_FLAG_LOCK|
-                        GEGL_BUFFER_SET_FLAG_NOTIFY);
-            }
+          int     bpp = babl_format_get_bytes_per_pixel (buffer->soft_format);
+          uint8_t tmp[rect->height * bpp];
+          babl_process (babl_fish (format, buffer->soft_format),
+                        src, &tmp[0], rect->height);
+          _gegl_buffer_set_with_flags (buffer, rect, level, buffer->soft_format, tmp, bpp,
+                                       GEGL_BUFFER_SET_FLAG_LOCK|
+                                       GEGL_BUFFER_SET_FLAG_NOTIFY);
+          return;
         }
     }
 
@@ -1906,16 +1905,14 @@ _gegl_buffer_get_unlocked (GeglBuffer          *buffer,
       {
         gegl_buffer_get_pixel (buffer, rect->x, rect->y, format, dest_buf,
                                repeat_mode);
-        return;
       }
     else
       {
-        gint bpp = babl_format_get_bytes_per_pixel (buffer->soft_format);
-
         if (format == NULL)
           format = buffer->soft_format;
 
-        if (!format || buffer->soft_format == format || rowstride != bpp)
+        if (buffer->soft_format == format ||
+            rowstride != babl_format_get_bytes_per_pixel (format))
         {
           gegl_buffer_iterate_read_dispatch (buffer, rect, dest_buf,
                                              rowstride, format, 0, repeat_mode);
@@ -1923,6 +1920,7 @@ _gegl_buffer_get_unlocked (GeglBuffer          *buffer,
         else
         {
           /* first fetch all pixels to a temporary buffer */
+          gint    bpp = babl_format_get_bytes_per_pixel (buffer->soft_format);
           uint8_t tmp[rect->height * bpp];
           gegl_buffer_iterate_read_dispatch (buffer, rect, &tmp[0],
                                              bpp, buffer->soft_format, 0, repeat_mode);
@@ -1930,8 +1928,8 @@ _gegl_buffer_get_unlocked (GeglBuffer          *buffer,
           babl_process (babl_fish (buffer->soft_format, format),
                         &tmp[0], dest_buf, rect->height);
         }
-        return;
       }
+    return;
   }
 
   g_return_if_fail (scale > 0.0f);