diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-04-19 12:47:16 +0000 |
---|---|---|
committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2005-04-19 12:47:16 +0000 |
commit | c6ec0f48a5999c4456439eb4e0b54467b464ed02 (patch) | |
tree | 5ef7e0368a7863c07500f1f89991ae6551c1a530 /firmware/drivers/lcd-h100.c | |
parent | ed0c8764c44ca5d651b08fdd19bb2597f3a8300b (diff) | |
download | rockbox-c6ec0f48a5999c4456439eb4e0b54467b464ed02.tar.gz rockbox-c6ec0f48a5999c4456439eb4e0b54467b464ed02.zip |
moved lcd_getstringsize into font.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6321 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-h100.c')
-rw-r--r-- | firmware/drivers/lcd-h100.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c index d27a62da41..157791d991 100644 --- a/firmware/drivers/lcd-h100.c +++ b/firmware/drivers/lcd-h100.c @@ -319,24 +319,7 @@ void lcd_setfont(int newfont) int lcd_getstringsize(const unsigned char *str, int *w, int *h) { - struct font* pf = font_get(curfont); - int ch; - int width = 0; - - while((ch = *str++)) { - /* check input range*/ - if (ch < pf->firstchar || ch >= pf->firstchar+pf->size) - ch = pf->defaultchar; - ch -= pf->firstchar; - - /* get proportional width and glyph bits*/ - width += pf->width? pf->width[ch]: pf->maxwidth; - } - if ( w ) - *w = width; - if ( h ) - *h = pf->height; - return width; + return font_getstringsize(str, w, h, curfont); } /* put a string at a given char position */ |