goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GZ, BZ2 loaders: Accept more file names 

E.g. ".png.gz", "png.gz", ".../png.gz".
This commit is contained in:
Kim Woelders 2020-02-27 17:40:52 +01:00
parent 97865ad8ef
commit ac41eae7fa
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/loaders/loader_bz2.c
View File

@ -57,17 +57,17 @@ load(ImlibImage * im, ImlibProgressFunction progress,
/* make sure this file ends in ".bz2" and that there's another ext /* make sure this file ends in ".bz2" and that there's another ext
* (e.g. "foo.png.bz2") */ * (e.g. "foo.png.bz2") */
for (s = im->real_file, p = q = NULL; *s; s++) for (p = s = im->real_file, q = NULL; *s; s++)
{ {
if (*s != '.') if (*s != '.' && *s != '/')
continue; continue;
q = p; q = p;
p = s; p = s + 1;
} }
if (!q || q == im->real_file || strcasecmp(p + 1, "bz2")) if (!q || strcasecmp(p, "bz2"))
return 0; return 0;
if (!(real_ext = strndup(q + 1, p - q - 1))) if (!(real_ext = strndup(q, p - q - 1)))
return 0; return 0;
loader = __imlib_FindBestLoaderForFormat(real_ext, 0); loader = __imlib_FindBestLoaderForFormat(real_ext, 0);

10
src/modules/loaders/loader_zlib.c
View File

@ -50,17 +50,17 @@ load(ImlibImage * im, ImlibProgressFunction progress,
/* make sure this file ends in ".gz" and that there's another ext /* make sure this file ends in ".gz" and that there's another ext
* (e.g. "foo.png.gz") */ * (e.g. "foo.png.gz") */
for (s = im->real_file, p = q = NULL; *s; s++) for (p = s = im->real_file, q = NULL; *s; s++)
{ {
if (*s != '.') if (*s != '.' && *s != '/')
continue; continue;
q = p; q = p;
p = s; p = s + 1;
} }
if (!q || q == im->real_file || strcasecmp(p + 1, "gz")) if (!q || strcasecmp(p, "gz"))
return 0; return 0;
if (!(real_ext = strndup(q + 1, p - q - 1))) if (!(real_ext = strndup(q, p - q - 1)))
return 0; return 0;
loader = __imlib_FindBestLoaderForFormat(real_ext, 0); loader = __imlib_FindBestLoaderForFormat(real_ext, 0);