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

Merge pull request #67823 from Chaosus/fix_image_crash

This commit is contained in:
Yuri Rubinsky 2022-10-25 10:50:33 +03:00 committed by GitHub
parent c51a42778d adec51cde8
commit 32997a5b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/image.cpp
View File

@ -2862,6 +2862,9 @@ void Image::_repeat_pixel_over_subsequent_memory(uint8_t *p_pixel, int p_pixel_s
} }
void Image::fill(const Color &p_color) { void Image::fill(const Color &p_color) {
if (data.size() == 0) {
return;
}
ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill in compressed or custom image formats."); ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill in compressed or custom image formats.");
uint8_t *dst_data_ptr = data.ptrw(); uint8_t *dst_data_ptr = data.ptrw();
@ -2875,6 +2878,9 @@ void Image::fill(const Color &p_color) {
} }
void Image::fill_rect(const Rect2i &p_rect, const Color &p_color) { void Image::fill_rect(const Rect2i &p_rect, const Color &p_color) {
if (data.size() == 0) {
return;
}
ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill rect in compressed or custom image formats."); ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill rect in compressed or custom image formats.");
Rect2i r = Rect2i(0, 0, width, height).intersection(p_rect.abs()); Rect2i r = Rect2i(0, 0, width, height).intersection(p_rect.abs());