summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-06-21 00:49:05 +0200
committerThomas Martitz <kugel@rockbox.org>2014-06-21 00:49:05 +0200
commit8f6c779ff6b1c738e13ba32da8dfb736b8df4abd (patch)
tree238c7bd23c5a4942a00949cb12bb148a74d647e3 /apps
parentdbb76896ec5a7d698bed16bb218ae8df51b3d961 (diff)
downloadrockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.tar.gz
rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.zip
Fix some build errors and warnings.
Change-Id: I149c00fc6ba47d5134ad4f74c364bffd24079824
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/logo.c2
-rw-r--r--apps/recorder/bmp.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index a7257fae4b..e1c570b6a5 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -104,7 +104,7 @@ enum plugin_status plugin_start(const void* parameter) {
104 rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); 104 rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
105#ifdef REMOTE_LOGO 105#ifdef REMOTE_LOGO
106 rb->lcd_remote_clear_display(); 106 rb->lcd_remote_clear_display();
107 rb->lcd_remote_bitmap((const fb_data*)REMOTE_LOGO, 107 rb->lcd_remote_bitmap((const fb_remote_data*)REMOTE_LOGO,
108 (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), 108 (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH),
109 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), 109 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
110 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); 110 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index a9cc34b2c6..8d49fd7582 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -600,9 +600,7 @@ int read_bmp_fd(int fd,
600 resize &= ~IMG_RESIZE; 600 resize &= ~IMG_RESIZE;
601 resize |= IMG_NORESIZE; 601 resize |= IMG_NORESIZE;
602#endif 602#endif
603#ifdef HAVE_REMOTE_LCD
604 remote = false; 603 remote = false;
605#endif
606 } 604 }
607#elif !defined(PLUGIN) 605#elif !defined(PLUGIN)
608 if (src_dim.width > BM_MAX_WIDTH) 606 if (src_dim.width > BM_MAX_WIDTH)
@@ -652,9 +650,7 @@ int read_bmp_fd(int fd,
652 totalsize = cformat->get_size(bm); 650 totalsize = cformat->get_size(bm);
653 else { 651 else {
654 totalsize = BM_SIZE(bm->width,bm->height,format,remote); 652 totalsize = BM_SIZE(bm->width,bm->height,format,remote);
655#ifdef HAVE_REMOTE_LCD
656 if (!remote) 653 if (!remote)
657#endif
658 if (depth == 32 && read_alpha) /* account for possible 4bit alpha per pixel */ 654 if (depth == 32 && read_alpha) /* account for possible 4bit alpha per pixel */
659 totalsize += alphasize; 655 totalsize += alphasize;
660 } 656 }