diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-06-21 00:49:05 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-06-21 00:49:05 +0200 |
| commit | 8f6c779ff6b1c738e13ba32da8dfb736b8df4abd (patch) | |
| tree | 238c7bd23c5a4942a00949cb12bb148a74d647e3 /apps | |
| parent | dbb76896ec5a7d698bed16bb218ae8df51b3d961 (diff) | |
| download | rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.zip rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.tar.gz rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.tar.bz2 rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.tar.xz | |
Fix some build errors and warnings.
Change-Id: I149c00fc6ba47d5134ad4f74c364bffd24079824
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/logo.c | 2 | ||||
| -rw-r--r-- | apps/recorder/bmp.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index a7257fa..e1c570b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -104,7 +104,7 @@ enum plugin_status plugin_start(const void* parameter) { rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); #ifdef REMOTE_LOGO rb->lcd_remote_clear_display(); - rb->lcd_remote_bitmap((const fb_data*)REMOTE_LOGO, + rb->lcd_remote_bitmap((const fb_remote_data*)REMOTE_LOGO, (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index a9cc34b..8d49fd7 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c @@ -600,9 +600,7 @@ int read_bmp_fd(int fd, resize &= ~IMG_RESIZE; resize |= IMG_NORESIZE; #endif -#ifdef HAVE_REMOTE_LCD remote = false; -#endif } #elif !defined(PLUGIN) if (src_dim.width > BM_MAX_WIDTH) @@ -652,9 +650,7 @@ int read_bmp_fd(int fd, totalsize = cformat->get_size(bm); else { totalsize = BM_SIZE(bm->width,bm->height,format,remote); -#ifdef HAVE_REMOTE_LCD if (!remote) -#endif if (depth == 32 && read_alpha) /* account for possible 4bit alpha per pixel */ totalsize += alphasize; } |