forked from len0rd/rockbox
Some TAB characters slipped in...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4621 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
2d446fef06
commit
6dc88dca66
2 changed files with 15 additions and 15 deletions
|
|
@ -476,13 +476,13 @@ void lcd_bitmap (unsigned char *src, int x, int y, int nx, int ny,
|
||||||
|
|
||||||
if (!shift && clear) /* shortcut for byte aligned match with clear */
|
if (!shift && clear) /* shortcut for byte aligned match with clear */
|
||||||
{
|
{
|
||||||
while (ny >= 8) /* all full rows */
|
while (ny >= 8) /* all full rows */
|
||||||
{
|
{
|
||||||
memcpy(dst, src, nx);
|
memcpy(dst, src, nx);
|
||||||
src += stride;
|
src += stride;
|
||||||
dst += LCD_WIDTH;
|
dst += LCD_WIDTH;
|
||||||
ny -= 8;
|
ny -= 8;
|
||||||
}
|
}
|
||||||
if (ny == 0) /* nothing left to do? */
|
if (ny == 0) /* nothing left to do? */
|
||||||
return;
|
return;
|
||||||
/* last partial row to do by default routine */
|
/* last partial row to do by default routine */
|
||||||
|
|
@ -506,8 +506,8 @@ void lcd_bitmap (unsigned char *src, int x, int y, int nx, int ny,
|
||||||
/* Loop for each column */
|
/* Loop for each column */
|
||||||
for (x = 0; x < nx; x++)
|
for (x = 0; x < nx; x++)
|
||||||
{
|
{
|
||||||
src_col = src++;
|
src_col = src++;
|
||||||
dst_col = dst++;
|
dst_col = dst++;
|
||||||
data = 0;
|
data = 0;
|
||||||
y = 0;
|
y = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ struct font* font_load(char *path)
|
||||||
/* one-time rotate font bits to rockbox format*/
|
/* one-time rotate font bits to rockbox format*/
|
||||||
rotate_font_bits(pf);
|
rotate_font_bits(pf);
|
||||||
|
|
||||||
return pf; /* success!*/
|
return pf; /* success!*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -309,7 +309,7 @@ static void rotleft(unsigned char *dst, bitmap_t *src, unsigned int width,
|
||||||
unsigned int height)
|
unsigned int height)
|
||||||
{
|
{
|
||||||
unsigned int i,j;
|
unsigned int i,j;
|
||||||
unsigned int src_words; /* # words of input image*/
|
unsigned int src_words; /* # words of input image*/
|
||||||
unsigned int dst_mask; /* bit mask for destination */
|
unsigned int dst_mask; /* bit mask for destination */
|
||||||
bitmap_t src_mask; /* bit mask for source */
|
bitmap_t src_mask; /* bit mask for source */
|
||||||
|
|
||||||
|
|
@ -331,21 +331,21 @@ static void rotleft(unsigned char *dst, bitmap_t *src, unsigned int width,
|
||||||
|
|
||||||
/* if set in input, set in rotated output */
|
/* if set in input, set in rotated output */
|
||||||
if (src[i] & src_mask)
|
if (src[i] & src_mask)
|
||||||
dst[j] |= dst_mask;
|
dst[j] |= dst_mask;
|
||||||
|
|
||||||
src_mask >>= 1; /* next input bit */
|
src_mask >>= 1; /* next input bit */
|
||||||
if (src_mask == 0) /* input word done? */
|
if (src_mask == 0) /* input word done? */
|
||||||
{
|
{
|
||||||
src_mask = 1 << (sizeof (bitmap_t) * 8 - 1);
|
src_mask = 1 << (sizeof (bitmap_t) * 8 - 1);
|
||||||
i++; /* next input word */
|
i++; /* next input word */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dst_mask <<= 1; /* next output bit (row) */
|
dst_mask <<= 1; /* next output bit (row) */
|
||||||
if (dst_mask > (1 << 7)) /* output bit > 7? */
|
if (dst_mask > (1 << 7)) /* output bit > 7? */
|
||||||
{
|
{
|
||||||
dst_mask = 1;
|
dst_mask = 1;
|
||||||
dst += width; /* next output byte row */
|
dst += width; /* next output byte row */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue