add docstring, clean up

caternuson · caternuson · commit dc7574684297 · 2020-04-09T08:59:26.000-07:00
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
@@ -178,9 +178,9 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
     return mp_const_none;
 }
 
-//|   .. method:: fill()
+//|   .. method:: fill(value)
 //|
-//|      Fills the bitmap.
+//|      Fills the bitmap with the supplied palette index value.
 //|
 STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) {
     displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
@@ -164,11 +164,21 @@ void displayio_bitmap_finish_refresh(displayio_bitmap_t *self) {
 }
 
 void common_hal_displayio_bitmap_fill(displayio_bitmap_t *self, uint32_t value) {
+    if (self->read_only) {
+        mp_raise_RuntimeError(translate("Read-only object"));
+    }
+    // Update the dirty area.
+    self->dirty_area.x1 = 0;
+    self->dirty_area.x2 = self->width;
+    self->dirty_area.y1 = 0;
+    self->dirty_area.y2 = self->height;
 
+    // Update our data
+    int32_t row_start;
+    uint32_t bytes_per_value = self->bits_per_value / 8;
     for (uint32_t x=0; x<self->width; x++) {
         for (uint32_t y=0; y<self->height; y++) {
-            int32_t row_start = y * self->stride;
-            uint32_t bytes_per_value = self->bits_per_value / 8;
+            row_start = y * self->stride;
             if (bytes_per_value < 1) {
                 uint32_t bit_position = (sizeof(size_t) * 8 - ((x & self->x_mask) + 1) * self->bits_per_value);
                 uint32_t index = row_start + (x >> self->x_shift);
@@ -188,9 +198,4 @@ void common_hal_displayio_bitmap_fill(displayio_bitmap_t *self, uint32_t value)
             }
         }
     }
-
-    self->dirty_area.x1 = 0;
-    self->dirty_area.x2 = self->width;
-    self->dirty_area.y1 = 0;
-    self->dirty_area.y2 = self->height;
 }
