eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use bitmap.pitch instead of assuming tightly packed rows

Browse Source
This commit is contained in:
jpirnay
2026-04-28 18:14:58 +02:00
parent fd35b50ff9
commit 2694081af9
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/EpdFont/scripts/fontconvert_sdcard.py
+15 -9
View File
@@ -503,15 +503,21 @@ def rasterize_font_style(fontfile, size, intervals, style_id=0, force_autohint=F
# Build 4-bit greyscale bitmap (same logic as fontconvert.py) # Build 4-bit greyscale bitmap (same logic as fontconvert.py)
pixels4g = [] pixels4g = []
px = 0 px = 0
for i, v in enumerate(bitmap.buffer): abs_pitch = abs(bitmap.pitch)
x = i % bitmap.width for y in range(bitmap.rows):
if x % 2 == 0: if bitmap.pitch >= 0:
px = (v >> 4) row_offset = y * abs_pitch
else: else:
px = px | (v & 0xF0) row_offset = (bitmap.rows - 1 - y) * abs_pitch
pixels4g.append(px) for x in range(bitmap.width):
px = 0 v = bitmap.buffer[row_offset + x]
if x == bitmap.width - 1 and bitmap.width % 2 > 0: if x % 2 == 0:
px = (v >> 4)
else:
px = px | (v & 0xF0)
pixels4g.append(px)
px = 0
if bitmap.width % 2 > 0:
pixels4g.append(px) pixels4g.append(px)
px = 0 px = 0
@@ -536,7 +542,7 @@ def rasterize_font_style(fontfile, size, intervals, style_id=0, force_autohint=F
pixels2b.append(px) pixels2b.append(px)
px = 0 px = 0
if (bitmap.width * bitmap.rows) % 4 != 0: if (bitmap.width * bitmap.rows) % 4 != 0:
px = px << (4 - (bitmap.width * bitmap.rows) % 4) * 2 px = px << ((4 - (bitmap.width * bitmap.rows) % 4) * 2)
pixels2b.append(px) pixels2b.append(px)
packed = bytes(pixels2b) packed = bytes(pixels2b)