From de9aa42bc87670b059e74c5f96818e94ad0c3a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Date: Thu, 18 Oct 2012 11:08:49 +0200 Subject: [PATCH] --- yaml --- r: 347738 b: refs/heads/master c: fc96b211bc6fa917bfb07a8db4cd898663e5f2c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/pnmtologo.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f8963aa8bd0c..488d97b95f77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f890988114a1b2d7abb30dafb708d4513801da +refs/heads/master: fc96b211bc6fa917bfb07a8db4cd898663e5f2c6 diff --git a/trunk/scripts/pnmtologo.c b/trunk/scripts/pnmtologo.c index 5c113123ed9f..68bb4efc5af4 100644 --- a/trunk/scripts/pnmtologo.c +++ b/trunk/scripts/pnmtologo.c @@ -74,6 +74,7 @@ static unsigned int logo_height; static struct color **logo_data; static struct color logo_clut[MAX_LINUX_LOGO_COLORS]; static unsigned int logo_clutsize; +static int is_plain_pbm = 0; static void die(const char *fmt, ...) __attribute__ ((noreturn)) __attribute ((format (printf, 1, 2))); @@ -103,6 +104,11 @@ static unsigned int get_number(FILE *fp) val = 0; while (isdigit(c)) { val = 10*val+c-'0'; + /* some PBM are 'broken'; GiMP for example exports a PBM without space + * between the digits. This is Ok cause we know a PBM can only have a '1' + * or a '0' for the digit. */ + if (is_plain_pbm) + break; c = fgetc(fp); if (c == EOF) die("%s: end of file\n", filename); @@ -167,6 +173,7 @@ static void read_image(void) switch (magic) { case '1': /* Plain PBM */ + is_plain_pbm = 1; for (i = 0; i < logo_height; i++) for (j = 0; j < logo_width; j++) logo_data[i][j].red = logo_data[i][j].green =