m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve Test_PPH()

Browse Source 
remove one TODO :)
This commit is contained in:
Thomas Bernard 2018-02-17 16:59:36 +01:00
parent be824627ce
commit 3c3ef150a6
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/miscfileformats.c
View File

@ -3443,7 +3443,7 @@ void Test_PPH(T_IO_Context * context)
FILE *file; FILE *file;
byte buffer[6]; byte buffer[6];
long file_size; long file_size;
int w; unsigned int w, h;
int expected; int expected;
File_error = 1; File_error = 1;
@ -3475,8 +3475,8 @@ void Test_PPH(T_IO_Context * context)
goto abort; goto abort;
} }
w = buffer[3] | (buffer[4] << 8); h = buffer[3] | (buffer[4] << 8);
if (w < 1 || w > 272) { if (h < 1 || h > 272) {
// Invalid height // Invalid height
File_error = 4; File_error = 4;
goto abort; goto abort;
@ -3522,13 +3522,29 @@ void Test_PPH(T_IO_Context * context)
File_error = 6; File_error = 6;
goto abort; goto abort;
} }
fclose (file);
// check existence of .ODD/.EVE files with the same name
// and the right size
expected = w * h / 4;
file = Open_file_read_with_alternate_ext(context, "odd");
if (file == NULL)
goto abort;
file_size = File_length_file(file);
fclose (file);
file = Open_file_read_with_alternate_ext(context, "eve");
if (file == NULL)
goto abort;
if (file_size != File_length_file(file) || file_size != expected)
{
File_error = 8;
goto abort;
}
File_error = 0; File_error = 0;
abort: abort:
if (file != NULL) if (file != NULL)
fclose(file); fclose(file);
// TODO: check existence of .ODD/.EVE files with the same name
} }