X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tools%2Fbmp_logo.c;h=98be6176675fbd0bba6baf14b8f5ceee6139f388;hb=5720df78ad48cb98cff7cfb816565fb8a5d0d1b6;hp=c473baa0ddfc4704e5bfd4cb48bff830aa8f35e7;hpb=b13fb01a62708492cae4b33c4d6fa9ae127905f4;p=u-boot

diff --git a/tools/bmp_logo.c b/tools/bmp_logo.c
index c473baa0dd..98be617667 100644
--- a/tools/bmp_logo.c
+++ b/tools/bmp_logo.c
@@ -46,7 +46,7 @@ int main (int argc, char *argv[])
 	FILE	*fp;
 	bitmap_t bmp;
 	bitmap_t *b = &bmp;
-	uint16_t n_colors;
+	uint16_t data_offset, n_colors;
 
 	if (argc < 2) {
 		fprintf (stderr, "Usage: %s file\n", argv[0]);
@@ -67,7 +67,9 @@ int main (int argc, char *argv[])
 	 * read width and height of the image, and the number of colors used;
 	 * ignore the rest
 	 */
-	skip_bytes (fp, 16);
+	skip_bytes (fp, 8);
+	fread (&data_offset, sizeof (uint16_t), 1, fp);
+	skip_bytes (fp, 6);
 	fread (&b->width,   sizeof (uint16_t), 1, fp);
 	skip_bytes (fp, 2);
 	fread (&b->height,  sizeof (uint16_t), 1, fp);
@@ -78,6 +80,7 @@ int main (int argc, char *argv[])
 	/*
 	 * Repair endianess.
 	 */
+	data_offset = le_short(data_offset);
 	b->width = le_short(b->width);
 	b->height = le_short(b->height);
 	n_colors = le_short(n_colors);
@@ -120,27 +123,18 @@ 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
 	}
 
+	/* seek to offset indicated by file header */
+	fseek(fp, (long)data_offset, SEEK_SET);
+
 	/* read the bitmap; leave room for default color map */
 	printf ("\n");
 	printf ("};\n");