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

Fix compilation of gifanalyzer on old GCC versions

Browse Source 
0b00000 is not standard C, use 0x00 litterals.
Also fix printf format
This commit is contained in:
Thomas Bernard 2018-01-30 13:28:42 +01:00
parent c36729b5bc
commit a4b80c75e1
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/gifanalyzer/Makefile
View File

@ -1,4 +1,11 @@
CFLAGS=-Wall CFLAGS=-Wall
#LDLIBS=-lm #LDLIBS=-lm
.PHONY: all clean
all: gifanalyzer
clean:
$(RM) *.o gifanalyzer
gifanalyzer: gifanalyzer.o gifanalyzer: gifanalyzer.o

32
tools/gifanalyzer/gifanalyzer.c
View File

@ -26,25 +26,29 @@
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
FILE* theFile; FILE* theFile;
uint8_t buffer[256];
uint16_t w,h;
if(argc != 2)
{
printf("%s file.gif\n",argv[0]);
exit(-1);
}
theFile = fopen(argv[1], "r"); if(argc < 2)
{
printf("%s file.gif\n",argv[0]);
exit(-1);
}
uint8_t buffer[256]; theFile = fopen(argv[1], "r");
if (theFile == NULL)
{
fprintf(stderr, "Failed to open file '%s'.\n", argv[1]);
exit(1);
}
fread(buffer, 1, 6, theFile); fread(buffer, 1, 6, theFile);
buffer[6] = 0; buffer[6] = 0;
printf("Signature: %6s\n", buffer); printf("Signature: %6s\n", buffer);
uint16_t w,h;
fread(&w,2,1,theFile); fread(&w,2,1,theFile);
fread(&h,2,1,theFile); fread(&h,2,1,theFile);
@ -52,13 +56,13 @@ int main(int argc, char* argv[])
fread(buffer,1,3,theFile); fread(buffer,1,3,theFile);
int colors = 1 << (((buffer[0]&0b01110000)>>4)+1); int colors = 1 << (((buffer[0] & 0x70)>>4)+1); // 0x70 == 0b01110000
int color_table_size = 1 << ((buffer[0]&0x7)+1); int color_table_size = 1 << ((buffer[0]&0x7)+1);
printf("Color palette: %#02.2x\n",buffer[0]&0xFF); printf("Color palette: 0x%02x\n",buffer[0]&0xFF);
if (buffer[0] & 0b10000000) { if (buffer[0] & 0x80) { // 0x80 == 0b10000000
printf("\tGlobal palette"); printf("\tGlobal palette");
if(buffer[0] & 0b00001000) if(buffer[0] & 0x08) // 0x08 == 0b00001000
printf(" SORTED"); printf(" SORTED");
printf("\n"); printf("\n");
} }