From 72e7ffa324f8184cb2d9a5ca9fa620a2a5a56b69 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 22 Aug 2019 16:16:09 -0700
Subject: More cleanup

---
 shared-module/displayio/ColorConverter.c | 1 -
 shared-module/displayio/Group.c          | 3 ---
 shared-module/displayio/OnDiskBitmap.c   | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'shared-module')

diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 0277c79f0..e0c4ca286 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -142,7 +142,6 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
         uint8_t luma = displayio_colorconverter_compute_luma(input_color);
         *output_color = luma >> (8 - colorspace->depth);
         return true;
-    } else if (!colorspace->grayscale && colorspace->depth == 1) {
     }
     return false;
 }
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
index eb6e9a453..38418a029 100644
--- a/shared-module/displayio/Group.c
+++ b/shared-module/displayio/Group.c
@@ -304,9 +304,6 @@ void displayio_group_finish_refresh(displayio_group_t *self) {
 }
 
 displayio_area_t* displayio_group_get_refresh_areas(displayio_group_t *self, displayio_area_t* tail) {
-    if (self->base.type != &displayio_group_type) {
-        asm("bkpt");
-    }
     if (self->item_removed) {
         self->dirty_area.next = tail;
         tail = &self->dirty_area;
diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c
index 10fc0c4a2..993fc03de 100644
--- a/shared-module/displayio/OnDiskBitmap.c
+++ b/shared-module/displayio/OnDiskBitmap.c
@@ -149,10 +149,8 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s
             if (self->bits_per_pixel == 1) {
                 if (index == 1) {
                     return 0xFFFFFF;
-                } else if (index == 0) {
-                    return 0x000000;
                 } else {
-                    asm("bkpt");
+                    return 0x000000;
                 }
             }
             return self->palette_data[index];
-- 
cgit v1.2.3