lib/fonts: Fix bit position when rotating by 180 degrees
Subsystems (2)
Thomas Zimmermann
maintainerPATCH 1/1 lib/fonts: Fix bit position when rotating by 180 degrees
Fix the horizontal bit position when rotating a glyph by 180°. The original code in rotate_ud() rounded the value in width up to a multiple of 8, aka the bit pitch, and calculated the rotated pixel from that value. The new code stores the glyph's pitch in bit_pitch, but fails to update the rotated pixel's output accordingly. Simply replacing the variable does this.
The bug can be reproduced by setting a font with an unaligned width, such as sun12x22, like this:
setfont sun12x22
echo 2 > /sys/class/graphics/fbcon/rotate
Without the fix, the font looks distorted.
--- lib/fonts/font_rotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/fonts/font_rotate.c +1 -1
@@ -106,7 +106,7 @@ static void __font_glyph_rotate_180(const unsigned char *glyph,for (y =0 ; y < height; y++) {for (x =0 ; x < width; x++) {if (font_glyph_test_bit (glyph, x, y, bit_pitch)) { -font_glyph_set_bit (out, width - (1 + x + shift), height - (1 + y), +font_glyph_set_bit (out, bit_pitch -1 - x - shift, height -1 - y, bit_pitch); } }
Signature · 1 line
2.54.0
Quoted 15 lines · Thomas Zimmermann
Fix the horizontal bit position when rotating a glyph by 180°. The original code in
rotate_ud()rounded the value in width up to a multiple of 8, aka the bit pitch, and calculated the rotated pixel from that value. The new code stores the glyph's pitch inbit_pitch, but fails to update the rotated pixel's output accordingly. Simply replacing the variable does this.The bug can be reproduced by setting a font with an unaligned width, such as sun12x22, like this:
setfont sun12x22
echo 2 >/sys/class/graphics/fbcon/rotateWithout the fix, the font looks distorted.
Quoted 8 lines
Fixes a30e9e6b018f ("lib/fonts: Refactor glyph-rotation helpers")Signed-off-by Thomas Zimmermann <[email protected]>--- lib/fonts/font_rotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
applied.
Thanks!
Helge