diff options
-rw-r--r-- | apps/plugins/lib/gray_putsxy.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 4 | ||||
-rw-r--r-- | firmware/export/font.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/apps/plugins/lib/gray_putsxy.c b/apps/plugins/lib/gray_putsxy.c index 20af8a3cbf..906b0e1b38 100644 --- a/apps/plugins/lib/gray_putsxy.c +++ b/apps/plugins/lib/gray_putsxy.c | |||
@@ -37,7 +37,7 @@ | |||
37 | void gray_putsxy(int x, int y, const unsigned char *str) | 37 | void gray_putsxy(int x, int y, const unsigned char *str) |
38 | { | 38 | { |
39 | int ch, width; | 39 | int ch, width; |
40 | unsigned char *bits; | 40 | const unsigned char *bits; |
41 | struct font *pf = _graybuf->curfont; | 41 | struct font *pf = _graybuf->curfont; |
42 | 42 | ||
43 | if ((unsigned) x >= (unsigned) _graybuf->width | 43 | if ((unsigned) x >= (unsigned) _graybuf->width |
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index a791a79f4c..584ead91dc 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c | |||
@@ -407,7 +407,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) | |||
407 | if (width > 0) | 407 | if (width > 0) |
408 | { | 408 | { |
409 | unsigned int i; | 409 | unsigned int i; |
410 | unsigned char* bits = pf->bits + | 410 | const unsigned char* bits = pf->bits + |
411 | (pf->offset ? pf->offset[ch] : (pf->height * ch)); | 411 | (pf->offset ? pf->offset[ch] : (pf->height * ch)); |
412 | 412 | ||
413 | if (ofs != 0) | 413 | if (ofs != 0) |
@@ -416,7 +416,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) | |||
416 | { | 416 | { |
417 | lcd_bitmap (bits + ofs, x, y + i, width, | 417 | lcd_bitmap (bits + ofs, x, y + i, width, |
418 | MIN(8, pf->height - i), true); | 418 | MIN(8, pf->height - i), true); |
419 | bits = (bitmap_t *)((int)bits + gwidth); | 419 | bits += gwidth; |
420 | } | 420 | } |
421 | } | 421 | } |
422 | else | 422 | else |
diff --git a/firmware/export/font.h b/firmware/export/font.h index fff7d05c0b..eeb8a36bf8 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
@@ -97,7 +97,6 @@ struct font { | |||
97 | const unsigned short *offset; /* offsets into bitmap data*/ | 97 | const unsigned short *offset; /* offsets into bitmap data*/ |
98 | const unsigned char *width; /* character widths or NULL if fixed*/ | 98 | const unsigned char *width; /* character widths or NULL if fixed*/ |
99 | int defaultchar; /* default char (not glyph index)*/ | 99 | int defaultchar; /* default char (not glyph index)*/ |
100 | long bits_size; /* # words of bitmap_t bits*/ | ||
101 | }; | 100 | }; |
102 | 101 | ||
103 | /* font routines*/ | 102 | /* font routines*/ |