summaryrefslogtreecommitdiff
path: root/shared-module/displayio
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2018-10-02 18:06:52 -0700
committerScott Shawcroft <scott@tannewt.org>2018-10-05 15:12:23 -0700
commit76008ce304e09394733a10d56b944218b41630ca (patch)
treef111205ae7dd7dadd9a3d978e55f3012f20f3969 /shared-module/displayio
parent7b95818c4f456736a8737e40c37d5555855f51a6 (diff)
Introduce audioio.Mixer which can mix multiple audio samples
to produce a single sample. Only works with 16 bit samples on the M4. Fixes #987
Diffstat (limited to 'shared-module/displayio')
-rw-r--r--shared-module/displayio/Sprite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-module/displayio/Sprite.c b/shared-module/displayio/Sprite.c
index 4fe8d1ff6..87600f721 100644
--- a/shared-module/displayio/Sprite.c
+++ b/shared-module/displayio/Sprite.c
@@ -68,7 +68,7 @@ bool displayio_sprite_get_pixel(displayio_sprite_t *self, int16_t x, int16_t y,
if (y < 0 || y >= self->height || x >= self->width || x < 0) {
return false;
}
- uint32_t value;
+ uint32_t value = 0;
if (MP_OBJ_IS_TYPE(self->bitmap, &displayio_bitmap_type)) {
value = common_hal_displayio_bitmap_get_pixel(self->bitmap, x, y);
} else if (MP_OBJ_IS_TYPE(self->bitmap, &displayio_ondiskbitmap_type)) {