diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
index a41b5007c2..1997076514 100644
--- a/shared-module/bitmaptools/__init__.c
+++ b/shared-module/bitmaptools/__init__.c
@@ -361,14 +361,12 @@ void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, pyb_file_obj_t* f
         if (swap_bytes) {
             switch(element_size) {
             case 2:
-                {
-                    for(int i=0; i< rowsize_in_u16; i++) {
-                        rowdata16[i] = __builtin_bswap16(rowdata16[i]);
-                    }
+                for(size_t i=0; i< rowsize_in_u16; i++) {
+                    rowdata16[i] = __builtin_bswap16(rowdata16[i]);
                 }
                 break;
             case 4:
-                for(int i=0; i< rowsize_in_u32; i++) {
+                for(size_t i=0; i< rowsize_in_u32; i++) {
                     rowdata32[i] = __builtin_bswap32(rowdata32[i]);
                 }
             default: