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

remove warnings in Load_PAL()

Browse Source
This commit is contained in:
Thomas Bernard 2018-12-17 11:52:42 +01:00
parent 8061d7c470
commit 931335d1ad
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/miscfileformats.c
View File

@ -298,22 +298,30 @@ void Load_PAL(T_IO_Context * context)
if (strncmp(buffer,"JASC-PAL",8) == 0) if (strncmp(buffer,"JASC-PAL",8) == 0)
{ {
int i, n, r, g, b; int i, n, r, g, b;
fscanf(file, "%d",&n); i = fscanf(file, "%d",&n);
if(n != 100) if(i != 1 || n != 100)
{ {
File_error = 2; File_error = 2;
fclose(file); fclose(file);
return; return;
} }
// Read color count // Read color count
fscanf(file, "%d",&n); if (fscanf(file, "%d",&n) == 1)
for (i = 0; i < n; i++)
{ {
fscanf(file, "%d %d %d",&r, &g, &b); for (i = 0; i < n; i++)
context->Palette[i].R = r; {
context->Palette[i].G = g; if (fscanf(file, "%d %d %d",&r, &g, &b) == 3)
context->Palette[i].B = b; {
context->Palette[i].R = r;
context->Palette[i].G = g;
context->Palette[i].B = b;
}
else
File_error = 2;
}
} }
else
File_error = 2;
} }
else if(strncmp(buffer, "RIFF", 4) == 0) else if(strncmp(buffer, "RIFF", 4) == 0)
{ {