diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-11-08 22:04:43 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-08 22:04:43 +0000 |
| commit | 1280f322ecb7973472b6d408aff7e273c517242d (patch) | |
| tree | ac89b4aca7dfbae748698d27585b57fcaa0a8fac | |
| parent | b02c82e10529f2750103e31285500e927ec37a7c (diff) | |
| download | rockbox-1280f322ecb7973472b6d408aff7e273c517242d.zip rockbox-1280f322ecb7973472b6d408aff7e273c517242d.tar.gz rockbox-1280f322ecb7973472b6d408aff7e273c517242d.tar.bz2 rockbox-1280f322ecb7973472b6d408aff7e273c517242d.tar.xz | |
Fix build errors and warnings in the lcd drivers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30940 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 8 | ||||
| -rw-r--r-- | firmware/export/lcd.h | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 3aa833d..76c4260 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -513,11 +513,13 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string, void LCDFN(bmp_part)(const struct bitmap* bm, int src_x, int src_y, int x, int y, int width, int height) { - if (bm->format == FORMAT_MONO) - LCDFN(mono_bitmap_part)((FBFN(data)*)(bm->data), +#if LCDM(DEPTH) > 1 + if (bm->format != FORMAT_MONO) + LCDFN(bitmap_part)((FBFN(data)*)(bm->data), src_x, src_y, THIS_STRIDE(bm->width, bm->height), x, y, width, height); else - LCDFN(bitmap_part)((FBFN(data)*)(bm->data), +#endif + LCDFN(mono_bitmap_part)(bm->data, src_x, src_y, THIS_STRIDE(bm->width, bm->height), x, y, width, height); } diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index ad57982..76b8b09 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -546,14 +546,13 @@ extern void lcd_bitmap_transparent_part(const fb_data *src, int height); extern void lcd_bitmap_transparent(const fb_data *src, int x, int y, int width, int height); -extern void lcd_bmp_part(const struct bitmap* bm, int src_x, int src_y, - int x, int y, int width, int height); -extern void lcd_bmp(const struct bitmap* bm, int x, int y); #else /* LCD_DEPTH == 1 */ #define lcd_mono_bitmap lcd_bitmap #define lcd_mono_bitmap_part lcd_bitmap_part #endif /* LCD_DEPTH */ - +extern void lcd_bmp_part(const struct bitmap* bm, int src_x, int src_y, + int x, int y, int width, int height); +extern void lcd_bmp(const struct bitmap* bm, int x, int y); #endif /* HAVE_LCD_BITMAP */ |