aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/pnmtologo.c
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/pnmtologo.c')
-rw-r--r--scripts/pnmtologo.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 5c113123ed9f..68bb4efc5af4 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -74,6 +74,7 @@ static unsigned int logo_height;
74static struct color **logo_data; 74static struct color **logo_data;
75static struct color logo_clut[MAX_LINUX_LOGO_COLORS]; 75static struct color logo_clut[MAX_LINUX_LOGO_COLORS];
76static unsigned int logo_clutsize; 76static unsigned int logo_clutsize;
77static int is_plain_pbm = 0;
77 78
78static void die(const char *fmt, ...) 79static void die(const char *fmt, ...)
79 __attribute__ ((noreturn)) __attribute ((format (printf, 1, 2))); 80 __attribute__ ((noreturn)) __attribute ((format (printf, 1, 2)));
@@ -103,6 +104,11 @@ static unsigned int get_number(FILE *fp)
103 val = 0; 104 val = 0;
104 while (isdigit(c)) { 105 while (isdigit(c)) {
105 val = 10*val+c-'0'; 106 val = 10*val+c-'0';
107 /* some PBM are 'broken'; GiMP for example exports a PBM without space
108 * between the digits. This is Ok cause we know a PBM can only have a '1'
109 * or a '0' for the digit. */
110 if (is_plain_pbm)
111 break;
106 c = fgetc(fp); 112 c = fgetc(fp);
107 if (c == EOF) 113 if (c == EOF)
108 die("%s: end of file\n", filename); 114 die("%s: end of file\n", filename);
@@ -167,6 +173,7 @@ static void read_image(void)
167 switch (magic) { 173 switch (magic) {
168 case '1': 174 case '1':
169 /* Plain PBM */ 175 /* Plain PBM */
176 is_plain_pbm = 1;
170 for (i = 0; i < logo_height; i++) 177 for (i = 0; i < logo_height; i++)
171 for (j = 0; j < logo_width; j++) 178 for (j = 0; j < logo_width; j++)
172 logo_data[i][j].red = logo_data[i][j].green = 179 logo_data[i][j].red = logo_data[i][j].green =