From c68e9a8580a75fcd590f8209d1d63beb53f0e196 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E9=87=91=E6=B3=89?= Date: Tue, 30 Aug 2011 17:27:58 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3kernel=20logo=E5=8D=A0?= =?utf8?q?=E7=94=A8=E7=A9=BA=E9=97=B4=E8=BF=87=E5=A4=A7=E9=97=AE=E9=A2=98,?= =?utf8?q?=E9=9C=80=E4=BD=BF=E7=94=A8=E6=96=B0tool=E5=AE=9E=E7=8E=B0kernel?= =?utf8?q?=20logo=E6=9B=BF=E6=8D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- scripts/pnmtologo.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c index d38bbe16b930..b5beb5bc5eb5 100755 --- a/scripts/pnmtologo.c +++ b/scripts/pnmtologo.c @@ -40,8 +40,6 @@ static const char *logo_types[LINUX_LOGO_GRAY256+1] = { }; #define MAX_LINUX_LOGO_COLORS 224 -#define MAX_LINUX_LOGO_WIDTH 1280 -#define MAX_LINUX_LOGO_HEIGHT 800 struct color { unsigned char red; @@ -393,6 +391,11 @@ static void write_logo_clut224(void) /* write file header */ write_header(); + write_hex((unsigned char)(logo_width >> 8)); + write_hex((unsigned char)logo_width); + write_hex((unsigned char)(logo_height >> 8)); + write_hex((unsigned char)logo_height); + for (i = 0; i < sizeof(data_name); i++){ write_hex(data_name[i]); } @@ -410,26 +413,6 @@ static void write_logo_clut224(void) write_hex(k+32); } - if (logo_height < MAX_LINUX_LOGO_HEIGHT || logo_width < MAX_LINUX_LOGO_WIDTH) { - if (logo_height == MAX_LINUX_LOGO_HEIGHT) { - for (i = 0; i < MAX_LINUX_LOGO_HEIGHT; i++) - for (j = logo_width; j < MAX_LINUX_LOGO_WIDTH; j++) - write_hex(32); - } else if (logo_width == MAX_LINUX_LOGO_WIDTH) { - for (i = logo_height; i < MAX_LINUX_LOGO_HEIGHT; i++) - for (j = 0; j < MAX_LINUX_LOGO_WIDTH; j++) - write_hex(32); - } else { - for (i = logo_height; i < MAX_LINUX_LOGO_HEIGHT; i++) - for (j = 0; j < MAX_LINUX_LOGO_WIDTH; j++) - write_hex(32); - - for (i = 0; i < logo_height; i++) - for (j = logo_width; j < MAX_LINUX_LOGO_WIDTH; j++) - write_hex(32); - } - } - fputs("\n};\n\n", out); /* write logo clut */ @@ -449,6 +432,11 @@ static void write_logo_clut224(void) write_hex(logo_clut[i].blue); } + for (i = logo_clutsize; i < (MAX_LINUX_LOGO_COLORS * 3); i++) + { + write_hex(32); + } + /* write logo structure and file footer */ write_footer(); } -- 2.34.1