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

Merge pull request #82408 from hpvb/fix-import-crash

Browse Source 
Fix Image import crash
This commit is contained in:
Rémi Verschelde 2023-09-27 14:03:47 +02:00
commit d616c3ecd0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/io/image.cpp
View File

@ -1930,8 +1930,7 @@ Error Image::generate_mipmaps(bool p_renormalize) {
} }
Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, const Ref<Image> &p_normal_map) { Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, const Ref<Image> &p_normal_map) {
Vector<double> normal_sat_vec; //summed area table LocalVector<double> normal_sat_vec; //summed area table
double *normal_sat = nullptr; //summed area table for normal map
int normal_w = 0, normal_h = 0; int normal_w = 0, normal_h = 0;
ERR_FAIL_COND_V_MSG(p_normal_map.is_null() || p_normal_map->is_empty(), ERR_INVALID_PARAMETER, "Must provide a valid normal map for roughness mipmaps"); ERR_FAIL_COND_V_MSG(p_normal_map.is_null() || p_normal_map->is_empty(), ERR_INVALID_PARAMETER, "Must provide a valid normal map for roughness mipmaps");
@ -1945,8 +1944,7 @@ Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, con
normal_h = nm->get_height(); normal_h = nm->get_height();
normal_sat_vec.resize(normal_w * normal_h * 3); normal_sat_vec.resize(normal_w * normal_h * 3);
double *normal_sat = normal_sat_vec.ptr();
normal_sat = normal_sat_vec.ptrw();
//create summed area table //create summed area table
@ -2021,24 +2019,26 @@ Error Image::generate_mipmap_roughness(RoughnessChannel p_roughness_channel, con
avg[2] += normal_sat[tofs + 2]; avg[2] += normal_sat[tofs + 2];
} }
if (from_y > 0) { if (from_y > 0 && to_x > 0) {
uint32_t tofs = ((from_y - 1) * normal_w + to_x) * 3; uint32_t tofs = ((from_y - 1) * normal_w + to_x) * 3;
avg[0] -= normal_sat[tofs + 0]; avg[0] -= normal_sat[tofs + 0];
avg[1] -= normal_sat[tofs + 1]; avg[1] -= normal_sat[tofs + 1];
avg[2] -= normal_sat[tofs + 2]; avg[2] -= normal_sat[tofs + 2];
} }
if (from_x > 0) { if (from_x > 0 && to_y > 0) {
uint32_t tofs = (to_y * normal_w + (from_x - 1)) * 3; uint32_t tofs = (to_y * normal_w + (from_x - 1)) * 3;
avg[0] -= normal_sat[tofs + 0]; avg[0] -= normal_sat[tofs + 0];
avg[1] -= normal_sat[tofs + 1]; avg[1] -= normal_sat[tofs + 1];
avg[2] -= normal_sat[tofs + 2]; avg[2] -= normal_sat[tofs + 2];
} }
uint32_t tofs = (to_y * normal_w + to_x) * 3; if (to_y > 0 && to_x > 0) {
avg[0] += normal_sat[tofs + 0]; uint32_t tofs = (to_y * normal_w + to_x) * 3;
avg[1] += normal_sat[tofs + 1]; avg[0] += normal_sat[tofs + 0];
avg[2] += normal_sat[tofs + 2]; avg[1] += normal_sat[tofs + 1];
avg[2] += normal_sat[tofs + 2];
}
double div = double(size_x * size_y); double div = double(size_x * size_y);
Vector3 vec(avg[0] / div, avg[1] / div, avg[2] / div); Vector3 vec(avg[0] / div, avg[1] / div, avg[2] / div);