diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c')
-rw-r--r-- | libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c b/libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c index 88c189d..2bbfd3e 100644 --- a/libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c +++ b/libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c | |||
@@ -24,7 +24,8 @@ Evas_Image_Load_Func evas_image_load_generic_func = | |||
24 | EINA_TRUE, | 24 | EINA_TRUE, |
25 | evas_image_load_file_head_generic, | 25 | evas_image_load_file_head_generic, |
26 | evas_image_load_file_data_generic, | 26 | evas_image_load_file_data_generic, |
27 | NULL | 27 | NULL, |
28 | EINA_FALSE | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | static Eina_Bool | 31 | static Eina_Bool |
@@ -117,7 +118,7 @@ _load(Image_Entry *ie, const char *file, const char *key, int *error, Eina_Bool | |||
117 | int read_data = 0; | 118 | int read_data = 0; |
118 | char *tmpfname = NULL, *shmfname = NULL; | 119 | char *tmpfname = NULL, *shmfname = NULL; |
119 | DATA32 *body; | 120 | DATA32 *body; |
120 | FILE *f; | 121 | FILE *f = NULL; |
121 | 122 | ||
122 | libdir = _evas_module_libdir_get(); | 123 | libdir = _evas_module_libdir_get(); |
123 | cmd_len = strlen(libdir); | 124 | cmd_len = strlen(libdir); |
@@ -125,6 +126,7 @@ _load(Image_Entry *ie, const char *file, const char *key, int *error, Eina_Bool | |||
125 | img_loader = alloca(cmd_len + 1); | 126 | img_loader = alloca(cmd_len + 1); |
126 | strcpy(img_loader, libdir); | 127 | strcpy(img_loader, libdir); |
127 | strcat(img_loader, loader); | 128 | strcat(img_loader, loader); |
129 | |||
128 | // params excluding file, key and loadopts | 130 | // params excluding file, key and loadopts |
129 | cmd_len += 1024; | 131 | cmd_len += 1024; |
130 | cmd_len += strlen(file) * 2; | 132 | cmd_len += strlen(file) * 2; |
@@ -188,6 +190,8 @@ _load(Image_Entry *ie, const char *file, const char *key, int *error, Eina_Bool | |||
188 | // will interpret shell stuff and path hunt that will then exec the | 190 | // will interpret shell stuff and path hunt that will then exec the |
189 | // program itself that will dynamically link that will again | 191 | // program itself that will dynamically link that will again |
190 | // parse the arguments and finally do something... | 192 | // parse the arguments and finally do something... |
193 | if (access(decoders[try_count], X_OK)) continue; | ||
194 | |||
191 | strcpy(cmd, decoders[try_count]); | 195 | strcpy(cmd, decoders[try_count]); |
192 | strcat(cmd, " "); | 196 | strcat(cmd, " "); |
193 | // filename first arg | 197 | // filename first arg |