summaryrefslogtreecommitdiff
path: root/shared-module/displayio/TileGrid.c
diff options
context:
space:
mode:
authorsommersoft <sommersoft@gmail.com>2019-08-29 22:14:53 -0500
committersommersoft <sommersoft@gmail.com>2019-08-29 22:14:53 -0500
commit8120f5cdad2d249a4cec9e37db73be6b240bacc3 (patch)
tree13ece9c4fbc43dd4625bd97df798cf24479068be /shared-module/displayio/TileGrid.c
parent6a68d0b4d00c0021aa46fe236cba8a6bdfa36437 (diff)
parent2b5ce666be90de7738ed434ba1dde13f67fc30de (diff)
Merge branch 'master' of https://github.com/adafruit/circuitpython into mixer_voice
Diffstat (limited to 'shared-module/displayio/TileGrid.c')
-rw-r--r--shared-module/displayio/TileGrid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index 6144f8f99..f34d2fc52 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -207,7 +207,7 @@ uint8_t common_hal_displayio_tilegrid_get_tile(displayio_tilegrid_t *self, uint1
void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y, uint8_t tile_index) {
if (tile_index >= self->tiles_in_bitmap) {
- mp_raise_ValueError(translate("Tile value out of bounds"));
+ mp_raise_ValueError(translate("Tile index out of bounds"));
}
uint8_t* tiles = self->tiles;
if (self->inline_tiles) {
@@ -443,6 +443,7 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self, const _displayio_c
}
uint8_t shift = (offset % pixels_per_byte) * colorspace->depth;
if (colorspace->reverse_pixels_in_byte) {
+ // Reverse the shift by subtracting it from the leftmost shift.
shift = (pixels_per_byte - 1) * colorspace->depth - shift;
}
((uint8_t*)buffer)[offset / pixels_per_byte] |= pixel << shift;