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 | |
parent | dbb76896ec5a7d698bed16bb218ae8df51b3d961 (diff) | |
download | rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.tar.gz rockbox-8f6c779ff6b1c738e13ba32da8dfb736b8df4abd.zip |
Fix some build errors and warnings.
Change-Id: I149c00fc6ba47d5134ad4f74c364bffd24079824
-rw-r--r-- | apps/plugins/logo.c | 2 | ||||
-rw-r--r-- | apps/recorder/bmp.c | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-16bit-vert.c | 10 | ||||
-rw-r--r-- | firmware/drivers/lcd-24bit.c | 2 |
4 files changed, 12 insertions, 6 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 | } |
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c index 1222c12455..ffe2b85b3c 100644 --- a/firmware/drivers/lcd-16bit-vert.c +++ b/firmware/drivers/lcd-16bit-vert.c | |||
@@ -41,6 +41,16 @@ | |||
41 | #define ROW_INC 1 | 41 | #define ROW_INC 1 |
42 | #define COL_INC LCD_HEIGHT | 42 | #define COL_INC LCD_HEIGHT |
43 | 43 | ||
44 | extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_backdrop[]; | ||
45 | extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_bgcolor[]; | ||
46 | |||
47 | static void ICODE_ATTR lcd_alpha_bitmap_part_mix(const fb_data* image, | ||
48 | const unsigned char *src, int src_x, | ||
49 | int src_y, int x, int y, | ||
50 | int width, int height, | ||
51 | int stride_image, int stride_src); | ||
52 | |||
53 | #include "lcd-color-common.c" | ||
44 | #include "lcd-16bit-common.c" | 54 | #include "lcd-16bit-common.c" |
45 | #include "lcd-bitmap-common.c" | 55 | #include "lcd-bitmap-common.c" |
46 | 56 | ||
diff --git a/firmware/drivers/lcd-24bit.c b/firmware/drivers/lcd-24bit.c index f87d63aaa3..092ed9d576 100644 --- a/firmware/drivers/lcd-24bit.c +++ b/firmware/drivers/lcd-24bit.c | |||
@@ -189,7 +189,7 @@ void lcd_fillrect(int x, int y, int width, int height) | |||
189 | enum fill_opt fillopt = OPT_NONE; | 189 | enum fill_opt fillopt = OPT_NONE; |
190 | fb_data *dst, *dst_end; | 190 | fb_data *dst, *dst_end; |
191 | int len, step; | 191 | int len, step; |
192 | fb_data bits = { 0 }; | 192 | fb_data bits = { 0, 0, 0 }; |
193 | 193 | ||
194 | /******************** In viewport clipping **********************/ | 194 | /******************** In viewport clipping **********************/ |
195 | /* nothing to draw? */ | 195 | /* nothing to draw? */ |