diff options
author | William Wilgus <me.theuser@yahoo.com> | 2021-08-25 13:04:22 +0000 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2021-08-25 13:05:02 +0000 |
commit | dbd051394e530d403573d5a34c737371039c81f3 (patch) | |
tree | 90cb5f55163f3b5b9faf801568ad9e0c747a6825 /firmware/drivers/lcd-16bit-common.c | |
parent | 97b0e5b5a167caa0eedd01c2acbed0916ee696ba (diff) | |
download | rockbox-dbd051394e530d403573d5a34c737371039c81f3.tar.gz rockbox-dbd051394e530d403573d5a34c737371039c81f3.zip |
Revert "lcd_putsxyofs 16 bit lcd_mono_bitmap_part [AS]"
This reverts commit 49edfc237ba9ae27eee5e915e86989d9ee01b1da.
Reason for revert: font rendering bug, https://gist.github.com/amachronic/5fa75da280432127de4b44ee2d760281
Change-Id: I13b5f0eedb2926bce67051c8f0bb2ae5dea9f299
Diffstat (limited to 'firmware/drivers/lcd-16bit-common.c')
-rw-r--r-- | firmware/drivers/lcd-16bit-common.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-16bit-common.c b/firmware/drivers/lcd-16bit-common.c index dbfea50dd7..5ec142c855 100644 --- a/firmware/drivers/lcd-16bit-common.c +++ b/firmware/drivers/lcd-16bit-common.c | |||
@@ -341,18 +341,12 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x, | |||
341 | if (y + height > LCD_HEIGHT) | 341 | if (y + height > LCD_HEIGHT) |
342 | height = LCD_HEIGHT - y; | 342 | height = LCD_HEIGHT - y; |
343 | #endif | 343 | #endif |
344 | |||
344 | src += stride * (src_y >> 3) + src_x; /* move starting point */ | 345 | src += stride * (src_y >> 3) + src_x; /* move starting point */ |
345 | src_y &= 7; | 346 | src_y &= 7; |
346 | src_end = src + width; | 347 | src_end = src + width; |
347 | dst_col = FBADDR(x, y); | 348 | dst_col = FBADDR(x, y); |
348 | 349 | ||
349 | /* 'Bugfix' mono_bitmap_part reads ahead in the buffer, | ||
350 | * if the height is <= char bit pixels other memory gets read | ||
351 | * the other option is to check in the hot code path but this appears | ||
352 | * sufficient | ||
353 | */ | ||
354 | if (height <= CHAR_BIT) | ||
355 | stride = 0; | ||
356 | 350 | ||
357 | if (drmode & DRMODE_INVERSEVID) | 351 | if (drmode & DRMODE_INVERSEVID) |
358 | { | 352 | { |
@@ -468,7 +462,14 @@ void ICODE_ATTR lcd_mono_bitmap_part(const unsigned char *src, int src_x, | |||
468 | /* Draw a full monochrome bitmap */ | 462 | /* Draw a full monochrome bitmap */ |
469 | void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, int height) | 463 | void lcd_mono_bitmap(const unsigned char *src, int x, int y, int width, int height) |
470 | { | 464 | { |
471 | lcd_mono_bitmap_part(src, 0, 0, width, x, y, width, height); | 465 | int stride = width; |
466 | |||
467 | /* 'Bugfix' mono_bitmap_part reads ahead in the buffer, | ||
468 | * if the height is <= char bit pixels other memory gets read | ||
469 | */ | ||
470 | if (height <= CHAR_BIT) | ||
471 | stride = 0; | ||
472 | lcd_mono_bitmap_part(src, 0, 0, stride, x, y, width, height); | ||
472 | } | 473 | } |
473 | 474 | ||
474 | 475 | ||