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 /firmware/drivers/lcd-bitmap-common.c | |
| parent | b02c82e10529f2750103e31285500e927ec37a7c (diff) | |
| download | rockbox-1280f322ecb7973472b6d408aff7e273c517242d.tar.gz rockbox-1280f322ecb7973472b6d408aff7e273c517242d.zip | |
Fix build errors and warnings in the lcd drivers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30940 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-bitmap-common.c')
| -rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 3aa833d6a1..76c4260ec1 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); } |