From a5f505241d7f157a597981a8d82d1563bab9041a Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 9 Mar 2025 19:36:50 -0500
Subject: [PATCH] tidy some build errors

---
 src/include/piomatter/matrixmap.h | 9 +++++----
 src/include/piomatter/render.h    | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/include/piomatter/matrixmap.h b/src/include/piomatter/matrixmap.h
index cc64c05..1a2408a 100644
--- a/src/include/piomatter/matrixmap.h
+++ b/src/include/piomatter/matrixmap.h
@@ -88,12 +88,12 @@ struct schedule_entry {
 using schedule = std::vector<schedule_entry>;
 using schedule_sequence = std::vector<schedule>;
 
-schedule_sequence make_simple_schedule(int n_planes, int pixels_across) {
+schedule_sequence make_simple_schedule(int n_planes, size_t pixels_across) {
     if (n_planes < 1 || n_planes > 10) {
         throw std::range_error("n_planes out of range");
     }
     schedule result;
-    uint32_t max_count = 1 << n_planes;
+    size_t max_count = 1 << n_planes;
     while (max_count < pixels_across)
         max_count <<= 1;
 
@@ -106,7 +106,8 @@ schedule_sequence make_simple_schedule(int n_planes, int pixels_across) {
 // Make a temporal dither schedule. All the top `n_planes` are shown everytime,
 // but the lowest frames are done in a cycle of `n_temporal_frames`:
 //   2: {0, 1}; 4: {0, 1, 2, 3}
-schedule_sequence make_temporal_dither_schedule(int n_planes, int pixels_across,
+schedule_sequence make_temporal_dither_schedule(int n_planes,
+                                                size_t pixels_across,
                                                 int n_temporal_planes) {
     if (n_planes < 1 || n_planes > 10) {
         throw std::range_error("n_planes out of range");
@@ -181,8 +182,8 @@ struct matrix_geometry {
     }
 
     size_t pixels_across, n_addr_lines, n_lanes;
-    schedule_sequence schedules;
     size_t width, height;
     matrix_map map;
+    schedule_sequence schedules;
 };
 } // namespace piomatter
diff --git a/src/include/piomatter/render.h b/src/include/piomatter/render.h
index 1d94586..1758abf 100644
--- a/src/include/piomatter/render.h
+++ b/src/include/piomatter/render.h
@@ -187,7 +187,6 @@ void protomatter_render_rgb10(std::vector<uint32_t> &result,
     // address)
 
     const size_t n_addr = 1u << matrixmap.n_addr_lines;
-    constexpr size_t n_bits = 10u;
     const size_t pixels_across = matrixmap.pixels_across;
 
     size_t prev_addr = n_addr - 1;