asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash when using Image.resize() without calling Image.create() first

Browse source
This commit is contained in:
Jerome67000 2018-01-06 13:10:37 +01:00
parent 8e8240450e
commit b5885c43eb
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/image.cpp
View file

@ -447,8 +447,6 @@ void Image::convert(Format p_new_format) {
Image new_img(width, height, 0, p_new_format); Image new_img(width, height, 0, p_new_format);
//int len=data.size();
PoolVector<uint8_t>::Read r = data.read(); PoolVector<uint8_t>::Read r = data.read();
PoolVector<uint8_t>::Write w = new_img.data.write(); PoolVector<uint8_t>::Write w = new_img.data.write();
@ -696,6 +694,11 @@ void Image::resize_to_po2(bool p_square) {
void Image::resize(int p_width, int p_height, Interpolation p_interpolation) { void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
if (data.size() == 0) {
ERR_EXPLAIN("Cannot resize image before creating it, use create() or create_from_data() first.");
ERR_FAIL();
}
if (!_can_modify(format)) { if (!_can_modify(format)) {
ERR_EXPLAIN("Cannot resize in indexed, compressed or custom image formats."); ERR_EXPLAIN("Cannot resize in indexed, compressed or custom image formats.");
ERR_FAIL(); ERR_FAIL();

1
doc/classes/Image.xml
View file

@ -395,6 +395,7 @@
Sets the [Color] of the pixel at [code](x, y)[/code] if the image is locked. Example: Sets the [Color] of the pixel at [code](x, y)[/code] if the image is locked. Example:
[codeblock] [codeblock]
var img = Image.new() var img = Image.new()
img.create(img_width, img_height, false, Image.FORMAT_RGBA8)
img.lock() img.lock()
img.set_pixel(x, y, color) # Works img.set_pixel(x, y, color) # Works
img.unlock() img.unlock()