Merge pull request #2716 from jepler/pixelbuf-subscr

tannewt · web-flow · commit 98f5cf25a5a3 · 2020-03-19T10:02:08.000-07:00
Pixelbuf: subscr: Get correct pixel value
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
@@ -243,6 +243,7 @@ mp_obj_t common_hal__pixelbuf_pixelbuf_get_pixel(mp_obj_t self_in, size_t index)
     if (self->pre_brightness_buffer != NULL) {
         pixel_buffer = self->pre_brightness_buffer;
     }
+    pixel_buffer += self->byteorder.bpp * index;
 
     pixelbuf_rgbw_t *rgbw_order = &self->byteorder.byteorder;
     elems[0] = MP_OBJ_NEW_SMALL_INT(pixel_buffer[rgbw_order->r]);

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ mp_obj_t common_hal__pixelbuf_pixelbuf_get_pixel(mp_obj_t self_in, size_t index)`
`243`	`243`	`if (self->pre_brightness_buffer != NULL) {`
`244`	`244`	`pixel_buffer = self->pre_brightness_buffer;`
`245`	`245`	`}`
	`246`	`+ pixel_buffer += self->byteorder.bpp * index;`
`246`	`247`
`247`	`248`	`pixelbuf_rgbw_t *rgbw_order = &self->byteorder.byteorder;`
`248`	`249`	`elems[0] = MP_OBJ_NEW_SMALL_INT(pixel_buffer[rgbw_order->r]);`