zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7aec0565cb33cc664b3a1be4df01c721e92d6dfd
commit 7aec0565cb33cc664b3a1be4df01c721e92d6dfd Author: Mike Blumenkrantz <[email protected]> Date: Fri Feb 14 08:33:20 2020 -0500 Revert "evas: remove unused function evas_common_load_image_from_file." Summary: This reverts commit 7672d1050ea9e1050c27ce2eda68718ea054b638. Depends on D11335 Reviewers: raster Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11336 --- src/lib/evas/common/evas_image.h | 1 + src/lib/evas/common/evas_image_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/lib/evas/common/evas_image.h b/src/lib/evas/common/evas_image.h index 281e82a616..68f4686d59 100644 --- a/src/lib/evas/common/evas_image.h +++ b/src/lib/evas/common/evas_image.h @@ -32,6 +32,7 @@ EAPI RGBA_Image *evas_common_image_alpha_line_buffer_obtain (int len); EAPI void evas_common_image_alpha_line_buffer_release (RGBA_Image *im); EAPI void evas_common_image_alpha_line_buffer_free (RGBA_Image *im); +EAPI RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key, Evas_Image_Load_Opts *lo, int *error); EAPI RGBA_Image *evas_common_load_image_from_mmap (Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error); EAPI int evas_common_save_image_to_file (RGBA_Image *im, const char *file, const char *key, int quality, int compress, const char *encoding); diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c index e06fc9f653..57a9a8c0c5 100644 --- a/src/lib/evas/common/evas_image_main.c +++ b/src/lib/evas/common/evas_image_main.c @@ -1015,6 +1015,18 @@ evas_common_image_get_cache(void) return evas_cache_image_get(eci); } +EAPI RGBA_Image * +evas_common_load_image_from_file(const char *file, const char *key, + Evas_Image_Load_Opts *lo, int *error) +{ + if (!file) + { + *error = EVAS_LOAD_ERROR_GENERIC; + return NULL; + } + return (RGBA_Image *) evas_cache_image_request(eci, file, key, lo, error); +} + EAPI RGBA_Image * evas_common_load_image_from_mmap(Eina_File *f, const char *key, Evas_Image_Load_Opts *lo, int *error) --
