From c3d0a229ccd859853641d7ee01e7c5c30045159c Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Tue, 19 Apr 2005 12:50:02 +0000 Subject: make use of font_getstringsize git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6322 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-recorder.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index be46d0e367..ea28e5cc2f 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c @@ -367,24 +367,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 */ -- cgit v1.2.3