gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: Improved file format detection

Browse Source 
load.c is used to identify the file format, I rebased some checks on
what is defined in the spec of the format.

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
David Maciejak
2014-04-16 22:29:47 +02:00
committed by Carlos R. Mafra
parent 34ca63c59f
commit 92b803bbdf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wrlib/load.c
View File

@@ -281,7 +281,7 @@ char *RGetImageFileFormat(const char *file)
static WRImgFormat identFile(const char *path) static WRImgFormat identFile(const char *path)
{ {
FILE *file; FILE *file;
unsigned char buffer[32]; unsigned char buffer[7];
size_t nread; size_t nread;
assert(path != NULL); assert(path != NULL);
@@ -301,7 +301,7 @@ static WRImgFormat identFile(const char *path)
RETRY( fclose(file) ) RETRY( fclose(file) )
/* check for XPM */ /* check for XPM */
if (strncmp((char *)buffer, "/* XPM */", 9) == 0) if (strncmp((char *)buffer, "/* XPM", 6) == 0)
return IM_XPM; return IM_XPM;
/* check for TIFF */ /* check for TIFF */
@@ -309,14 +309,12 @@ static WRImgFormat identFile(const char *path)
|| (buffer[0] == 'M' && buffer[1] == 'M' && buffer[2] == 0 && buffer[3] == '*')) || (buffer[0] == 'M' && buffer[1] == 'M' && buffer[2] == 0 && buffer[3] == '*'))
return IM_TIFF; return IM_TIFF;
#ifdef USE_PNG
/* check for PNG */ /* check for PNG */
if (!png_sig_cmp(buffer, 0, 8)) if (buffer[0] == 0x89 && buffer[1] == 'P' && buffer[2] == 'N' && buffer[3] == 'G')
return IM_PNG; return IM_PNG;
#endif
/* check for raw PPM or PGM */ /* check for PBM or PGM or PPM */
if (buffer[0] == 'P' && (buffer[1] == '5' || buffer[1] == '6')) if (buffer[0] == 'P' && (buffer[1] > '0' && buffer[1] < '7') && (buffer[2] == 0x0a || buffer[2] == 0x20 || buffer[2] == 0x09 || buffer[2] == 0x0d))
return IM_PPM; return IM_PPM;
/* check for JPEG */ /* check for JPEG */
@@ -324,7 +322,7 @@ static WRImgFormat identFile(const char *path)
return IM_JPEG; return IM_JPEG;
/* check for GIF */ /* check for GIF */
if (buffer[0] == 'G' && buffer[1] == 'I' && buffer[2] == 'F') if (buffer[0] == 'G' && buffer[1] == 'I' && buffer[2] == 'F' && buffer[3] == '8')
return IM_GIF; return IM_GIF;
return IM_UNKNOWN; return IM_UNKNOWN;