enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* evas: Try all known modules when testing an unknown file. 

SVN revision: 41262
This commit is contained in:
Cedric BAIL 2009-07-07 11:07:43 +00:00
parent 7e475a152c
commit 7a94d9de85
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/evas/src/lib/engines/common/evas_image_load.c
View File

@ -11,7 +11,7 @@ struct ext_loader_s {
const char* loader;
};
static struct ext_loader_s loaders[] = {
static struct ext_loader_s const loaders[] = {
{ "png", "png" },
{ "jpg", "jpeg" },
{ "jpeg", "jpeg" },
@ -32,6 +32,10 @@ static struct ext_loader_s loaders[] = {
{ "pnm", "pmaps" }
};
static const char *loaders_name[] = {
"png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "pmaps", "edb"
};
static Eina_Bool
_evas_image_foreach_loader(const Eina_Hash *hash, const char *key, Evas_Module *em, Image_Entry *ie)
{
@ -94,14 +98,32 @@ evas_common_load_rgba_image_module_from_file(Image_Entry *ie)
evas_image_load_func = em->functions;
if (evas_image_load_func->file_head(ie, ie->file, ie->key))
goto ok;
evas_module_unload(em);
}
}
}
/* FIXME: We don't try not loaded module yet, changed behaviour with previous one. */
evas_module_foreach_image_loader(_evas_image_foreach_loader, ie);
if (ie->info.module) return 0;
/* This is our last chance, try all known image loader. */
/* FIXME: We could use eina recursive module search ability. */
for (i = 0; i < sizeof (loaders_name) / sizeof (char *); ++i)
{
em = evas_module_find_type(EVAS_MODULE_TYPE_IMAGE_LOADER, loaders_name[i]);
if (em)
{
if (evas_module_load(em))
{
evas_module_use(em);
evas_image_load_func = em->functions;
if (evas_image_load_func->file_head(ie, ie->file, ie->key))
goto ok;
evas_module_unload(em);
}
}
}
return -1;
ok: