len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed pointer types & struct font

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5016 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2004-08-26 22:05:35 +00:00
parent 5d36aaf249
commit f8a5802d8e
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/lib/gray_putsxy.c
View file

@ -37,7 +37,7 @@
void gray_putsxy(int x, int y, const unsigned char *str) void gray_putsxy(int x, int y, const unsigned char *str)
{ {
int ch, width; int ch, width;
unsigned char *bits; const unsigned char *bits;
struct font *pf = _graybuf->curfont; struct font *pf = _graybuf->curfont;
if ((unsigned) x >= (unsigned) _graybuf->width if ((unsigned) x >= (unsigned) _graybuf->width

4
firmware/drivers/lcd-recorder.c
View file

@ -407,7 +407,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
if (width > 0) if (width > 0)
{ {
unsigned int i; unsigned int i;
unsigned char* bits = pf->bits + const unsigned char* bits = pf->bits +
(pf->offset ? pf->offset[ch] : (pf->height * ch)); (pf->offset ? pf->offset[ch] : (pf->height * ch));
if (ofs != 0) if (ofs != 0)
@ -416,7 +416,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
{ {
lcd_bitmap (bits + ofs, x, y + i, width, lcd_bitmap (bits + ofs, x, y + i, width,
MIN(8, pf->height - i), true); MIN(8, pf->height - i), true);
bits = (bitmap_t *)((int)bits + gwidth); bits += gwidth;
} }
} }
else else

1
firmware/export/font.h
View file

@ -97,7 +97,6 @@ struct font {
const unsigned short *offset; /* offsets into bitmap data*/ const unsigned short *offset; /* offsets into bitmap data*/
const unsigned char *width; /* character widths or NULL if fixed*/ const unsigned char *width; /* character widths or NULL if fixed*/
int defaultchar; /* default char (not glyph index)*/ int defaultchar; /* default char (not glyph index)*/
long bits_size; /* # words of bitmap_t bits*/
}; };
/* font routines*/ /* font routines*/