godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent upscaled SVG from exceeding Image bounds 

Also expose Image MAX_WIDTH and MAX_HEIGHT.

Fixes #24455.
This commit is contained in:
Rémi Verschelde 2019-01-28 15:33:56 +01:00
parent 89e7c2cb13
commit cc0842f9a6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/image.cpp
View File

@ -2632,6 +2632,9 @@ void Image::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "_set_data", "_get_data"); ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "_set_data", "_get_data");
BIND_CONSTANT(MAX_WIDTH);
BIND_CONSTANT(MAX_HEIGHT);
BIND_ENUM_CONSTANT(FORMAT_L8); //luminance BIND_ENUM_CONSTANT(FORMAT_L8); //luminance
BIND_ENUM_CONSTANT(FORMAT_LA8); //luminance-alpha BIND_ENUM_CONSTANT(FORMAT_LA8); //luminance-alpha
BIND_ENUM_CONSTANT(FORMAT_R8); BIND_ENUM_CONSTANT(FORMAT_R8);

6
core/image.h
View File

@ -52,14 +52,14 @@ typedef Ref<Image> (*ImageMemLoadFunc)(const uint8_t *p_png, int p_size);
class Image : public Resource { class Image : public Resource {
GDCLASS(Image, Resource); GDCLASS(Image, Resource);
public:
static SavePNGFunc save_png_func;
enum { enum {
MAX_WIDTH = 16384, // force a limit somehow MAX_WIDTH = 16384, // force a limit somehow
MAX_HEIGHT = 16384 // force a limit somehow MAX_HEIGHT = 16384 // force a limit somehow
}; };
public:
static SavePNGFunc save_png_func;
enum Format { enum Format {
FORMAT_L8, //luminance FORMAT_L8, //luminance

8
doc/classes/Image.xml
View File

@ -4,7 +4,7 @@
Image datatype. Image datatype.
</brief_description> </brief_description>
<description> <description>
Native image datatype. Contains image data, which can be converted to a [Texture], and several functions to interact with it. The maximum width and height for an [code]Image[/code] is 16384 pixels. Native image datatype. Contains image data, which can be converted to a [Texture], and several functions to interact with it. The maximum width and height for an [code]Image[/code] are [constant MAX_WIDTH] and [constant MAX_HEIGHT].
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>
@ -476,6 +476,12 @@
</member> </member>
</members> </members>
<constants> <constants>
<constant name="MAX_WIDTH" value="16384">
The maximal width allowed for [code]Image[/code] resources.
</constant>
<constant name="MAX_HEIGHT" value="16384">
The maximal height allowed for [code]Image[/code] resources.
</constant>
<constant name="FORMAT_L8" value="0" enum="Format"> <constant name="FORMAT_L8" value="0" enum="Format">
</constant> </constant>
<constant name="FORMAT_LA8" value="1" enum="Format"> <constant name="FORMAT_LA8" value="1" enum="Format">

5
modules/svg/image_loader_svg.cpp
View File

@ -109,7 +109,12 @@ Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const PoolVector<uint8_t
float upscale = upsample ? 2.0 : 1.0; float upscale = upsample ? 2.0 : 1.0;
int w = (int)(svg_image->width * p_scale * upscale); int w = (int)(svg_image->width * p_scale * upscale);
ERR_EXPLAIN(vformat("Can't create image from SVG with scale %s, the resulting image size exceeds max width.", rtos(p_scale)));
ERR_FAIL_COND_V(w > Image::MAX_WIDTH, ERR_PARAMETER_RANGE_ERROR);
int h = (int)(svg_image->height * p_scale * upscale); int h = (int)(svg_image->height * p_scale * upscale);
ERR_EXPLAIN(vformat("Can't create image from SVG with scale %s, the resulting image size exceeds max height.", rtos(p_scale)));
ERR_FAIL_COND_V(h > Image::MAX_HEIGHT, ERR_PARAMETER_RANGE_ERROR);
PoolVector<uint8_t> dst_image; PoolVector<uint8_t> dst_image;
dst_image.resize(w * h * 4); dst_image.resize(w * h * 4);