diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 17:48:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-27 17:48:41 +0200 |
commit | 66778eae7123ddc25f1686066a54e4d2e3f9d76a (patch) | |
tree | 0de42bf33ddfe42e95becd2960d62d51a133033e /modules/squish/image_compress_squish.cpp | |
parent | f06b7d40c87e6a2435cdfcad6bb620184f16ea42 (diff) | |
parent | de2a36505a9656c6abcd01d3f914a644175a4ced (diff) |
Merge pull request #21420 from elasota/fix-last-mipmap
Fix uninitialized mipmap levels
Diffstat (limited to 'modules/squish/image_compress_squish.cpp')
-rw-r--r-- | modules/squish/image_compress_squish.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index 653dd82351..bb8a4bdbea 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -193,8 +193,8 @@ void image_compress_squish(Image *p_image, float p_lossy_quality, Image::Compres int src_ofs = p_image->get_mipmap_offset(i); squish::CompressImage(&rb[src_ofs], w, h, &wb[dst_ofs], squish_comp); dst_ofs += (MAX(4, bw) * MAX(4, bh)) >> shift; - w >>= 1; - h >>= 1; + w = MAX(w / 2, 1); + h = MAX(h / 2, 1); } rb = PoolVector<uint8_t>::Read(); |