summaryrefslogtreecommitdiff
path: root/extmod
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-01-10 15:57:04 -0800
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-01-12 12:46:18 -0800
commitcea5503ca006c712c007ad6d38c140c4ac241638 (patch)
treee7312e65bd59a2f81d3ea7c42eee7b4832295d7c /extmod
parentdfb61f01dbd1d580ff11503f531bb5972cbbd433 (diff)
Fixup warnings from merge about undefined macro values, switch to
VM keyboard exception and switch to FATFS reader.
Diffstat (limited to 'extmod')
-rw-r--r--extmod/modframebuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index d6e686e07..22841102f 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -353,7 +353,7 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
int cx1 = x1;
for (int cx0 = x0; cx0 < x0end; ++cx0) {
color = getpixel(source, cx1, y1);
- if (color != key) {
+ if (key == -1 || color != (uint32_t)key) {
setpixel(self, cx0, y0, color);
}
++cx1;