diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/modules/loaders/generic/Makefile.in | 8 | ||||
-rw-r--r-- | libraries/evas/src/modules/loaders/generic/evas_image_load_generic.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.in b/libraries/evas/src/modules/loaders/generic/Makefile.in index 65a0bac..dfd5294 100644 --- a/libraries/evas/src/modules/loaders/generic/Makefile.in +++ b/libraries/evas/src/modules/loaders/generic/Makefile.in | |||
@@ -232,8 +232,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
232 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 232 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
233 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 233 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
234 | PKG_CONFIG = @PKG_CONFIG@ | 234 | PKG_CONFIG = @PKG_CONFIG@ |
235 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
236 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
237 | PNG_CFLAGS = @PNG_CFLAGS@ | 235 | PNG_CFLAGS = @PNG_CFLAGS@ |
238 | PNG_LIBS = @PNG_LIBS@ | 236 | PNG_LIBS = @PNG_LIBS@ |
239 | RANLIB = @RANLIB@ | 237 | RANLIB = @RANLIB@ |
@@ -250,6 +248,8 @@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ | |||
250 | VALGRIND_LIBS = @VALGRIND_LIBS@ | 248 | VALGRIND_LIBS = @VALGRIND_LIBS@ |
251 | VERSION = @VERSION@ | 249 | VERSION = @VERSION@ |
252 | VMAJ = @VMAJ@ | 250 | VMAJ = @VMAJ@ |
251 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | ||
252 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | ||
253 | WIN32_CFLAGS = @WIN32_CFLAGS@ | 253 | WIN32_CFLAGS = @WIN32_CFLAGS@ |
254 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | 254 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ |
255 | XCB_CFLAGS = @XCB_CFLAGS@ | 255 | XCB_CFLAGS = @XCB_CFLAGS@ |
@@ -331,6 +331,10 @@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | |||
331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
333 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ | 333 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ |
334 | evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@ | ||
335 | evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@ | ||
336 | evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@ | ||
337 | evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@ | ||
334 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ | 338 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ |
335 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ | 339 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ |
336 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ | 340 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ |
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 |