diff options
| author | wdenk <wdenk> | 2004-10-09 23:25:58 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-10-09 23:25:58 +0000 |
| commit | 8655b6f8603f12099e534a10f7840630b3e93026 (patch) | |
| tree | 3f1011e28807fbeb23276d2c21c2aa04a1a3094f /tools/bmp_logo.c | |
| parent | 30d56fae23bf830c9f9817a7f151b248a01ebe96 (diff) | |
| download | olio-uboot-2014.01-8655b6f8603f12099e534a10f7840630b3e93026.tar.xz olio-uboot-2014.01-8655b6f8603f12099e534a10f7840630b3e93026.zip | |
* Clean up tools/bmp_logo.c to not add trailing white space
* Patch by Hinko Kocevar, 21 Aug 2004:
- Group common framebuffer functions in common/lcd.c
- Group common framebuffer macros and #defines in include/lcd.h
- Provide calc_fbsize() for video ATAG
Diffstat (limited to 'tools/bmp_logo.c')
| -rw-r--r-- | tools/bmp_logo.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tools/bmp_logo.c b/tools/bmp_logo.c index c473baa0d..8e728e23c 100644 --- a/tools/bmp_logo.c +++ b/tools/bmp_logo.c @@ -120,25 +120,13 @@ int main (int argc, char *argv[]) b->palette[(int)(i*3+0)] = fgetc(fp); x=fgetc(fp); -#if 0 - if ((i%4) == 0) - putchar ('\t'); - printf ("0x%02X, 0x%02X, 0x%02X,%s", - b->palette[(int)(i*3+0)], - b->palette[(int)(i*3+1)], - b->palette[(int)(i*3+2)], - ((i%4) == 3) ? "\n" : " " - ); -#else - if ((i%8) == 0) - putchar ('\t'); - printf ("0x0%X%X%X,%s", + printf ("%s0x0%X%X%X,%s", + ((i%8) == 0) ? "\t" : " ", (b->palette[(int)(i*3+0)] >> 4) & 0x0F, (b->palette[(int)(i*3+1)] >> 4) & 0x0F, (b->palette[(int)(i*3+2)] >> 4) & 0x0F, - ((i%8) == 7) ? "\n" : " " + ((i%8) == 7) ? "\n" : "" ); -#endif } /* read the bitmap; leave room for default color map */ |