aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-13 19:13:35 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-14 17:46:21 +0000
commit34f42b3dd638195bc35acdaa87762d0915757eee (patch)
treec5b1d5ae43e3ba9cdc71f2e6b4c3d7d676abeb75
parentrender: don’t assume PIXMAN_a8r8g8b8 for color glyphs (diff)
box-drawing: big-endian support when setting bits manually
-rw-r--r--box-drawing.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/box-drawing.c b/box-drawing.c
index 2eb92efd..b06fc322 100644
--- a/box-drawing.c
+++ b/box-drawing.c
@@ -1244,6 +1244,16 @@ draw_box_drawings_double_vertical_and_horizontal(struct buf *buf)
vline(hmid + 2 * thick, buf->height, vmid + 2 * thick, thick);
}
+static inline void
+set_a1_bit(uint8_t *data, size_t ofs, size_t bit_no)
+{
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ data[ofs] |= 1 << bit_no;
+#else
+ data[ofs] |= 1 << (7 - bit_no);
+#endif
+}
+
static void
draw_box_drawings_light_arc(struct buf *buf, wchar_t wc)
{
@@ -1354,7 +1364,7 @@ draw_box_drawings_light_arc(struct buf *buf, wchar_t wc)
if (fmt == PIXMAN_a1) {
size_t idx = c / 8;
size_t bit_no = c % 8;
- data[r * stride + idx] |= 1 << bit_no;
+ set_a1_bit(data, r * stride + idx, bit_no);
} else
data[r * stride + c] = 0xff;
}
@@ -1376,7 +1386,7 @@ draw_box_drawings_light_arc(struct buf *buf, wchar_t wc)
if (fmt == PIXMAN_a1) {
size_t ofs = col / 8;
size_t bit_no = col % 8;
- data[row * stride + ofs] |= 1 << bit_no;
+ set_a1_bit(data, row * stride + ofs, bit_no);
} else
data[row * stride + col] = 0xff;
}
@@ -1392,7 +1402,7 @@ draw_box_drawings_light_arc(struct buf *buf, wchar_t wc)
if (fmt == PIXMAN_a1) {
size_t ofs = col / 8;
size_t bit_no = col % 8;
- data[row * stride + ofs] |= 1 << bit_no;
+ set_a1_bit(data, row * stride + ofs, bit_no);
} else
data[row * stride + col] = 0xff;
}
@@ -1767,7 +1777,7 @@ draw_light_shade(struct buf *buf)
for (size_t col = 0; col < buf->width; col += 2) {
size_t idx = col / 8;
size_t bit_no = col % 8;
- buf->data[row * buf->stride + idx] |= 1 << bit_no;
+ set_a1_bit(buf->data, row * buf->stride + idx, bit_no);
}
}
}
@@ -1790,7 +1800,7 @@ draw_medium_shade(struct buf *buf)
for (size_t col = row % 2; col < buf->width; col += 2) {
size_t idx = col / 8;
size_t bit_no = col % 8;
- buf->data[row * buf->stride + idx] |= 1 << bit_no;
+ set_a1_bit(buf->data, row * buf->stride + idx, bit_no);
}
}
}
@@ -1813,7 +1823,7 @@ draw_dark_shade(struct buf *buf)
for (size_t col = 0; col < buf->width; col += 1 + row % 2) {
size_t idx = col / 8;
size_t bit_no = col % 8;
- buf->data[row * buf->stride + idx] |= 1 << bit_no;
+ set_a1_bit(buf->data, row * buf->stride + idx, bit_no);
}
}
}