From c592a2b4db112a512b6519fd79f22943b96db40a Mon Sep 17 00:00:00 2001
From: George Waters <gwatersdev@gmail.com>
Date: Fri, 22 May 2020 21:19:17 -0400
Subject: [PATCH] Simplify pixelbuf set_pixels function

---
 shared-bindings/_pixelbuf/PixelBuf.c |  2 +-
 shared-bindings/_pixelbuf/PixelBuf.h |  2 +-
 shared-module/_pixelbuf/PixelBuf.c   | 16 ++++------------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index be2b2b086e..601c841e33 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -340,7 +340,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
                                                    slice_len, num_items);
             }
 
-            common_hal__pixelbuf_pixelbuf_set_pixels(self_in, slice.start, slice.stop, slice.step, src_objs);
+            common_hal__pixelbuf_pixelbuf_set_pixels(self_in, slice.start, slice.step, slice_len, src_objs);
             return mp_const_none;
             #else
             return MP_OBJ_NULL; // op not supported
diff --git a/shared-bindings/_pixelbuf/PixelBuf.h b/shared-bindings/_pixelbuf/PixelBuf.h
index 9e14b96679..14ee2e900b 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.h
+++ b/shared-bindings/_pixelbuf/PixelBuf.h
@@ -47,6 +47,6 @@ void common_hal__pixelbuf_pixelbuf_fill(mp_obj_t self, mp_obj_t item);
 void common_hal__pixelbuf_pixelbuf_show(mp_obj_t self);
 mp_obj_t common_hal__pixelbuf_pixelbuf_get_pixel(mp_obj_t self, size_t index);
 void common_hal__pixelbuf_pixelbuf_set_pixel(mp_obj_t self, size_t index, mp_obj_t item);
-void common_hal__pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, mp_int_t start, mp_int_t stop, mp_int_t step, mp_obj_t* values);
+void common_hal__pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t* values);
 
 #endif  // CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index 4c61a170d0..f9a3b54a4e 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -216,19 +216,11 @@ void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t* self, size_t index, mp_obj_t v
     _pixelbuf_set_pixel_color(self, index, r, g, b, w);
 }
 
-void common_hal__pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, mp_int_t start, mp_int_t stop, mp_int_t step, mp_obj_t* values) {
+void common_hal__pixelbuf_pixelbuf_set_pixels(mp_obj_t self_in, size_t start, mp_int_t step, size_t slice_len, mp_obj_t* values) {
     pixelbuf_pixelbuf_obj_t* self = native_pixelbuf(self_in);
-    size_t source_i = 0;
-    if (step > 0) {
-        for (mp_int_t target_i = start; target_i < stop; target_i += step) {
-            _pixelbuf_set_pixel(self, target_i, values[source_i]);
-            source_i++;
-        }
-    } else {
-        for (mp_int_t target_i = start; target_i >= stop; target_i += step) {
-            _pixelbuf_set_pixel(self, target_i, values[source_i]);
-            source_i++;
-        }
+    for (size_t i = 0; i < slice_len; i++) {
+        _pixelbuf_set_pixel(self, start, values[i]);
+        start+=step;
     }
     if (self->auto_write) {
         common_hal__pixelbuf_pixelbuf_show(self_in);