Merge pull request #2936 from dunkmann00/pixelbuf-slice-fix

jepler · web-flow · commit 54a38fdf018f · 2020-05-20T19:15:10.000-05:00
Fix error when getting a pixelbuf slice
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -311,7 +311,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             }
             mp_obj_tuple_t* t = MP_OBJ_TO_PTR(mp_obj_new_tuple(len, NULL));
             for (uint i = 0; i < len; i++) {
-                t->items[i] = common_hal__pixelbuf_pixelbuf_get_pixel(self_in, i * slice.step);
+                t->items[i] = common_hal__pixelbuf_pixelbuf_get_pixel(self_in, i * slice.step + slice.start);
             }
             return MP_OBJ_FROM_PTR(t);
         } else { // Set

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp`
`311`	`311`	`}`
`312`	`312`	`mp_obj_tuple_t* t = MP_OBJ_TO_PTR(mp_obj_new_tuple(len, NULL));`
`313`	`313`	`for (uint i = 0; i < len; i++) {`
`314`		`- t->items[i] = common_hal__pixelbuf_pixelbuf_get_pixel(self_in, i * slice.step);`
	`314`	`+ t->items[i] = common_hal__pixelbuf_pixelbuf_get_pixel(self_in, i * slice.step + slice.start);`
`315`	`315`	`}`
`316`	`316`	`return MP_OBJ_FROM_PTR(t);`
`317`	`317`	`} else { // Set`