generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed RGBE images header parsing (fixes #4885)

Browse Source
This commit is contained in:
Maksim Shabunin 2015-08-13 17:21:31 +03:00
parent 09b9b0fb9e
commit 9e4c62967b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/imgcodecs/src/rgbe.cpp
View File

@ -182,6 +182,8 @@ int RGBE_ReadHeader(FILE *fp, int *width, int *height, rgbe_header_info *info)
info->programtype[0] = 0; info->programtype[0] = 0;
info->gamma = info->exposure = 1.0; info->gamma = info->exposure = 1.0;
} }
// 1. read first line
if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == NULL) if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == NULL)
return rgbe_error(rgbe_read_error,NULL); return rgbe_error(rgbe_read_error,NULL);
if ((buf[0] != '#')||(buf[1] != '?')) { if ((buf[0] != '#')||(buf[1] != '?')) {
@ -196,14 +198,19 @@ int RGBE_ReadHeader(FILE *fp, int *width, int *height, rgbe_header_info *info)
info->programtype[i] = buf[i+2]; info->programtype[i] = buf[i+2];
} }
info->programtype[i] = 0; info->programtype[i] = 0;
}
// 2. reading other header lines
bool hasFormat = false;
for(;;) {
if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0) if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
return rgbe_error(rgbe_read_error,NULL); return rgbe_error(rgbe_read_error,NULL);
} if (buf[0] == '\n') // end of the header
for(;;) { break;
if ((buf[0] == 0)||(buf[0] == '\n')) else if (buf[0] == '#') // commment
return rgbe_error(rgbe_format_error,"no FORMAT specifier found"); continue;
else if (strcmp(buf,"FORMAT=32-bit_rle_rgbe\n") == 0) else if (strcmp(buf,"FORMAT=32-bit_rle_rgbe\n") == 0)
break; /* format found so break out of loop */ hasFormat = true;
else if (info && (sscanf(buf,"GAMMA=%g",&tempf) == 1)) { else if (info && (sscanf(buf,"GAMMA=%g",&tempf) == 1)) {
info->gamma = tempf; info->gamma = tempf;
info->valid |= RGBE_VALID_GAMMA; info->valid |= RGBE_VALID_GAMMA;
@ -212,14 +219,14 @@ int RGBE_ReadHeader(FILE *fp, int *width, int *height, rgbe_header_info *info)
info->exposure = tempf; info->exposure = tempf;
info->valid |= RGBE_VALID_EXPOSURE; info->valid |= RGBE_VALID_EXPOSURE;
} }
if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
return rgbe_error(rgbe_read_error,NULL);
} }
if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
return rgbe_error(rgbe_read_error,NULL);
if (strcmp(buf,"\n") != 0) if (strcmp(buf,"\n") != 0)
return rgbe_error(rgbe_format_error, return rgbe_error(rgbe_format_error,
"missing blank line after FORMAT specifier"); "missing blank line after FORMAT specifier");
if (!hasFormat)
return rgbe_error(rgbe_format_error, "missing FORMAT specifier");
// 3. reading resolution string
if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0) if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
return rgbe_error(rgbe_read_error,NULL); return rgbe_error(rgbe_read_error,NULL);
if (sscanf(buf,"-Y %d +X %d",height,width) < 2) if (sscanf(buf,"-Y %d +X %d",height,width) < 2)