walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] fixed pnmtoimage for odd pgm files (fixes issue 294)

This commit is contained in:
Matthieu Darbois 2014-11-22 14:09:16 +00:00
parent 0ba5d15b58
commit 13bcb63b73
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/jp2/convert.c
View File

@ -1665,7 +1665,6 @@ static char *skip_idf(char *start, char out_idf[256])
static void read_pnm_header(FILE *reader, struct pnm_header *ph) static void read_pnm_header(FILE *reader, struct pnm_header *ph)
{ {
char *s;
int format, have_wh, end, ttype; int format, have_wh, end, ttype;
char idf[256], type[256]; char idf[256], type[256];
char line[256]; char line[256];
@ -1691,6 +1690,8 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph)
while(fgets(line, 250, reader)) while(fgets(line, 250, reader))
{ {
char *s;
if(*line == '#') continue; if(*line == '#') continue;
s = line; s = line;
@ -1774,7 +1775,18 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph)
have_wh = 1; have_wh = 1;
if(format == 1 || format == 4) break; if(format == 1 || format == 4) break;
if(format == 2 || format == 3 || format == 5 || format == 6)
{
if (skip_int(s, &ph->maxval) != NULL) {
if(ph->maxval > 65535) {
return;
}
else {
break;
}
}
}
continue; continue;
} }
if(format == 2 || format == 3 || format == 5 || format == 6) if(format == 2 || format == 3 || format == 5 || format == 6)