Add webp buffer loader for Image

Cleanup the code memory load related code for Image
Fix jpeg buff load function always returns OK event failed

2 files changed, 21 insertions, 20 deletions

diff --git a/core/image.cpp b/core/image.cpp
index b0bed80a6f..b9386a1b6d 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -1898,8 +1898,9 @@ void Image::fill(const Color &c) {
 	unlock();
 }
 
-Ref<Image> (*Image::_png_mem_loader_func)(const uint8_t *, int) = NULL;
-Ref<Image> (*Image::_jpg_mem_loader_func)(const uint8_t *, int) = NULL;
+ImageMemLoadFunc Image::_png_mem_loader_func = NULL;
+ImageMemLoadFunc Image::_jpg_mem_loader_func = NULL;
+ImageMemLoadFunc Image::_webp_mem_loader_func = NULL;
 
 void (*Image::_image_compress_bc_func)(Image *, Image::CompressSource) = NULL;
 void (*Image::_image_compress_pvrtc2_func)(Image *) = NULL;
@@ -2357,6 +2358,7 @@ void Image::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("load_png_from_buffer", "buffer"), &Image::load_png_from_buffer);
 	ClassDB::bind_method(D_METHOD("load_jpg_from_buffer", "buffer"), &Image::load_jpg_from_buffer);
+	ClassDB::bind_method(D_METHOD("load_webp_from_buffer", "buffer"), &Image::load_webp_from_buffer);
 
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "_set_data", "_get_data");
 
@@ -2649,32 +2651,26 @@ String Image::get_format_name(Format p_format) {
 }
 
 Error Image::load_png_from_buffer(const PoolVector<uint8_t> &p_array) {
-
-	int buffer_size = p_array.size();
-
-	ERR_FAIL_COND_V(buffer_size == 0, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(!_png_mem_loader_func, ERR_INVALID_PARAMETER);
-
-	PoolVector<uint8_t>::Read r = p_array.read();
-
-	Ref<Image> image = _png_mem_loader_func(r.ptr(), buffer_size);
-	ERR_FAIL_COND_V(!image.is_valid(), ERR_PARSE_ERROR);
-
-	copy_internals_from(image);
-
-	return OK;
+	return _load_from_buffer(p_array, _png_mem_loader_func);
 }
 
 Error Image::load_jpg_from_buffer(const PoolVector<uint8_t> &p_array) {
+	return _load_from_buffer(p_array, _jpg_mem_loader_func);
+}
+
+Error Image::load_webp_from_buffer(const PoolVector<uint8_t> &p_array) {
+	return _load_from_buffer(p_array, _webp_mem_loader_func);
+}
 
+Error Image::_load_from_buffer(const PoolVector<uint8_t> &p_array, ImageMemLoadFunc p_loader) {
 	int buffer_size = p_array.size();
 
 	ERR_FAIL_COND_V(buffer_size == 0, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(!_jpg_mem_loader_func, ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V(!p_loader, ERR_INVALID_PARAMETER);
 
 	PoolVector<uint8_t>::Read r = p_array.read();
 
-	Ref<Image> image = _jpg_mem_loader_func(r.ptr(), buffer_size);
+	Ref<Image> image = p_loader(r.ptr(), buffer_size);
 	ERR_FAIL_COND_V(!image.is_valid(), ERR_PARSE_ERROR);
 
 	copy_internals_from(image);
diff --git a/core/image.h b/core/image.h
index 43516e2c0b..3792103a87 100644
--- a/core/image.h
+++ b/core/image.h
@@ -47,6 +47,7 @@
 class Image;
 
 typedef Error (*SavePNGFunc)(const String &p_path, const Ref<Image> &p_img);
+typedef Ref<Image> (*ImageMemLoadFunc)(const uint8_t *p_png, int p_size);
 
 class Image : public Resource {
 	GDCLASS(Image, Resource);
@@ -118,8 +119,9 @@ public:
 
 	//some functions provided by something else
 
-	static Ref<Image> (*_png_mem_loader_func)(const uint8_t *p_png, int p_size);
-	static Ref<Image> (*_jpg_mem_loader_func)(const uint8_t *p_png, int p_size);
+	static ImageMemLoadFunc _png_mem_loader_func;
+	static ImageMemLoadFunc _jpg_mem_loader_func;
+	static ImageMemLoadFunc _webp_mem_loader_func;
 
 	static void (*_image_compress_bc_func)(Image *, CompressSource p_source);
 	static void (*_image_compress_pvrtc2_func)(Image *);
@@ -175,6 +177,8 @@ private:
 	void _set_data(const Dictionary &p_data);
 	Dictionary _get_data() const;
 
+	Error _load_from_buffer(const PoolVector<uint8_t> &p_array, ImageMemLoadFunc p_loader);
+
 public:
 	int get_width() const; ///< Get image width
 	int get_height() const; ///< Get image height
@@ -302,6 +306,7 @@ public:
 
 	Error load_png_from_buffer(const PoolVector<uint8_t> &p_array);
 	Error load_jpg_from_buffer(const PoolVector<uint8_t> &p_array);
+	Error load_webp_from_buffer(const PoolVector<uint8_t> &p_array);
 
 	Image(const uint8_t *p_mem_png_jpg, int p_len = -1);
 	Image(const char **p_xpm);