[gegl] Simplify GEGL_ABYSS_BLACK/_WHITE paths



commit f1bd9bdbc5c4a4b7489d4614e62d38794127573b
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Tue Oct 22 22:16:08 2013 -0700

    Simplify GEGL_ABYSS_BLACK/_WHITE paths

 gegl/buffer/gegl-buffer-access.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer-access.c b/gegl/buffer/gegl-buffer-access.c
index 42c3f28..0a5c9ed 100644
--- a/gegl/buffer/gegl-buffer-access.c
+++ b/gegl/buffer/gegl-buffer-access.c
@@ -1209,18 +1209,24 @@ gegl_buffer_iterate_read_dispatch (GeglBuffer          *buffer,
       gegl_buffer_iterate_read_abyss_none (buffer, &roi_factored, &abyss_factored,
                                            buf, rowstride, format, level);
     }
-  else if (repeat_mode == GEGL_ABYSS_WHITE ||
-           repeat_mode == GEGL_ABYSS_BLACK)
+  else if (repeat_mode == GEGL_ABYSS_WHITE)
     {
-      gfloat color_a[4] = {0.0, 0.0, 0.0, 1.0};
       guchar color[128];
-      gint   i;
+      gfloat in_color[] = {1.0f, 1.0f, 1.0f, 1.0f};
 
-      if (repeat_mode == GEGL_ABYSS_WHITE)
-        for (i = 0; i < 3; i++)
-          color_a[i] = 1.0;
       babl_process (babl_fish (babl_format ("RGBA float"), format),
-                    color_a, color, 1);
+                    in_color, color, 1);
+
+      gegl_buffer_iterate_read_abyss_color (buffer, &roi_factored, &abyss_factored,
+                                            buf, rowstride, format, level, color);
+    }
+  else if (repeat_mode == GEGL_ABYSS_BLACK)
+    {
+      guchar color[128];
+      gfloat  in_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
+
+      babl_process (babl_fish (babl_format ("RGBA float"), format),
+                    in_color, color, 1);
 
       gegl_buffer_iterate_read_abyss_color (buffer, &roi_factored, &abyss_factored,
                                             buf, rowstride, format, level, color);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]