len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some build errors and warnings.

Browse source 
Change-Id: I149c00fc6ba47d5134ad4f74c364bffd24079824
This commit is contained in:
Thomas Martitz 2014-06-21 00:49:05 +02:00
parent dbb76896ec
commit 8f6c779ff6
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/logo.c
View file

@ -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); rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
#ifdef REMOTE_LOGO #ifdef REMOTE_LOGO
rb->lcd_remote_clear_display(); 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), (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH),
(y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);

4
apps/recorder/bmp.c
View file

@ -600,9 +600,7 @@ int read_bmp_fd(int fd,
resize &= ~IMG_RESIZE; resize &= ~IMG_RESIZE;
resize |= IMG_NORESIZE; resize |= IMG_NORESIZE;
#endif #endif
#ifdef HAVE_REMOTE_LCD
remote = false; remote = false;
#endif
} }
#elif !defined(PLUGIN) #elif !defined(PLUGIN)
if (src_dim.width > BM_MAX_WIDTH) if (src_dim.width > BM_MAX_WIDTH)
@ -652,9 +650,7 @@ int read_bmp_fd(int fd,
totalsize = cformat->get_size(bm); totalsize = cformat->get_size(bm);
else { else {
totalsize = BM_SIZE(bm->width,bm->height,format,remote); totalsize = BM_SIZE(bm->width,bm->height,format,remote);
#ifdef HAVE_REMOTE_LCD
if (!remote) if (!remote)
#endif
if (depth == 32 && read_alpha) /* account for possible 4bit alpha per pixel */ if (depth == 32 && read_alpha) /* account for possible 4bit alpha per pixel */
totalsize += alphasize; totalsize += alphasize;
} }

10
firmware/drivers/lcd-16bit-vert.c
View file

@ -41,6 +41,16 @@
#define ROW_INC 1 #define ROW_INC 1
#define COL_INC LCD_HEIGHT #define COL_INC LCD_HEIGHT
extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_backdrop[];
extern lcd_fastpixelfunc_type* const lcd_fastpixelfuncs_bgcolor[];
static void ICODE_ATTR lcd_alpha_bitmap_part_mix(const fb_data* image,
const unsigned char *src, int src_x,
int src_y, int x, int y,
int width, int height,
int stride_image, int stride_src);
#include "lcd-color-common.c"
#include "lcd-16bit-common.c" #include "lcd-16bit-common.c"
#include "lcd-bitmap-common.c" #include "lcd-bitmap-common.c"

2
firmware/drivers/lcd-24bit.c
View file

@ -189,7 +189,7 @@ void lcd_fillrect(int x, int y, int width, int height)
enum fill_opt fillopt = OPT_NONE; enum fill_opt fillopt = OPT_NONE;
fb_data *dst, *dst_end; fb_data *dst, *dst_end;
int len, step; int len, step;
fb_data bits = { 0 }; fb_data bits = { 0, 0, 0 };
/******************** In viewport clipping **********************/ /******************** In viewport clipping **********************/
/* nothing to draw? */ /* nothing to draw? */