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

put generic loaders in libdir/evas/utils/ 

SVN revision: 63103
This commit is contained in:
Carsten Haitzler 2011-09-03 03:48:39 +00:00
parent 92b98ad145
commit 27ebb83c4e
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/evas/src/lib/file/evas_module.c
View File

@ -554,3 +554,15 @@ _evas_module_engine_inherit(Evas_Func *funcs, char *name)
}
return 0;
}
static Eina_Prefix *pfx = NULL;
EAPI const char *
_evas_module_libdir_get(void)
{
if (!pfx) pfx = eina_prefix_new
(NULL, _evas_module_libdir_get, "EVAS", "evas", NULL,
PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
if (!pfx) return NULL;
return eina_prefix_lib_get(pfx);
}

3
legacy/evas/src/lib/include/evas_private.h
View File

@ -992,7 +992,8 @@ void _evas_unwalk(Evas *e);
// expose for use in engines
EAPI int _evas_module_engine_inherit(Evas_Func *funcs, char *name);
EAPI const char *_evas_module_libdir_get(void);
Eina_Bool evas_render_mapped(Evas *e, Evas_Object *obj,
void *context, void *surface,
int off_x, int off_y, int mapped,

17
legacy/evas/src/modules/loaders/generic/evas_image_load_generic.c
View File

@ -109,20 +109,27 @@ _load(Image_Entry *ie, const char *file, const char *key, int *error, Eina_Bool
int w = 0, h = 0, alpha = 0;
const char *dot1 = NULL, *dot2 = NULL, *end, *p;
char *cmd = NULL, decoders[3][128], buf[4096];
char *img_loader = "evas_image_loader"; // FIXME: specific path
char *loader = "/evas/utils/evas_image_loader";
char *img_loader = NULL;
const char *libdir;
// eg $libdir/evas/generic_loaders
int cmd_len, len, decoders_num = 0, try_count = 0;
int read_data = 0;
char *tmpfname = NULL, *shmfname = NULL;
DATA32 *body;
FILE *f;
// enough for command + params excluding filem key and loadopts
cmd_len = 1024 + strlen(img_loader);
libdir = _evas_module_libdir_get();
cmd_len = strlen(libdir);
cmd_len += strlen(loader);
img_loader = alloca(cmd_len + 1);
strcpy(img_loader, libdir);
strcat(img_loader, loader);
// params excluding file, key and loadopts
cmd_len += 1024;
cmd_len += strlen(file) * 2;
if (key) cmd_len += strlen(key) * 2;
cmd = alloca(cmd_len);
cmd = alloca(cmd_len + 1);
len = strlen(file);
if (len < 1)